From 0a67ac3b3ba1490e6b967f53f5160a282dec3c61 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 9 Sep 2015 13:32:13 -0700 Subject: [PATCH 001/353] Add .js as supported extension --- src/compiler/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index a1f6565ed1ffb..f792c728227ad 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -721,7 +721,7 @@ namespace ts { /** * List of supported extensions in order of file resolution precedence. */ - export const supportedExtensions = [".ts", ".tsx", ".d.ts"]; + export const supportedExtensions = [".ts", ".tsx", ".d.ts", ".js"]; const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; export function removeFileExtension(path: string): string { From 74a3f67250cdeb0a1621a059e88fb72043c936cb Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 9 Sep 2015 14:41:19 -0700 Subject: [PATCH 002/353] Emit the diagnostics for javascript file instead of doing semantic check --- src/compiler/program.ts | 166 +++++++++++++++++++++++++++++++++++++++ src/services/services.ts | 166 +-------------------------------------- 2 files changed, 167 insertions(+), 165 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index a1861f6b46225..b7a2afce07e07 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -639,6 +639,13 @@ namespace ts { } function getSemanticDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] { + // For JavaScript files, we don't want to report the normal typescript semantic errors. + // Instead, we just report errors for using TypeScript-only constructs from within a + // JavaScript file. + if (isJavaScript(sourceFile.fileName)) { + return getJavaScriptSemanticDiagnosticsForFile(sourceFile, cancellationToken); + } + return runWithCancellationToken(() => { let typeChecker = getDiagnosticsProducingTypeChecker(); @@ -651,6 +658,165 @@ namespace ts { }); } + function getJavaScriptSemanticDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] { + return runWithCancellationToken(() => { + let diagnostics: Diagnostic[] = []; + walk(sourceFile); + + return diagnostics; + + function walk(node: Node): boolean { + if (!node) { + return false; + } + + switch (node.kind) { + case SyntaxKind.ImportEqualsDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.ExportAssignment: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.ClassDeclaration: + let classDeclaration = node; + if (checkModifiers(classDeclaration.modifiers) || + checkTypeParameters(classDeclaration.typeParameters)) { + return true; + } + break; + case SyntaxKind.HeritageClause: + let heritageClause = node; + if (heritageClause.token === SyntaxKind.ImplementsKeyword) { + diagnostics.push(createDiagnosticForNode(node, Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file)); + return true; + } + break; + case SyntaxKind.InterfaceDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.ModuleDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.module_declarations_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.TypeAliasDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.type_aliases_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + case SyntaxKind.Constructor: + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + case SyntaxKind.FunctionExpression: + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.ArrowFunction: + case SyntaxKind.FunctionDeclaration: + let functionDeclaration = node; + if (checkModifiers(functionDeclaration.modifiers) || + checkTypeParameters(functionDeclaration.typeParameters) || + checkTypeAnnotation(functionDeclaration.type)) { + return true; + } + break; + case SyntaxKind.VariableStatement: + let variableStatement = node; + if (checkModifiers(variableStatement.modifiers)) { + return true; + } + break; + case SyntaxKind.VariableDeclaration: + let variableDeclaration = node; + if (checkTypeAnnotation(variableDeclaration.type)) { + return true; + } + break; + case SyntaxKind.CallExpression: + case SyntaxKind.NewExpression: + let expression = node; + if (expression.typeArguments && expression.typeArguments.length > 0) { + let start = expression.typeArguments.pos; + diagnostics.push(createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, + Diagnostics.type_arguments_can_only_be_used_in_a_ts_file)); + return true; + } + break; + case SyntaxKind.Parameter: + let parameter = node; + if (parameter.modifiers) { + let start = parameter.modifiers.pos; + diagnostics.push(createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, + Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file)); + return true; + } + if (parameter.questionToken) { + diagnostics.push(createDiagnosticForNode(parameter.questionToken, Diagnostics._0_can_only_be_used_in_a_ts_file, '?')); + return true; + } + if (parameter.type) { + diagnostics.push(createDiagnosticForNode(parameter.type, Diagnostics.types_can_only_be_used_in_a_ts_file)); + return true; + } + break; + case SyntaxKind.PropertyDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.property_declarations_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.EnumDeclaration: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.TypeAssertionExpression: + let typeAssertionExpression = node; + diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file)); + return true; + case SyntaxKind.Decorator: + diagnostics.push(createDiagnosticForNode(node, Diagnostics.decorators_can_only_be_used_in_a_ts_file)); + return true; + } + + return forEachChild(node, walk); + } + + function checkTypeParameters(typeParameters: NodeArray): boolean { + if (typeParameters) { + let start = typeParameters.pos; + diagnostics.push(createFileDiagnostic(sourceFile, start, typeParameters.end - start, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file)); + return true; + } + return false; + } + + function checkTypeAnnotation(type: TypeNode): boolean { + if (type) { + diagnostics.push(createDiagnosticForNode(type, Diagnostics.types_can_only_be_used_in_a_ts_file)); + return true; + } + + return false; + } + + function checkModifiers(modifiers: ModifiersArray): boolean { + if (modifiers) { + for (let modifier of modifiers) { + switch (modifier.kind) { + case SyntaxKind.PublicKeyword: + case SyntaxKind.PrivateKeyword: + case SyntaxKind.ProtectedKeyword: + case SyntaxKind.DeclareKeyword: + diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind))); + return true; + + // These are all legal modifiers. + case SyntaxKind.StaticKeyword: + case SyntaxKind.ExportKeyword: + case SyntaxKind.ConstKeyword: + case SyntaxKind.DefaultKeyword: + case SyntaxKind.AbstractKeyword: + } + } + } + + return false; + } + }); + } + function getDeclarationDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] { return runWithCancellationToken(() => { if (!isDeclarationFile(sourceFile)) { diff --git a/src/services/services.ts b/src/services/services.ts index d5ede917b8f78..bc22975429ae9 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2767,18 +2767,11 @@ namespace ts { let targetSourceFile = getValidSourceFile(fileName); - // For JavaScript files, we don't want to report the normal typescript semantic errors. - // Instead, we just report errors for using TypeScript-only constructs from within a - // JavaScript file. - if (isJavaScript(fileName)) { - return getJavaScriptSemanticDiagnostics(targetSourceFile); - } - // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. // Therefore only get diagnostics for given file. let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); - if (!program.getCompilerOptions().declaration) { + if (!program.getCompilerOptions().declaration || isJavaScript(fileName)) { return semanticDiagnostics; } @@ -2787,163 +2780,6 @@ namespace ts { return concatenate(semanticDiagnostics, declarationDiagnostics); } - function getJavaScriptSemanticDiagnostics(sourceFile: SourceFile): Diagnostic[] { - let diagnostics: Diagnostic[] = []; - walk(sourceFile); - - return diagnostics; - - function walk(node: Node): boolean { - if (!node) { - return false; - } - - switch (node.kind) { - case SyntaxKind.ImportEqualsDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.ExportAssignment: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.ClassDeclaration: - let classDeclaration = node; - if (checkModifiers(classDeclaration.modifiers) || - checkTypeParameters(classDeclaration.typeParameters)) { - return true; - } - break; - case SyntaxKind.HeritageClause: - let heritageClause = node; - if (heritageClause.token === SyntaxKind.ImplementsKeyword) { - diagnostics.push(createDiagnosticForNode(node, Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file)); - return true; - } - break; - case SyntaxKind.InterfaceDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.ModuleDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.module_declarations_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.TypeAliasDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.type_aliases_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - case SyntaxKind.Constructor: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - case SyntaxKind.FunctionExpression: - case SyntaxKind.FunctionDeclaration: - case SyntaxKind.ArrowFunction: - case SyntaxKind.FunctionDeclaration: - let functionDeclaration = node; - if (checkModifiers(functionDeclaration.modifiers) || - checkTypeParameters(functionDeclaration.typeParameters) || - checkTypeAnnotation(functionDeclaration.type)) { - return true; - } - break; - case SyntaxKind.VariableStatement: - let variableStatement = node; - if (checkModifiers(variableStatement.modifiers)) { - return true; - } - break; - case SyntaxKind.VariableDeclaration: - let variableDeclaration = node; - if (checkTypeAnnotation(variableDeclaration.type)) { - return true; - } - break; - case SyntaxKind.CallExpression: - case SyntaxKind.NewExpression: - let expression = node; - if (expression.typeArguments && expression.typeArguments.length > 0) { - let start = expression.typeArguments.pos; - diagnostics.push(createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, - Diagnostics.type_arguments_can_only_be_used_in_a_ts_file)); - return true; - } - break; - case SyntaxKind.Parameter: - let parameter = node; - if (parameter.modifiers) { - let start = parameter.modifiers.pos; - diagnostics.push(createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, - Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file)); - return true; - } - if (parameter.questionToken) { - diagnostics.push(createDiagnosticForNode(parameter.questionToken, Diagnostics._0_can_only_be_used_in_a_ts_file, '?')); - return true; - } - if (parameter.type) { - diagnostics.push(createDiagnosticForNode(parameter.type, Diagnostics.types_can_only_be_used_in_a_ts_file)); - return true; - } - break; - case SyntaxKind.PropertyDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.property_declarations_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.EnumDeclaration: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.TypeAssertionExpression: - let typeAssertionExpression = node; - diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file)); - return true; - case SyntaxKind.Decorator: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.decorators_can_only_be_used_in_a_ts_file)); - return true; - } - - return forEachChild(node, walk); - } - - function checkTypeParameters(typeParameters: NodeArray): boolean { - if (typeParameters) { - let start = typeParameters.pos; - diagnostics.push(createFileDiagnostic(sourceFile, start, typeParameters.end - start, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file)); - return true; - } - return false; - } - - function checkTypeAnnotation(type: TypeNode): boolean { - if (type) { - diagnostics.push(createDiagnosticForNode(type, Diagnostics.types_can_only_be_used_in_a_ts_file)); - return true; - } - - return false; - } - - function checkModifiers(modifiers: ModifiersArray): boolean { - if (modifiers) { - for (let modifier of modifiers) { - switch (modifier.kind) { - case SyntaxKind.PublicKeyword: - case SyntaxKind.PrivateKeyword: - case SyntaxKind.ProtectedKeyword: - case SyntaxKind.DeclareKeyword: - diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind))); - return true; - - // These are all legal modifiers. - case SyntaxKind.StaticKeyword: - case SyntaxKind.ExportKeyword: - case SyntaxKind.ConstKeyword: - case SyntaxKind.DefaultKeyword: - case SyntaxKind.AbstractKeyword: - } - } - } - - return false; - } - } - function getCompilerOptionsDiagnostics() { synchronizeHostData(); return program.getOptionsDiagnostics(cancellationToken).concat( From 279018d49c0513195009c11a7dba60d537c08fc2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 9 Sep 2015 14:56:43 -0700 Subject: [PATCH 003/353] Baseline updates --- .../reference/getEmitOutputWithDeclarationFile3.baseline | 1 + .../project/invalidRootFile/amd/invalidRootFile.errors.txt | 4 ++-- .../project/invalidRootFile/node/invalidRootFile.errors.txt | 4 ++-- tests/cases/unittests/moduleResolution.ts | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline index 1ce3d9f33c3b1..e99a102307073 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline @@ -2,4 +2,5 @@ EmitSkipped: false FileName : declSingle.js var x = "hello"; var x1 = 1000; +var x2 = 1000; diff --git a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt index 9cd0dd7b0cf0a..de21d58456f82 100644 --- a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. \ No newline at end of file diff --git a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt index 9cd0dd7b0cf0a..de21d58456f82 100644 --- a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. \ No newline at end of file diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 0917e72f1ce4d..b5cd0dfb00ee7 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -80,7 +80,7 @@ module ts { let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, packageJson, moduleFile)); assert.equal(resolution.resolvedFileName, moduleFile.name); // expect three failed lookup location - attempt to load module as file with all supported extensions - assert.equal(resolution.failedLookupLocations.length, 3); + assert.equal(resolution.failedLookupLocations.length, ts.supportedExtensions.length); } it("module name as directory - load from typings", () => { @@ -100,6 +100,7 @@ module ts { "/a/b/foo.ts", "/a/b/foo.tsx", "/a/b/foo.d.ts", + "/a/b/foo.js", "/a/b/foo/index.ts", "/a/b/foo/index.tsx", ]); From e9688dd3fd582788d3ab0a2f48b13679b83dc645 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 9 Sep 2015 16:46:39 -0700 Subject: [PATCH 004/353] Allow the js files to emit output --- src/compiler/utilities.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 99ea06532a0ee..414a2649e5625 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1769,8 +1769,9 @@ namespace ts { if (!isDeclarationFile(sourceFile)) { if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) { // 1. in-browser single file compilation scenario - // 2. non .js file - return compilerOptions.isolatedModules || !fileExtensionIs(sourceFile.fileName, ".js"); + // 2. non supported extension file + return compilerOptions.isolatedModules || + forEach(supportedExtensions, extension => fileExtensionIs(sourceFile.fileName, extension)); } return false; } From fad0db2a0bfce141badfbb88d9056f323f85eb96 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 09:21:01 -0700 Subject: [PATCH 005/353] Report error if output file is among the input files --- src/compiler/diagnosticInformationMap.generated.ts | 1 + src/compiler/diagnosticMessages.json | 4 ++++ src/compiler/emitter.ts | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index af48e67d964d7..59f97a9a6ef2e 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -513,6 +513,7 @@ namespace ts { Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." }, Option_0_cannot_be_specified_with_option_1: { code: 5053, category: DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." }, A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5053, category: DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." }, + Could_not_write_file_0_which_is_one_of_the_input_files: { code: 5054, category: DiagnosticCategory.Error, key: "Could not write file '{0}' which is one of the input files." }, Concatenate_and_emit_output_to_single_file: { code: 6001, category: DiagnosticCategory.Message, key: "Concatenate and emit output to single file." }, Generates_corresponding_d_ts_file: { code: 6002, category: DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." }, Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 7abec7b7c43cf..b0c877799c97e 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2042,6 +2042,10 @@ "category": "Error", "code": 5053 }, + "Could not write file '{0}' which is one of the input files.": { + "category": "Error", + "code": 5054 + }, "Concatenate and emit output to single file.": { "category": "Message", diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d84b7b70ada36..a37401b9fae72 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -7153,6 +7153,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitFile(jsFilePath: string, sourceFile?: SourceFile) { + if (forEach(host.getSourceFiles(), sourceFile => jsFilePath === sourceFile.fileName)) { + // TODO(shkamat) Verify if this works if same file is referred via different paths ..\foo\a.js and a.js refering to same one + // Report error and dont emit this file + diagnostics.push(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_which_is_one_of_the_input_files, jsFilePath)); + return; + } + emitJavaScript(jsFilePath, sourceFile); if (compilerOptions.declaration) { From d3dfd2afef2de6064a0d28ae7ac8621875a6e7a7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 11:01:13 -0700 Subject: [PATCH 006/353] Add test cases for simple js file compilations --- .../jsFileCompilationEmitDeclarations.js | 25 ++++++++++++++ .../jsFileCompilationEmitDeclarations.symbols | 10 ++++++ .../jsFileCompilationEmitDeclarations.types | 10 ++++++ ...ileCompilationEmitTrippleSlashReference.js | 33 +++++++++++++++++++ ...mpilationEmitTrippleSlashReference.symbols | 15 +++++++++ ...CompilationEmitTrippleSlashReference.types | 15 +++++++++ .../reference/jsFileCompilationWithOut.js | 19 +++++++++++ .../jsFileCompilationWithOut.symbols | 10 ++++++ .../reference/jsFileCompilationWithOut.types | 10 ++++++ .../jsFileCompilationWithoutOut.errors.txt | 12 +++++++ .../reference/jsFileCompilationWithoutOut.js | 17 ++++++++++ .../jsFileCompilationEmitDeclarations.ts | 9 +++++ ...ileCompilationEmitTrippleSlashReference.ts | 14 ++++++++ .../compiler/jsFileCompilationWithOut.ts | 8 +++++ .../compiler/jsFileCompilationWithoutOut.ts | 7 ++++ 15 files changed, 214 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.js create mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols create mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.types create mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js create mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols create mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types create mode 100644 tests/baselines/reference/jsFileCompilationWithOut.js create mode 100644 tests/baselines/reference/jsFileCompilationWithOut.symbols create mode 100644 tests/baselines/reference/jsFileCompilationWithOut.types create mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.js create mode 100644 tests/cases/compiler/jsFileCompilationEmitDeclarations.ts create mode 100644 tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithOut.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithoutOut.ts diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js new file mode 100644 index 0000000000000..c6711e4e85f42 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/jsFileCompilationEmitDeclarations.ts] //// + +//// [a.ts] +class c { +} + +//// [b.js] +function foo() { +} + + +//// [out.js] +var c = (function () { + function c() { + } + return c; +})(); +function foo() { +} + + +//// [out.d.ts] +declare class c { +} +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols b/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols new file mode 100644 index 0000000000000..5260b8d6cf36a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : Symbol(foo, Decl(b.js, 0, 0)) +} + diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.types b/tests/baselines/reference/jsFileCompilationEmitDeclarations.types new file mode 100644 index 0000000000000..dce83eeb8ebb7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : () => void +} + diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js new file mode 100644 index 0000000000000..04f36213b1bde --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts] //// + +//// [a.ts] +class c { +} + +//// [b.js] +/// +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [out.js] +var c = (function () { + function c() { + } + return c; +})(); +function bar() { +} +/// +function foo() { +} + + +//// [out.d.ts] +declare class c { +} +declare function bar(): void; +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols new file mode 100644 index 0000000000000..805d202a14c20 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols @@ -0,0 +1,15 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.js === +/// +function foo() { +>foo : Symbol(foo, Decl(b.js, 0, 0)) +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : Symbol(bar, Decl(c.js, 0, 0)) +} diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types new file mode 100644 index 0000000000000..b206a486351dc --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.js === +/// +function foo() { +>foo : () => void +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : () => void +} diff --git a/tests/baselines/reference/jsFileCompilationWithOut.js b/tests/baselines/reference/jsFileCompilationWithOut.js new file mode 100644 index 0000000000000..32d0261061f6f --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOut.js @@ -0,0 +1,19 @@ +//// [tests/cases/compiler/jsFileCompilationWithOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.js] +function foo() { +} + + +//// [out.js] +var c = (function () { + function c() { + } + return c; +})(); +function foo() { +} diff --git a/tests/baselines/reference/jsFileCompilationWithOut.symbols b/tests/baselines/reference/jsFileCompilationWithOut.symbols new file mode 100644 index 0000000000000..5260b8d6cf36a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOut.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : Symbol(foo, Decl(b.js, 0, 0)) +} + diff --git a/tests/baselines/reference/jsFileCompilationWithOut.types b/tests/baselines/reference/jsFileCompilationWithOut.types new file mode 100644 index 0000000000000..dce83eeb8ebb7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOut.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : () => void +} + diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt new file mode 100644 index 0000000000000..32a60df099647 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt @@ -0,0 +1,12 @@ +error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.js b/tests/baselines/reference/jsFileCompilationWithoutOut.js new file mode 100644 index 0000000000000..4a60c54c3aba3 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/jsFileCompilationWithoutOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.js] +function foo() { +} + + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); diff --git a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts new file mode 100644 index 0000000000000..53ed217c2b57c --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts @@ -0,0 +1,9 @@ +// @out: out.js +// @declaration: true +// @filename: a.ts +class c { +} + +// @filename: b.js +function foo() { +} diff --git a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts new file mode 100644 index 0000000000000..88931fa2eaffb --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts @@ -0,0 +1,14 @@ +// @out: out.js +// @declaration: true +// @filename: a.ts +class c { +} + +// @filename: b.js +/// +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithOut.ts b/tests/cases/compiler/jsFileCompilationWithOut.ts new file mode 100644 index 0000000000000..47ca5115cbb96 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithOut.ts @@ -0,0 +1,8 @@ +// @out: out.js +// @filename: a.ts +class c { +} + +// @filename: b.js +function foo() { +} diff --git a/tests/cases/compiler/jsFileCompilationWithoutOut.ts b/tests/cases/compiler/jsFileCompilationWithoutOut.ts new file mode 100644 index 0000000000000..2936f2eda7c7e --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithoutOut.ts @@ -0,0 +1,7 @@ +// @filename: a.ts +class c { +} + +// @filename: b.js +function foo() { +} From 1dc3414007a797c5653f736d7f49e25e377f2840 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 11:01:33 -0700 Subject: [PATCH 007/353] Javascript files will emit declarations too so get declaration diagnostics --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index bc22975429ae9..a2ec76ee86c5e 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2771,7 +2771,7 @@ namespace ts { // Therefore only get diagnostics for given file. let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); - if (!program.getCompilerOptions().declaration || isJavaScript(fileName)) { + if (!program.getCompilerOptions().declaration) { return semanticDiagnostics; } From 63de162d1ee464c10ce3956adda30a1e3fab8dc2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 14:19:57 -0700 Subject: [PATCH 008/353] Let harness to name file even when single unit data specified but there is filename tag --- src/harness/harness.ts | 2 +- .../reference/constEnumMergingWithValues1.js | 4 +- .../constEnumMergingWithValues1.symbols | 12 +- .../constEnumMergingWithValues1.types | 2 +- .../reference/constEnumMergingWithValues2.js | 4 +- .../constEnumMergingWithValues2.symbols | 12 +- .../constEnumMergingWithValues2.types | 2 +- .../reference/constEnumMergingWithValues3.js | 4 +- .../constEnumMergingWithValues3.symbols | 14 +- .../constEnumMergingWithValues3.types | 2 +- .../reference/constEnumMergingWithValues4.js | 4 +- .../constEnumMergingWithValues4.symbols | 14 +- .../constEnumMergingWithValues4.types | 2 +- .../reference/constEnumMergingWithValues5.js | 4 +- .../constEnumMergingWithValues5.symbols | 10 +- .../constEnumMergingWithValues5.types | 2 +- ...ierShouldNotShortCircuitBaseTypeBinding.js | 4 +- ...ouldNotShortCircuitBaseTypeBinding.symbols | 2 +- ...ShouldNotShortCircuitBaseTypeBinding.types | 2 +- tests/baselines/reference/es6ExportClause.js | 6 +- .../reference/es6ExportClause.symbols | 30 ++-- .../baselines/reference/es6ExportClause.types | 2 +- .../reference/es6ExportClauseInEs5.js | 6 +- .../reference/es6ExportClauseInEs5.symbols | 30 ++-- .../reference/es6ExportClauseInEs5.types | 2 +- .../exportAssignmentAndDeclaration.errors.txt | 4 +- .../exportAssignmentAndDeclaration.js | 4 +- .../reference/exportAssignmentError.js | 4 +- .../reference/exportAssignmentError.symbols | 12 +- .../reference/exportAssignmentError.types | 2 +- .../importNonStringLiteral.errors.txt | 4 +- .../reference/importNonStringLiteral.js | 4 +- .../initializersInDeclarations.errors.txt | 16 +- .../reference/initializersInDeclarations.js | 23 --- ...isolatedModulesAmbientConstEnum.errors.txt | 4 +- .../isolatedModulesAmbientConstEnum.js | 4 +- .../isolatedModulesDeclaration.errors.txt | 2 +- .../reference/isolatedModulesDeclaration.js | 6 +- .../baselines/reference/isolatedModulesES6.js | 4 +- .../reference/isolatedModulesES6.symbols | 4 +- .../reference/isolatedModulesES6.types | 2 +- ...latedModulesImportExportElision.errors.txt | 10 +- .../isolatedModulesImportExportElision.js | 4 +- .../isolatedModulesNoEmitOnError.errors.txt | 2 +- ...isolatedModulesNoExternalModule.errors.txt | 4 +- .../isolatedModulesNoExternalModule.js | 4 +- .../isolatedModulesNonAmbientConstEnum.js | 4 +- ...isolatedModulesNonAmbientConstEnum.symbols | 16 +- .../isolatedModulesNonAmbientConstEnum.types | 2 +- .../reference/isolatedModulesSourceMap.js | 6 +- .../reference/isolatedModulesSourceMap.js.map | 4 +- .../isolatedModulesSourceMap.sourcemap.txt | 14 +- .../isolatedModulesSourceMap.symbols | 4 +- .../reference/isolatedModulesSourceMap.types | 2 +- .../isolatedModulesSpecifiedModule.js | 4 +- .../isolatedModulesSpecifiedModule.symbols | 4 +- .../isolatedModulesSpecifiedModule.types | 2 +- ...solatedModulesUnspecifiedModule.errors.txt | 2 +- .../isolatedModulesUnspecifiedModule.js | 4 +- .../tsxAttributeInvalidNames.errors.txt | 26 +-- .../reference/tsxAttributeInvalidNames.js | 4 +- .../tsxAttributeResolution1.errors.txt | 16 +- .../reference/tsxAttributeResolution1.js | 4 +- .../tsxAttributeResolution2.errors.txt | 4 +- .../reference/tsxAttributeResolution2.js | 4 +- .../tsxAttributeResolution3.errors.txt | 10 +- .../reference/tsxAttributeResolution3.js | 4 +- .../tsxAttributeResolution4.errors.txt | 4 +- .../reference/tsxAttributeResolution4.js | 4 +- .../tsxAttributeResolution5.errors.txt | 8 +- .../reference/tsxAttributeResolution5.js | 4 +- .../tsxAttributeResolution6.errors.txt | 8 +- .../reference/tsxAttributeResolution6.js | 4 +- .../tsxAttributeResolution7.errors.txt | 4 +- .../reference/tsxAttributeResolution7.js | 4 +- .../reference/tsxAttributeResolution8.js | 4 +- .../reference/tsxAttributeResolution8.symbols | 16 +- .../reference/tsxAttributeResolution8.types | 2 +- .../tsxElementResolution1.errors.txt | 4 +- .../reference/tsxElementResolution1.js | 4 +- .../tsxElementResolution10.errors.txt | 4 +- .../reference/tsxElementResolution10.js | 4 +- .../tsxElementResolution11.errors.txt | 4 +- .../reference/tsxElementResolution11.js | 4 +- .../tsxElementResolution12.errors.txt | 8 +- .../reference/tsxElementResolution12.js | 4 +- .../reference/tsxElementResolution13.js | 4 +- .../reference/tsxElementResolution13.symbols | 20 +-- .../reference/tsxElementResolution13.types | 2 +- .../reference/tsxElementResolution14.js | 4 +- .../reference/tsxElementResolution14.symbols | 14 +- .../reference/tsxElementResolution14.types | 2 +- .../tsxElementResolution15.errors.txt | 4 +- .../reference/tsxElementResolution15.js | 4 +- .../tsxElementResolution16.errors.txt | 6 +- .../reference/tsxElementResolution16.js | 4 +- .../tsxElementResolution18.errors.txt | 4 +- .../reference/tsxElementResolution18.js | 4 +- .../reference/tsxElementResolution2.js | 4 +- .../reference/tsxElementResolution2.symbols | 14 +- .../reference/tsxElementResolution2.types | 2 +- .../tsxElementResolution3.errors.txt | 6 +- .../reference/tsxElementResolution3.js | 4 +- .../tsxElementResolution4.errors.txt | 6 +- .../reference/tsxElementResolution4.js | 4 +- .../reference/tsxElementResolution5.js | 4 +- .../reference/tsxElementResolution5.symbols | 6 +- .../reference/tsxElementResolution5.types | 2 +- .../tsxElementResolution6.errors.txt | 4 +- .../reference/tsxElementResolution6.js | 4 +- .../tsxElementResolution7.errors.txt | 6 +- .../reference/tsxElementResolution7.js | 4 +- .../tsxElementResolution8.errors.txt | 6 +- .../reference/tsxElementResolution8.js | 4 +- .../reference/tsxElementResolution9.js | 4 +- .../reference/tsxElementResolution9.symbols | 58 +++--- .../reference/tsxElementResolution9.types | 2 +- tests/baselines/reference/tsxEmit1.js | 4 +- tests/baselines/reference/tsxEmit1.symbols | 164 ++++++++--------- tests/baselines/reference/tsxEmit1.types | 2 +- tests/baselines/reference/tsxEmit2.js | 4 +- tests/baselines/reference/tsxEmit2.symbols | 64 +++---- tests/baselines/reference/tsxEmit2.types | 2 +- tests/baselines/reference/tsxEmit3.js | 6 +- tests/baselines/reference/tsxEmit3.js.map | 4 +- .../reference/tsxEmit3.sourcemap.txt | 14 +- tests/baselines/reference/tsxEmit3.symbols | 50 +++--- tests/baselines/reference/tsxEmit3.types | 2 +- .../reference/tsxErrorRecovery1.errors.txt | 10 +- .../baselines/reference/tsxErrorRecovery1.js | 4 +- .../tsxGenericArrowFunctionParsing.js | 4 +- .../tsxGenericArrowFunctionParsing.symbols | 64 +++---- .../tsxGenericArrowFunctionParsing.types | 2 +- .../reference/tsxOpeningClosingNames.js | 4 +- .../reference/tsxOpeningClosingNames.symbols | 14 +- .../reference/tsxOpeningClosingNames.types | 2 +- tests/baselines/reference/tsxParseTests1.js | 4 +- .../reference/tsxParseTests1.symbols | 30 ++-- .../baselines/reference/tsxParseTests1.types | 2 +- tests/baselines/reference/tsxReactEmit1.js | 4 +- .../baselines/reference/tsxReactEmit1.symbols | 166 +++++++++--------- tests/baselines/reference/tsxReactEmit1.types | 2 +- tests/baselines/reference/tsxReactEmit2.js | 4 +- .../baselines/reference/tsxReactEmit2.symbols | 66 +++---- tests/baselines/reference/tsxReactEmit2.types | 2 +- tests/baselines/reference/tsxReactEmit3.js | 4 +- .../baselines/reference/tsxReactEmit3.symbols | 28 +-- tests/baselines/reference/tsxReactEmit3.types | 2 +- .../reference/tsxReactEmit4.errors.txt | 4 +- tests/baselines/reference/tsxReactEmit4.js | 4 +- .../reference/tsxReactEmitEntities.js | 4 +- .../reference/tsxReactEmitEntities.symbols | 16 +- .../reference/tsxReactEmitEntities.types | 2 +- .../reference/tsxReactEmitWhitespace.js | 4 +- .../reference/tsxReactEmitWhitespace.symbols | 56 +++--- .../reference/tsxReactEmitWhitespace.types | 2 +- .../reference/tsxReactEmitWhitespace2.js | 4 +- .../reference/tsxReactEmitWhitespace2.symbols | 34 ++-- .../reference/tsxReactEmitWhitespace2.types | 2 +- 159 files changed, 799 insertions(+), 822 deletions(-) delete mode 100644 tests/baselines/reference/initializersInDeclarations.js diff --git a/src/harness/harness.ts b/src/harness/harness.ts index f65a4f88730fe..ad2648ef2086f 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1673,7 +1673,7 @@ module Harness { } // normalize the fileName for the single file case - currentFileName = testUnitData.length > 0 ? currentFileName : Path.getFileName(fileName); + currentFileName = testUnitData.length > 0 || currentFileName ? currentFileName : Path.getFileName(fileName); // EOF, push whatever remains let newTestFile2 = { diff --git a/tests/baselines/reference/constEnumMergingWithValues1.js b/tests/baselines/reference/constEnumMergingWithValues1.js index f47fc227baed6..b35c41da4aceb 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.js +++ b/tests/baselines/reference/constEnumMergingWithValues1.js @@ -1,4 +1,4 @@ -//// [constEnumMergingWithValues1.ts] +//// [m1.ts] function foo() {} module foo { @@ -7,7 +7,7 @@ module foo { export = foo -//// [constEnumMergingWithValues1.js] +//// [m1.js] define(["require", "exports"], function (require, exports) { function foo() { } return foo; diff --git a/tests/baselines/reference/constEnumMergingWithValues1.symbols b/tests/baselines/reference/constEnumMergingWithValues1.symbols index 3dd1c80705ced..ba655091dedc1 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues1.symbols @@ -1,16 +1,16 @@ -=== tests/cases/compiler/constEnumMergingWithValues1.ts === +=== tests/cases/compiler/m1.ts === function foo() {} ->foo : Symbol(foo, Decl(constEnumMergingWithValues1.ts, 0, 0), Decl(constEnumMergingWithValues1.ts, 1, 17)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 17)) module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues1.ts, 0, 0), Decl(constEnumMergingWithValues1.ts, 1, 17)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 17)) const enum E { X } ->E : Symbol(E, Decl(constEnumMergingWithValues1.ts, 2, 12)) ->X : Symbol(E.X, Decl(constEnumMergingWithValues1.ts, 3, 18)) +>E : Symbol(E, Decl(m1.ts, 2, 12)) +>X : Symbol(E.X, Decl(m1.ts, 3, 18)) } export = foo ->foo : Symbol(foo, Decl(constEnumMergingWithValues1.ts, 0, 0), Decl(constEnumMergingWithValues1.ts, 1, 17)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 17)) diff --git a/tests/baselines/reference/constEnumMergingWithValues1.types b/tests/baselines/reference/constEnumMergingWithValues1.types index 8d5b15795f7f8..c5b1a82a5a871 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.types +++ b/tests/baselines/reference/constEnumMergingWithValues1.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/constEnumMergingWithValues1.ts === +=== tests/cases/compiler/m1.ts === function foo() {} >foo : typeof foo diff --git a/tests/baselines/reference/constEnumMergingWithValues2.js b/tests/baselines/reference/constEnumMergingWithValues2.js index 393ab41fa1f03..9641bdf363ad5 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.js +++ b/tests/baselines/reference/constEnumMergingWithValues2.js @@ -1,4 +1,4 @@ -//// [constEnumMergingWithValues2.ts] +//// [m1.ts] class foo {} module foo { @@ -7,7 +7,7 @@ module foo { export = foo -//// [constEnumMergingWithValues2.js] +//// [m1.js] define(["require", "exports"], function (require, exports) { var foo = (function () { function foo() { diff --git a/tests/baselines/reference/constEnumMergingWithValues2.symbols b/tests/baselines/reference/constEnumMergingWithValues2.symbols index bfb438a387dff..a7744499f4990 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues2.symbols @@ -1,16 +1,16 @@ -=== tests/cases/compiler/constEnumMergingWithValues2.ts === +=== tests/cases/compiler/m1.ts === class foo {} ->foo : Symbol(foo, Decl(constEnumMergingWithValues2.ts, 0, 0), Decl(constEnumMergingWithValues2.ts, 1, 12)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 12)) module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues2.ts, 0, 0), Decl(constEnumMergingWithValues2.ts, 1, 12)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 12)) const enum E { X } ->E : Symbol(E, Decl(constEnumMergingWithValues2.ts, 2, 12)) ->X : Symbol(E.X, Decl(constEnumMergingWithValues2.ts, 3, 18)) +>E : Symbol(E, Decl(m1.ts, 2, 12)) +>X : Symbol(E.X, Decl(m1.ts, 3, 18)) } export = foo ->foo : Symbol(foo, Decl(constEnumMergingWithValues2.ts, 0, 0), Decl(constEnumMergingWithValues2.ts, 1, 12)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 12)) diff --git a/tests/baselines/reference/constEnumMergingWithValues2.types b/tests/baselines/reference/constEnumMergingWithValues2.types index dd706ef33a105..ab2372cbae9a3 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.types +++ b/tests/baselines/reference/constEnumMergingWithValues2.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/constEnumMergingWithValues2.ts === +=== tests/cases/compiler/m1.ts === class foo {} >foo : foo diff --git a/tests/baselines/reference/constEnumMergingWithValues3.js b/tests/baselines/reference/constEnumMergingWithValues3.js index d28f29f0962a5..e191dc2d11030 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.js +++ b/tests/baselines/reference/constEnumMergingWithValues3.js @@ -1,4 +1,4 @@ -//// [constEnumMergingWithValues3.ts] +//// [m1.ts] enum foo { A } module foo { @@ -7,7 +7,7 @@ module foo { export = foo -//// [constEnumMergingWithValues3.js] +//// [m1.js] define(["require", "exports"], function (require, exports) { var foo; (function (foo) { diff --git a/tests/baselines/reference/constEnumMergingWithValues3.symbols b/tests/baselines/reference/constEnumMergingWithValues3.symbols index 33e020b5679d7..816919c6805ac 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues3.symbols @@ -1,17 +1,17 @@ -=== tests/cases/compiler/constEnumMergingWithValues3.ts === +=== tests/cases/compiler/m1.ts === enum foo { A } ->foo : Symbol(foo, Decl(constEnumMergingWithValues3.ts, 0, 0), Decl(constEnumMergingWithValues3.ts, 1, 14)) ->A : Symbol(foo.A, Decl(constEnumMergingWithValues3.ts, 1, 10)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 14)) +>A : Symbol(foo.A, Decl(m1.ts, 1, 10)) module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues3.ts, 0, 0), Decl(constEnumMergingWithValues3.ts, 1, 14)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 14)) const enum E { X } ->E : Symbol(E, Decl(constEnumMergingWithValues3.ts, 2, 12)) ->X : Symbol(E.X, Decl(constEnumMergingWithValues3.ts, 3, 18)) +>E : Symbol(E, Decl(m1.ts, 2, 12)) +>X : Symbol(E.X, Decl(m1.ts, 3, 18)) } export = foo ->foo : Symbol(foo, Decl(constEnumMergingWithValues3.ts, 0, 0), Decl(constEnumMergingWithValues3.ts, 1, 14)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 1, 14)) diff --git a/tests/baselines/reference/constEnumMergingWithValues3.types b/tests/baselines/reference/constEnumMergingWithValues3.types index df2e88204669a..392772860e406 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.types +++ b/tests/baselines/reference/constEnumMergingWithValues3.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/constEnumMergingWithValues3.ts === +=== tests/cases/compiler/m1.ts === enum foo { A } >foo : foo diff --git a/tests/baselines/reference/constEnumMergingWithValues4.js b/tests/baselines/reference/constEnumMergingWithValues4.js index 7ed8b44dc7666..3f4ee67cb4809 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.js +++ b/tests/baselines/reference/constEnumMergingWithValues4.js @@ -1,4 +1,4 @@ -//// [constEnumMergingWithValues4.ts] +//// [m1.ts] module foo { const enum E { X } @@ -11,7 +11,7 @@ module foo { export = foo -//// [constEnumMergingWithValues4.js] +//// [m1.js] define(["require", "exports"], function (require, exports) { var foo; (function (foo) { diff --git a/tests/baselines/reference/constEnumMergingWithValues4.symbols b/tests/baselines/reference/constEnumMergingWithValues4.symbols index 817c9aeeff370..a7135b53d57f8 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues4.symbols @@ -1,21 +1,21 @@ -=== tests/cases/compiler/constEnumMergingWithValues4.ts === +=== tests/cases/compiler/m1.ts === module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues4.ts, 0, 0), Decl(constEnumMergingWithValues4.ts, 3, 1)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 3, 1)) const enum E { X } ->E : Symbol(E, Decl(constEnumMergingWithValues4.ts, 1, 12)) ->X : Symbol(E.X, Decl(constEnumMergingWithValues4.ts, 2, 18)) +>E : Symbol(E, Decl(m1.ts, 1, 12)) +>X : Symbol(E.X, Decl(m1.ts, 2, 18)) } module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues4.ts, 0, 0), Decl(constEnumMergingWithValues4.ts, 3, 1)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 3, 1)) var x = 1; ->x : Symbol(x, Decl(constEnumMergingWithValues4.ts, 6, 7)) +>x : Symbol(x, Decl(m1.ts, 6, 7)) } export = foo ->foo : Symbol(foo, Decl(constEnumMergingWithValues4.ts, 0, 0), Decl(constEnumMergingWithValues4.ts, 3, 1)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 3, 1)) diff --git a/tests/baselines/reference/constEnumMergingWithValues4.types b/tests/baselines/reference/constEnumMergingWithValues4.types index 3da306fedbf61..92d04fc10cc7d 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.types +++ b/tests/baselines/reference/constEnumMergingWithValues4.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/constEnumMergingWithValues4.ts === +=== tests/cases/compiler/m1.ts === module foo { >foo : typeof foo diff --git a/tests/baselines/reference/constEnumMergingWithValues5.js b/tests/baselines/reference/constEnumMergingWithValues5.js index 378b11cfd2212..610826b52cefb 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.js +++ b/tests/baselines/reference/constEnumMergingWithValues5.js @@ -1,4 +1,4 @@ -//// [constEnumMergingWithValues5.ts] +//// [m1.ts] module foo { const enum E { X } @@ -6,7 +6,7 @@ module foo { export = foo -//// [constEnumMergingWithValues5.js] +//// [m1.js] define(["require", "exports"], function (require, exports) { var foo; (function (foo) { diff --git a/tests/baselines/reference/constEnumMergingWithValues5.symbols b/tests/baselines/reference/constEnumMergingWithValues5.symbols index 6354f64d834e2..257e1897e5c55 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues5.symbols @@ -1,13 +1,13 @@ -=== tests/cases/compiler/constEnumMergingWithValues5.ts === +=== tests/cases/compiler/m1.ts === module foo { ->foo : Symbol(foo, Decl(constEnumMergingWithValues5.ts, 0, 0)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0)) const enum E { X } ->E : Symbol(E, Decl(constEnumMergingWithValues5.ts, 1, 12)) ->X : Symbol(E.X, Decl(constEnumMergingWithValues5.ts, 2, 18)) +>E : Symbol(E, Decl(m1.ts, 1, 12)) +>X : Symbol(E.X, Decl(m1.ts, 2, 18)) } export = foo ->foo : Symbol(foo, Decl(constEnumMergingWithValues5.ts, 0, 0)) +>foo : Symbol(foo, Decl(m1.ts, 0, 0)) diff --git a/tests/baselines/reference/constEnumMergingWithValues5.types b/tests/baselines/reference/constEnumMergingWithValues5.types index 617676ba0c0ad..585363f4d9743 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.types +++ b/tests/baselines/reference/constEnumMergingWithValues5.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/constEnumMergingWithValues5.ts === +=== tests/cases/compiler/m1.ts === module foo { >foo : typeof foo diff --git a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.js b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.js index d86925f1fd328..97a51d7032de4 100644 --- a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.js +++ b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.js @@ -1,4 +1,4 @@ -//// [duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts] +//// [duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts] -//// [duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.js] +//// [duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.js] diff --git a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.symbols b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.symbols index 61cc569b965f5..81436a6e51041 100644 --- a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.symbols +++ b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.symbols @@ -1,3 +1,3 @@ -=== tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts === +=== tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts === No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.types b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.types index 61cc569b965f5..81436a6e51041 100644 --- a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.types +++ b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.types @@ -1,3 +1,3 @@ -=== tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts === +=== tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts === No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/es6ExportClause.js b/tests/baselines/reference/es6ExportClause.js index f0d9bbe8cfffe..742a39e1324e2 100644 --- a/tests/baselines/reference/es6ExportClause.js +++ b/tests/baselines/reference/es6ExportClause.js @@ -1,4 +1,4 @@ -//// [es6ExportClause.ts] +//// [server.ts] class c { } @@ -16,7 +16,7 @@ export { i, m as instantiatedModule }; export { uninstantiated }; export { x }; -//// [es6ExportClause.js] +//// [server.js] class c { } var m; @@ -30,7 +30,7 @@ export { m as instantiatedModule }; export { x }; -//// [es6ExportClause.d.ts] +//// [server.d.ts] declare class c { } interface i { diff --git a/tests/baselines/reference/es6ExportClause.symbols b/tests/baselines/reference/es6ExportClause.symbols index fe4de21a00f9c..1bacedec76c0f 100644 --- a/tests/baselines/reference/es6ExportClause.symbols +++ b/tests/baselines/reference/es6ExportClause.symbols @@ -1,38 +1,38 @@ -=== tests/cases/compiler/es6ExportClause.ts === +=== tests/cases/compiler/server.ts === class c { ->c : Symbol(c, Decl(es6ExportClause.ts, 0, 0)) +>c : Symbol(c, Decl(server.ts, 0, 0)) } interface i { ->i : Symbol(i, Decl(es6ExportClause.ts, 2, 1)) +>i : Symbol(i, Decl(server.ts, 2, 1)) } module m { ->m : Symbol(m, Decl(es6ExportClause.ts, 4, 1)) +>m : Symbol(m, Decl(server.ts, 4, 1)) export var x = 10; ->x : Symbol(x, Decl(es6ExportClause.ts, 6, 14)) +>x : Symbol(x, Decl(server.ts, 6, 14)) } var x = 10; ->x : Symbol(x, Decl(es6ExportClause.ts, 8, 3)) +>x : Symbol(x, Decl(server.ts, 8, 3)) module uninstantiated { ->uninstantiated : Symbol(uninstantiated, Decl(es6ExportClause.ts, 8, 11)) +>uninstantiated : Symbol(uninstantiated, Decl(server.ts, 8, 11)) } export { c }; ->c : Symbol(c, Decl(es6ExportClause.ts, 11, 8)) +>c : Symbol(c, Decl(server.ts, 11, 8)) export { c as c2 }; ->c : Symbol(c2, Decl(es6ExportClause.ts, 12, 8)) ->c2 : Symbol(c2, Decl(es6ExportClause.ts, 12, 8)) +>c : Symbol(c2, Decl(server.ts, 12, 8)) +>c2 : Symbol(c2, Decl(server.ts, 12, 8)) export { i, m as instantiatedModule }; ->i : Symbol(i, Decl(es6ExportClause.ts, 13, 8)) ->m : Symbol(instantiatedModule, Decl(es6ExportClause.ts, 13, 11)) ->instantiatedModule : Symbol(instantiatedModule, Decl(es6ExportClause.ts, 13, 11)) +>i : Symbol(i, Decl(server.ts, 13, 8)) +>m : Symbol(instantiatedModule, Decl(server.ts, 13, 11)) +>instantiatedModule : Symbol(instantiatedModule, Decl(server.ts, 13, 11)) export { uninstantiated }; ->uninstantiated : Symbol(uninstantiated, Decl(es6ExportClause.ts, 14, 8)) +>uninstantiated : Symbol(uninstantiated, Decl(server.ts, 14, 8)) export { x }; ->x : Symbol(x, Decl(es6ExportClause.ts, 15, 8)) +>x : Symbol(x, Decl(server.ts, 15, 8)) diff --git a/tests/baselines/reference/es6ExportClause.types b/tests/baselines/reference/es6ExportClause.types index b0d544201a4d3..5cab90d6a7f86 100644 --- a/tests/baselines/reference/es6ExportClause.types +++ b/tests/baselines/reference/es6ExportClause.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/es6ExportClause.ts === +=== tests/cases/compiler/server.ts === class c { >c : c diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index f987b48aecadd..8bd908880f6cf 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -1,4 +1,4 @@ -//// [es6ExportClauseInEs5.ts] +//// [server.ts] class c { } @@ -16,7 +16,7 @@ export { i, m as instantiatedModule }; export { uninstantiated }; export { x }; -//// [es6ExportClauseInEs5.js] +//// [server.js] var c = (function () { function c() { } @@ -33,7 +33,7 @@ var x = 10; exports.x = x; -//// [es6ExportClauseInEs5.d.ts] +//// [server.d.ts] declare class c { } interface i { diff --git a/tests/baselines/reference/es6ExportClauseInEs5.symbols b/tests/baselines/reference/es6ExportClauseInEs5.symbols index 5590b907eecb9..1bacedec76c0f 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseInEs5.symbols @@ -1,38 +1,38 @@ -=== tests/cases/compiler/es6ExportClauseInEs5.ts === +=== tests/cases/compiler/server.ts === class c { ->c : Symbol(c, Decl(es6ExportClauseInEs5.ts, 0, 0)) +>c : Symbol(c, Decl(server.ts, 0, 0)) } interface i { ->i : Symbol(i, Decl(es6ExportClauseInEs5.ts, 2, 1)) +>i : Symbol(i, Decl(server.ts, 2, 1)) } module m { ->m : Symbol(m, Decl(es6ExportClauseInEs5.ts, 4, 1)) +>m : Symbol(m, Decl(server.ts, 4, 1)) export var x = 10; ->x : Symbol(x, Decl(es6ExportClauseInEs5.ts, 6, 14)) +>x : Symbol(x, Decl(server.ts, 6, 14)) } var x = 10; ->x : Symbol(x, Decl(es6ExportClauseInEs5.ts, 8, 3)) +>x : Symbol(x, Decl(server.ts, 8, 3)) module uninstantiated { ->uninstantiated : Symbol(uninstantiated, Decl(es6ExportClauseInEs5.ts, 8, 11)) +>uninstantiated : Symbol(uninstantiated, Decl(server.ts, 8, 11)) } export { c }; ->c : Symbol(c, Decl(es6ExportClauseInEs5.ts, 11, 8)) +>c : Symbol(c, Decl(server.ts, 11, 8)) export { c as c2 }; ->c : Symbol(c2, Decl(es6ExportClauseInEs5.ts, 12, 8)) ->c2 : Symbol(c2, Decl(es6ExportClauseInEs5.ts, 12, 8)) +>c : Symbol(c2, Decl(server.ts, 12, 8)) +>c2 : Symbol(c2, Decl(server.ts, 12, 8)) export { i, m as instantiatedModule }; ->i : Symbol(i, Decl(es6ExportClauseInEs5.ts, 13, 8)) ->m : Symbol(instantiatedModule, Decl(es6ExportClauseInEs5.ts, 13, 11)) ->instantiatedModule : Symbol(instantiatedModule, Decl(es6ExportClauseInEs5.ts, 13, 11)) +>i : Symbol(i, Decl(server.ts, 13, 8)) +>m : Symbol(instantiatedModule, Decl(server.ts, 13, 11)) +>instantiatedModule : Symbol(instantiatedModule, Decl(server.ts, 13, 11)) export { uninstantiated }; ->uninstantiated : Symbol(uninstantiated, Decl(es6ExportClauseInEs5.ts, 14, 8)) +>uninstantiated : Symbol(uninstantiated, Decl(server.ts, 14, 8)) export { x }; ->x : Symbol(x, Decl(es6ExportClauseInEs5.ts, 15, 8)) +>x : Symbol(x, Decl(server.ts, 15, 8)) diff --git a/tests/baselines/reference/es6ExportClauseInEs5.types b/tests/baselines/reference/es6ExportClauseInEs5.types index c6ef9033bf180..5cab90d6a7f86 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.types +++ b/tests/baselines/reference/es6ExportClauseInEs5.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/es6ExportClauseInEs5.ts === +=== tests/cases/compiler/server.ts === class c { >c : c diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.errors.txt b/tests/baselines/reference/exportAssignmentAndDeclaration.errors.txt index bb228caa0c914..5a84a27912260 100644 --- a/tests/baselines/reference/exportAssignmentAndDeclaration.errors.txt +++ b/tests/baselines/reference/exportAssignmentAndDeclaration.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts(10,1): error TS2309: An export assignment cannot be used in a module with other exported elements. +tests/cases/conformance/externalModules/foo_0.ts(10,1): error TS2309: An export assignment cannot be used in a module with other exported elements. -==== tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts (1 errors) ==== +==== tests/cases/conformance/externalModules/foo_0.ts (1 errors) ==== export enum E1 { A,B,C } diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js index ed9f92d88ef86..c1d6510b1f719 100644 --- a/tests/baselines/reference/exportAssignmentAndDeclaration.js +++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js @@ -1,4 +1,4 @@ -//// [exportAssignmentAndDeclaration.ts] +//// [foo_0.ts] export enum E1 { A,B,C } @@ -10,7 +10,7 @@ class C1 { // Invalid, as there is already an exported member. export = C1; -//// [exportAssignmentAndDeclaration.js] +//// [foo_0.js] define(["require", "exports"], function (require, exports) { (function (E1) { E1[E1["A"] = 0] = "A"; diff --git a/tests/baselines/reference/exportAssignmentError.js b/tests/baselines/reference/exportAssignmentError.js index 777a9fab04825..adf9d741dbe3c 100644 --- a/tests/baselines/reference/exportAssignmentError.js +++ b/tests/baselines/reference/exportAssignmentError.js @@ -1,4 +1,4 @@ -//// [exportAssignmentError.ts] +//// [exportEqualsModule_A.ts] module M { export var x; } @@ -8,7 +8,7 @@ import M2 = M; export = M2; // should not error -//// [exportAssignmentError.js] +//// [exportEqualsModule_A.js] define(["require", "exports"], function (require, exports) { var M; (function (M) { diff --git a/tests/baselines/reference/exportAssignmentError.symbols b/tests/baselines/reference/exportAssignmentError.symbols index 482ad586dc2c4..e10556360a4d8 100644 --- a/tests/baselines/reference/exportAssignmentError.symbols +++ b/tests/baselines/reference/exportAssignmentError.symbols @@ -1,15 +1,15 @@ -=== tests/cases/compiler/exportAssignmentError.ts === +=== tests/cases/compiler/exportEqualsModule_A.ts === module M { ->M : Symbol(M, Decl(exportAssignmentError.ts, 0, 0)) +>M : Symbol(M, Decl(exportEqualsModule_A.ts, 0, 0)) export var x; ->x : Symbol(x, Decl(exportAssignmentError.ts, 1, 11)) +>x : Symbol(x, Decl(exportEqualsModule_A.ts, 1, 11)) } import M2 = M; ->M2 : Symbol(M2, Decl(exportAssignmentError.ts, 2, 1)) ->M : Symbol(M, Decl(exportAssignmentError.ts, 0, 0)) +>M2 : Symbol(M2, Decl(exportEqualsModule_A.ts, 2, 1)) +>M : Symbol(M, Decl(exportEqualsModule_A.ts, 0, 0)) export = M2; // should not error ->M2 : Symbol(M2, Decl(exportAssignmentError.ts, 2, 1)) +>M2 : Symbol(M2, Decl(exportEqualsModule_A.ts, 2, 1)) diff --git a/tests/baselines/reference/exportAssignmentError.types b/tests/baselines/reference/exportAssignmentError.types index 89e7d461fb20a..96f92c8571b50 100644 --- a/tests/baselines/reference/exportAssignmentError.types +++ b/tests/baselines/reference/exportAssignmentError.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/exportAssignmentError.ts === +=== tests/cases/compiler/exportEqualsModule_A.ts === module M { >M : typeof M diff --git a/tests/baselines/reference/importNonStringLiteral.errors.txt b/tests/baselines/reference/importNonStringLiteral.errors.txt index 7138680d709ec..97470e6408d6b 100644 --- a/tests/baselines/reference/importNonStringLiteral.errors.txt +++ b/tests/baselines/reference/importNonStringLiteral.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/externalModules/importNonStringLiteral.ts(2,22): error TS1141: String literal expected. +tests/cases/conformance/externalModules/vs/foo_0.ts(2,22): error TS1141: String literal expected. -==== tests/cases/conformance/externalModules/importNonStringLiteral.ts (1 errors) ==== +==== tests/cases/conformance/externalModules/vs/foo_0.ts (1 errors) ==== var x = "filename"; import foo = require(x); // invalid ~ diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js index 52ef5a10a67d5..46185a2dfe45f 100644 --- a/tests/baselines/reference/importNonStringLiteral.js +++ b/tests/baselines/reference/importNonStringLiteral.js @@ -1,7 +1,7 @@ -//// [importNonStringLiteral.ts] +//// [foo_0.ts] var x = "filename"; import foo = require(x); // invalid -//// [importNonStringLiteral.js] +//// [foo_0.js] var x = "filename"; diff --git a/tests/baselines/reference/initializersInDeclarations.errors.txt b/tests/baselines/reference/initializersInDeclarations.errors.txt index 9840181e09297..ed11f2f08ac29 100644 --- a/tests/baselines/reference/initializersInDeclarations.errors.txt +++ b/tests/baselines/reference/initializersInDeclarations.errors.txt @@ -1,13 +1,13 @@ -tests/cases/conformance/externalModules/initializersInDeclarations.ts(5,9): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(6,16): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(7,16): error TS1184: An implementation cannot be declared in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(12,15): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(13,15): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(16,2): error TS1036: Statements are not allowed in ambient contexts. -tests/cases/conformance/externalModules/initializersInDeclarations.ts(18,16): error TS1039: Initializers are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(5,9): error TS1039: Initializers are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(6,16): error TS1039: Initializers are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(7,16): error TS1184: An implementation cannot be declared in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(12,15): error TS1039: Initializers are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(13,15): error TS1039: Initializers are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(16,2): error TS1036: Statements are not allowed in ambient contexts. +tests/cases/conformance/externalModules/file1.d.ts(18,16): error TS1039: Initializers are not allowed in ambient contexts. -==== tests/cases/conformance/externalModules/initializersInDeclarations.ts (7 errors) ==== +==== tests/cases/conformance/externalModules/file1.d.ts (7 errors) ==== // Errors: Initializers & statements in declaration file diff --git a/tests/baselines/reference/initializersInDeclarations.js b/tests/baselines/reference/initializersInDeclarations.js deleted file mode 100644 index 0506c72fc5664..0000000000000 --- a/tests/baselines/reference/initializersInDeclarations.js +++ /dev/null @@ -1,23 +0,0 @@ -//// [initializersInDeclarations.ts] - -// Errors: Initializers & statements in declaration file - -declare class Foo { - name = "test"; - "some prop" = 42; - fn(): boolean { - return false; - } -} - -declare var x = []; -declare var y = {}; - -declare module M1 { - while(true); - - export var v1 = () => false; -} - -//// [initializersInDeclarations.js] -// Errors: Initializers & statements in declaration file diff --git a/tests/baselines/reference/isolatedModulesAmbientConstEnum.errors.txt b/tests/baselines/reference/isolatedModulesAmbientConstEnum.errors.txt index bb8a5202bc508..e0eef7d892d0b 100644 --- a/tests/baselines/reference/isolatedModulesAmbientConstEnum.errors.txt +++ b/tests/baselines/reference/isolatedModulesAmbientConstEnum.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/isolatedModulesAmbientConstEnum.ts(3,20): error TS1209: Ambient const enums are not allowed when the '--isolatedModules' flag is provided. +tests/cases/compiler/file1.ts(3,20): error TS1209: Ambient const enums are not allowed when the '--isolatedModules' flag is provided. -==== tests/cases/compiler/isolatedModulesAmbientConstEnum.ts (1 errors) ==== +==== tests/cases/compiler/file1.ts (1 errors) ==== declare const enum E { X = 1} diff --git a/tests/baselines/reference/isolatedModulesAmbientConstEnum.js b/tests/baselines/reference/isolatedModulesAmbientConstEnum.js index 7742122b68794..6d9fc540d9a44 100644 --- a/tests/baselines/reference/isolatedModulesAmbientConstEnum.js +++ b/tests/baselines/reference/isolatedModulesAmbientConstEnum.js @@ -1,8 +1,8 @@ -//// [isolatedModulesAmbientConstEnum.ts] +//// [file1.ts] declare const enum E { X = 1} export var y; -//// [isolatedModulesAmbientConstEnum.js] +//// [file1.js] export var y; diff --git a/tests/baselines/reference/isolatedModulesDeclaration.errors.txt b/tests/baselines/reference/isolatedModulesDeclaration.errors.txt index 749e86116e863..2997acd58ac5b 100644 --- a/tests/baselines/reference/isolatedModulesDeclaration.errors.txt +++ b/tests/baselines/reference/isolatedModulesDeclaration.errors.txt @@ -2,6 +2,6 @@ error TS5053: Option 'declaration' cannot be specified with option 'isolatedModu !!! error TS5053: Option 'declaration' cannot be specified with option 'isolatedModules'. -==== tests/cases/compiler/isolatedModulesDeclaration.ts (0 errors) ==== +==== tests/cases/compiler/file1.ts (0 errors) ==== export var x; \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesDeclaration.js b/tests/baselines/reference/isolatedModulesDeclaration.js index 12e6f23f92e14..bb3e560a2f83e 100644 --- a/tests/baselines/reference/isolatedModulesDeclaration.js +++ b/tests/baselines/reference/isolatedModulesDeclaration.js @@ -1,10 +1,10 @@ -//// [isolatedModulesDeclaration.ts] +//// [file1.ts] export var x; -//// [isolatedModulesDeclaration.js] +//// [file1.js] export var x; -//// [isolatedModulesDeclaration.d.ts] +//// [file1.d.ts] export declare var x: any; diff --git a/tests/baselines/reference/isolatedModulesES6.js b/tests/baselines/reference/isolatedModulesES6.js index eb2ee3ee33ae7..2963a9d694fbf 100644 --- a/tests/baselines/reference/isolatedModulesES6.js +++ b/tests/baselines/reference/isolatedModulesES6.js @@ -1,5 +1,5 @@ -//// [isolatedModulesES6.ts] +//// [file1.ts] export var x; -//// [isolatedModulesES6.js] +//// [file1.js] export var x; diff --git a/tests/baselines/reference/isolatedModulesES6.symbols b/tests/baselines/reference/isolatedModulesES6.symbols index c705cbc5af843..625dbfbe699b8 100644 --- a/tests/baselines/reference/isolatedModulesES6.symbols +++ b/tests/baselines/reference/isolatedModulesES6.symbols @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesES6.ts === +=== tests/cases/compiler/file1.ts === export var x; ->x : Symbol(x, Decl(isolatedModulesES6.ts, 0, 10)) +>x : Symbol(x, Decl(file1.ts, 0, 10)) diff --git a/tests/baselines/reference/isolatedModulesES6.types b/tests/baselines/reference/isolatedModulesES6.types index 898b9715ca42b..27dca700bb904 100644 --- a/tests/baselines/reference/isolatedModulesES6.types +++ b/tests/baselines/reference/isolatedModulesES6.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesES6.ts === +=== tests/cases/compiler/file1.ts === export var x; >x : any diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.errors.txt b/tests/baselines/reference/isolatedModulesImportExportElision.errors.txt index 8c6881a9bc113..60d2ca987e438 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.errors.txt +++ b/tests/baselines/reference/isolatedModulesImportExportElision.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/isolatedModulesImportExportElision.ts(2,17): error TS2307: Cannot find module 'module'. -tests/cases/compiler/isolatedModulesImportExportElision.ts(3,18): error TS2307: Cannot find module 'module'. -tests/cases/compiler/isolatedModulesImportExportElision.ts(4,21): error TS2307: Cannot find module 'module'. -tests/cases/compiler/isolatedModulesImportExportElision.ts(12,18): error TS2307: Cannot find module 'module'. +tests/cases/compiler/file1.ts(2,17): error TS2307: Cannot find module 'module'. +tests/cases/compiler/file1.ts(3,18): error TS2307: Cannot find module 'module'. +tests/cases/compiler/file1.ts(4,21): error TS2307: Cannot find module 'module'. +tests/cases/compiler/file1.ts(12,18): error TS2307: Cannot find module 'module'. -==== tests/cases/compiler/isolatedModulesImportExportElision.ts (4 errors) ==== +==== tests/cases/compiler/file1.ts (4 errors) ==== import {c} from "module" ~~~~~~~~ diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index 8cb65747e6f16..4498b462e1878 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -1,4 +1,4 @@ -//// [isolatedModulesImportExportElision.ts] +//// [file1.ts] import {c} from "module" import {c2} from "module" @@ -13,7 +13,7 @@ let y = ns.value; export {c1} from "module"; export var z = x; -//// [isolatedModulesImportExportElision.js] +//// [file1.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/isolatedModulesNoEmitOnError.errors.txt b/tests/baselines/reference/isolatedModulesNoEmitOnError.errors.txt index 337fcb16ba315..2579ffc4a9029 100644 --- a/tests/baselines/reference/isolatedModulesNoEmitOnError.errors.txt +++ b/tests/baselines/reference/isolatedModulesNoEmitOnError.errors.txt @@ -2,6 +2,6 @@ error TS5053: Option 'noEmitOnError' cannot be specified with option 'isolatedMo !!! error TS5053: Option 'noEmitOnError' cannot be specified with option 'isolatedModules'. -==== tests/cases/compiler/isolatedModulesNoEmitOnError.ts (0 errors) ==== +==== tests/cases/compiler/file1.ts (0 errors) ==== export var x; \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesNoExternalModule.errors.txt b/tests/baselines/reference/isolatedModulesNoExternalModule.errors.txt index d00520a0618f0..29353b3284a58 100644 --- a/tests/baselines/reference/isolatedModulesNoExternalModule.errors.txt +++ b/tests/baselines/reference/isolatedModulesNoExternalModule.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/isolatedModulesNoExternalModule.ts(2,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided. +tests/cases/compiler/file1.ts(2,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided. -==== tests/cases/compiler/isolatedModulesNoExternalModule.ts (1 errors) ==== +==== tests/cases/compiler/file1.ts (1 errors) ==== var x; ~~~ diff --git a/tests/baselines/reference/isolatedModulesNoExternalModule.js b/tests/baselines/reference/isolatedModulesNoExternalModule.js index dd5d23a538cac..52cdbaa140253 100644 --- a/tests/baselines/reference/isolatedModulesNoExternalModule.js +++ b/tests/baselines/reference/isolatedModulesNoExternalModule.js @@ -1,6 +1,6 @@ -//// [isolatedModulesNoExternalModule.ts] +//// [file1.ts] var x; -//// [isolatedModulesNoExternalModule.js] +//// [file1.js] var x; diff --git a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js index efdba17dc9342..396fc5979115d 100644 --- a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js +++ b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js @@ -1,10 +1,10 @@ -//// [isolatedModulesNonAmbientConstEnum.ts] +//// [file1.ts] const enum E { X = 100 }; var e = E.X; export var x; -//// [isolatedModulesNonAmbientConstEnum.js] +//// [file1.js] var E; (function (E) { E[E["X"] = 100] = "X"; diff --git a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.symbols b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.symbols index 5e30fd0b2ff38..4755208b21a31 100644 --- a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.symbols +++ b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.symbols @@ -1,15 +1,15 @@ -=== tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts === +=== tests/cases/compiler/file1.ts === const enum E { X = 100 }; ->E : Symbol(E, Decl(isolatedModulesNonAmbientConstEnum.ts, 0, 0)) ->X : Symbol(E.X, Decl(isolatedModulesNonAmbientConstEnum.ts, 1, 14)) +>E : Symbol(E, Decl(file1.ts, 0, 0)) +>X : Symbol(E.X, Decl(file1.ts, 1, 14)) var e = E.X; ->e : Symbol(e, Decl(isolatedModulesNonAmbientConstEnum.ts, 2, 3)) ->E.X : Symbol(E.X, Decl(isolatedModulesNonAmbientConstEnum.ts, 1, 14)) ->E : Symbol(E, Decl(isolatedModulesNonAmbientConstEnum.ts, 0, 0)) ->X : Symbol(E.X, Decl(isolatedModulesNonAmbientConstEnum.ts, 1, 14)) +>e : Symbol(e, Decl(file1.ts, 2, 3)) +>E.X : Symbol(E.X, Decl(file1.ts, 1, 14)) +>E : Symbol(E, Decl(file1.ts, 0, 0)) +>X : Symbol(E.X, Decl(file1.ts, 1, 14)) export var x; ->x : Symbol(x, Decl(isolatedModulesNonAmbientConstEnum.ts, 3, 10)) +>x : Symbol(x, Decl(file1.ts, 3, 10)) diff --git a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.types b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.types index d7e83b81070ca..4583a1c073070 100644 --- a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.types +++ b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesNonAmbientConstEnum.ts === +=== tests/cases/compiler/file1.ts === const enum E { X = 100 }; >E : E diff --git a/tests/baselines/reference/isolatedModulesSourceMap.js b/tests/baselines/reference/isolatedModulesSourceMap.js index 2722a3ce7abcd..02d394752d1d6 100644 --- a/tests/baselines/reference/isolatedModulesSourceMap.js +++ b/tests/baselines/reference/isolatedModulesSourceMap.js @@ -1,7 +1,7 @@ -//// [isolatedModulesSourceMap.ts] +//// [file1.ts] export var x = 1; -//// [isolatedModulesSourceMap.js] +//// [file1.js] export var x = 1; -//# sourceMappingURL=isolatedModulesSourceMap.js.map \ No newline at end of file +//# sourceMappingURL=file1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesSourceMap.js.map b/tests/baselines/reference/isolatedModulesSourceMap.js.map index 9fa3e0da0d6bc..3d86a0a714444 100644 --- a/tests/baselines/reference/isolatedModulesSourceMap.js.map +++ b/tests/baselines/reference/isolatedModulesSourceMap.js.map @@ -1,2 +1,2 @@ -//// [isolatedModulesSourceMap.js.map] -{"version":3,"file":"isolatedModulesSourceMap.js","sourceRoot":"","sources":["isolatedModulesSourceMap.ts"],"names":[],"mappings":"AACA,WAAW,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file +//// [file1.js.map] +{"version":3,"file":"file1.js","sourceRoot":"","sources":["file1.ts"],"names":[],"mappings":"AACA,WAAW,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt b/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt index d31445505f7e1..7edf071f5d199 100644 --- a/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt +++ b/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt @@ -1,12 +1,12 @@ =================================================================== -JsFile: isolatedModulesSourceMap.js -mapUrl: isolatedModulesSourceMap.js.map +JsFile: file1.js +mapUrl: file1.js.map sourceRoot: -sources: isolatedModulesSourceMap.ts +sources: file1.ts =================================================================== ------------------------------------------------------------------- -emittedFile:tests/cases/compiler/isolatedModulesSourceMap.js -sourceFile:isolatedModulesSourceMap.ts +emittedFile:tests/cases/compiler/file1.js +sourceFile:file1.ts ------------------------------------------------------------------- >>>export var x = 1; 1 > @@ -15,7 +15,7 @@ sourceFile:isolatedModulesSourceMap.ts 4 > ^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^-> 1 > > 2 >export var @@ -30,4 +30,4 @@ sourceFile:isolatedModulesSourceMap.ts 5 >Emitted(1, 17) Source(2, 17) + SourceIndex(0) 6 >Emitted(1, 18) Source(2, 18) + SourceIndex(0) --- ->>>//# sourceMappingURL=isolatedModulesSourceMap.js.map \ No newline at end of file +>>>//# sourceMappingURL=file1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesSourceMap.symbols b/tests/baselines/reference/isolatedModulesSourceMap.symbols index d4ae3c34cf10e..2f2d16d8ad0dc 100644 --- a/tests/baselines/reference/isolatedModulesSourceMap.symbols +++ b/tests/baselines/reference/isolatedModulesSourceMap.symbols @@ -1,5 +1,5 @@ -=== tests/cases/compiler/isolatedModulesSourceMap.ts === +=== tests/cases/compiler/file1.ts === export var x = 1; ->x : Symbol(x, Decl(isolatedModulesSourceMap.ts, 1, 10)) +>x : Symbol(x, Decl(file1.ts, 1, 10)) diff --git a/tests/baselines/reference/isolatedModulesSourceMap.types b/tests/baselines/reference/isolatedModulesSourceMap.types index 1955fe5da6ed9..d2a474c023d06 100644 --- a/tests/baselines/reference/isolatedModulesSourceMap.types +++ b/tests/baselines/reference/isolatedModulesSourceMap.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesSourceMap.ts === +=== tests/cases/compiler/file1.ts === export var x = 1; >x : number diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js index 95e4ec88d923e..6d002e5a66ed2 100644 --- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js @@ -1,4 +1,4 @@ -//// [isolatedModulesSpecifiedModule.ts] +//// [file1.ts] export var x; -//// [isolatedModulesSpecifiedModule.js] +//// [file1.js] diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.symbols b/tests/baselines/reference/isolatedModulesSpecifiedModule.symbols index 91ede682d7cab..625dbfbe699b8 100644 --- a/tests/baselines/reference/isolatedModulesSpecifiedModule.symbols +++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.symbols @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesSpecifiedModule.ts === +=== tests/cases/compiler/file1.ts === export var x; ->x : Symbol(x, Decl(isolatedModulesSpecifiedModule.ts, 0, 10)) +>x : Symbol(x, Decl(file1.ts, 0, 10)) diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.types b/tests/baselines/reference/isolatedModulesSpecifiedModule.types index 8dee90a199f83..27dca700bb904 100644 --- a/tests/baselines/reference/isolatedModulesSpecifiedModule.types +++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/isolatedModulesSpecifiedModule.ts === +=== tests/cases/compiler/file1.ts === export var x; >x : any diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt index 7d290bcae44fa..c2277a90859bf 100644 --- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt @@ -2,5 +2,5 @@ error TS5047: Option 'isolatedModules' can only be used when either option'--mod !!! error TS5047: Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher. -==== tests/cases/compiler/isolatedModulesUnspecifiedModule.ts (0 errors) ==== +==== tests/cases/compiler/file1.ts (0 errors) ==== export var x; \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js index 68b9bfb62db04..6d002e5a66ed2 100644 --- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js @@ -1,4 +1,4 @@ -//// [isolatedModulesUnspecifiedModule.ts] +//// [file1.ts] export var x; -//// [isolatedModulesUnspecifiedModule.js] +//// [file1.js] diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt b/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt index 90d0d003c28d6..0607a01a11c34 100644 --- a/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt +++ b/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt @@ -1,18 +1,18 @@ -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,8): error TS1003: Identifier expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,10): error TS1005: ';' expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,10): error TS2304: Cannot find name 'data'. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,15): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,18): error TS1005: ':' expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,21): error TS1109: Expression expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(10,22): error TS1109: Expression expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(11,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(11,8): error TS1003: Identifier expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(11,9): error TS2304: Cannot find name 'data'. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(11,13): error TS1005: ';' expected. -tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx(11,20): error TS1161: Unterminated regular expression literal. +tests/cases/conformance/jsx/file.tsx(10,8): error TS1003: Identifier expected. +tests/cases/conformance/jsx/file.tsx(10,10): error TS1005: ';' expected. +tests/cases/conformance/jsx/file.tsx(10,10): error TS2304: Cannot find name 'data'. +tests/cases/conformance/jsx/file.tsx(10,15): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/jsx/file.tsx(10,18): error TS1005: ':' expected. +tests/cases/conformance/jsx/file.tsx(10,21): error TS1109: Expression expected. +tests/cases/conformance/jsx/file.tsx(10,22): error TS1109: Expression expected. +tests/cases/conformance/jsx/file.tsx(11,1): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/jsx/file.tsx(11,8): error TS1003: Identifier expected. +tests/cases/conformance/jsx/file.tsx(11,9): error TS2304: Cannot find name 'data'. +tests/cases/conformance/jsx/file.tsx(11,13): error TS1005: ';' expected. +tests/cases/conformance/jsx/file.tsx(11,20): error TS1161: Unterminated regular expression literal. -==== tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx (12 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (12 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.js b/tests/baselines/reference/tsxAttributeInvalidNames.js index af1de76995c00..f734eb92ed572 100644 --- a/tests/baselines/reference/tsxAttributeInvalidNames.js +++ b/tests/baselines/reference/tsxAttributeInvalidNames.js @@ -1,4 +1,4 @@ -//// [tsxAttributeInvalidNames.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -11,7 +11,7 @@ declare module JSX { ; ; -//// [tsxAttributeInvalidNames.jsx] +//// [file.jsx] // Invalid names ; 32; diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt index 7503c5f5969ad..49bb504604e04 100644 --- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt @@ -1,13 +1,13 @@ -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(23,8): error TS2322: Type 'string' is not assignable to type 'number'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(24,8): error TS2339: Property 'y' does not exist on type 'Attribs1'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(25,8): error TS2339: Property 'y' does not exist on type 'Attribs1'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(26,8): error TS2322: Type 'string' is not assignable to type 'number'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(27,8): error TS2339: Property 'var' does not exist on type 'Attribs1'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(29,1): error TS2324: Property 'reqd' is missing in type '{ reqd: string; }'. -tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'. +tests/cases/conformance/jsx/file.tsx(23,8): error TS2322: Type 'string' is not assignable to type 'number'. +tests/cases/conformance/jsx/file.tsx(24,8): error TS2339: Property 'y' does not exist on type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(25,8): error TS2339: Property 'y' does not exist on type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(26,8): error TS2322: Type 'string' is not assignable to type 'number'. +tests/cases/conformance/jsx/file.tsx(27,8): error TS2339: Property 'var' does not exist on type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(29,1): error TS2324: Property 'reqd' is missing in type '{ reqd: string; }'. +tests/cases/conformance/jsx/file.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'. -==== tests/cases/conformance/jsx/tsxAttributeResolution1.tsx (7 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (7 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution1.js b/tests/baselines/reference/tsxAttributeResolution1.js index 1e1efb7ea22e3..3bf94909c70db 100644 --- a/tests/baselines/reference/tsxAttributeResolution1.js +++ b/tests/baselines/reference/tsxAttributeResolution1.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution1.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -34,7 +34,7 @@ interface Attribs1 { ; -//// [tsxAttributeResolution1.jsx] +//// [file.jsx] // OK ; // OK ; // OK diff --git a/tests/baselines/reference/tsxAttributeResolution2.errors.txt b/tests/baselines/reference/tsxAttributeResolution2.errors.txt index d213ccaf54eb5..84fe8fb20f259 100644 --- a/tests/baselines/reference/tsxAttributeResolution2.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution2.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxAttributeResolution2.tsx(17,21): error TS2339: Property 'leng' does not exist on type 'string'. +tests/cases/conformance/jsx/file.tsx(17,21): error TS2339: Property 'leng' does not exist on type 'string'. -==== tests/cases/conformance/jsx/tsxAttributeResolution2.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution2.js b/tests/baselines/reference/tsxAttributeResolution2.js index 564767e6169b5..f91f268f385ca 100644 --- a/tests/baselines/reference/tsxAttributeResolution2.js +++ b/tests/baselines/reference/tsxAttributeResolution2.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution2.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -18,7 +18,7 @@ interface Attribs1 { x.leng} />; // Error, no leng on 'string' -//// [tsxAttributeResolution2.jsx] +//// [file.jsx] // OK ; // OK ; // OK diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt index c797362e8d770..6513b9879dcaf 100644 --- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt @@ -1,12 +1,12 @@ -tests/cases/conformance/jsx/tsxAttributeResolution3.tsx(19,8): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. +tests/cases/conformance/jsx/file.tsx(19,8): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. Type 'number' is not assignable to type 'string'. -tests/cases/conformance/jsx/tsxAttributeResolution3.tsx(23,1): error TS2324: Property 'x' is missing in type 'Attribs1'. -tests/cases/conformance/jsx/tsxAttributeResolution3.tsx(31,15): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. +tests/cases/conformance/jsx/file.tsx(23,1): error TS2324: Property 'x' is missing in type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(31,15): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. Type 'number' is not assignable to type 'string'. -tests/cases/conformance/jsx/tsxAttributeResolution3.tsx(39,8): error TS2322: Type 'number' is not assignable to type 'string'. +tests/cases/conformance/jsx/file.tsx(39,8): error TS2322: Type 'number' is not assignable to type 'string'. -==== tests/cases/conformance/jsx/tsxAttributeResolution3.tsx (4 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (4 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution3.js b/tests/baselines/reference/tsxAttributeResolution3.js index 8cf853820e19a..2898a6bc25144 100644 --- a/tests/baselines/reference/tsxAttributeResolution3.js +++ b/tests/baselines/reference/tsxAttributeResolution3.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution3.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -40,7 +40,7 @@ var obj7 = { x: 'foo' }; -//// [tsxAttributeResolution3.jsx] +//// [file.jsx] // OK var obj1 = { x: 'foo' }; ; diff --git a/tests/baselines/reference/tsxAttributeResolution4.errors.txt b/tests/baselines/reference/tsxAttributeResolution4.errors.txt index 211a349b30456..0a54dc32c46c6 100644 --- a/tests/baselines/reference/tsxAttributeResolution4.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution4.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxAttributeResolution4.tsx(15,26): error TS2339: Property 'len' does not exist on type 'string'. +tests/cases/conformance/jsx/file.tsx(15,26): error TS2339: Property 'len' does not exist on type 'string'. -==== tests/cases/conformance/jsx/tsxAttributeResolution4.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution4.js b/tests/baselines/reference/tsxAttributeResolution4.js index d56cb4cc2e808..ccd1ba8157c73 100644 --- a/tests/baselines/reference/tsxAttributeResolution4.js +++ b/tests/baselines/reference/tsxAttributeResolution4.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution4.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -16,7 +16,7 @@ interface Attribs1 { n.len} } />; -//// [tsxAttributeResolution4.jsx] +//// [file.jsx] // OK ; // Error, no member 'len' on 'string' diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt index 1b42dd014655d..d7aa46bc05ace 100644 --- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/jsx/tsxAttributeResolution5.tsx(21,16): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. +tests/cases/conformance/jsx/file.tsx(21,16): error TS2606: Property 'x' of JSX spread attribute is not assignable to target property. Type 'number' is not assignable to type 'string'. -tests/cases/conformance/jsx/tsxAttributeResolution5.tsx(25,9): error TS2324: Property 'x' is missing in type 'Attribs1'. -tests/cases/conformance/jsx/tsxAttributeResolution5.tsx(29,1): error TS2324: Property 'x' is missing in type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(25,9): error TS2324: Property 'x' is missing in type 'Attribs1'. +tests/cases/conformance/jsx/file.tsx(29,1): error TS2324: Property 'x' is missing in type 'Attribs1'. -==== tests/cases/conformance/jsx/tsxAttributeResolution5.tsx (3 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution5.js b/tests/baselines/reference/tsxAttributeResolution5.js index 34fe9a3bfb6c7..abfb54e000c7e 100644 --- a/tests/baselines/reference/tsxAttributeResolution5.js +++ b/tests/baselines/reference/tsxAttributeResolution5.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution5.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -31,7 +31,7 @@ function make3 (obj: T) { ; // OK -//// [tsxAttributeResolution5.jsx] +//// [file.jsx] function make1(obj) { return ; // OK } diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt index 4f1960358a560..732ac9500a9a2 100644 --- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/jsx/tsxAttributeResolution6.tsx(10,8): error TS2322: Type 'boolean' is not assignable to type 'string'. -tests/cases/conformance/jsx/tsxAttributeResolution6.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'. -tests/cases/conformance/jsx/tsxAttributeResolution6.tsx(12,1): error TS2324: Property 'n' is missing in type '{ n: boolean; }'. +tests/cases/conformance/jsx/file.tsx(10,8): error TS2322: Type 'boolean' is not assignable to type 'string'. +tests/cases/conformance/jsx/file.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'. +tests/cases/conformance/jsx/file.tsx(12,1): error TS2324: Property 'n' is missing in type '{ n: boolean; }'. -==== tests/cases/conformance/jsx/tsxAttributeResolution6.tsx (3 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution6.js b/tests/baselines/reference/tsxAttributeResolution6.js index f4af0ba875acb..4665c5e322f60 100644 --- a/tests/baselines/reference/tsxAttributeResolution6.js +++ b/tests/baselines/reference/tsxAttributeResolution6.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution6.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -18,7 +18,7 @@ declare module JSX { ; -//// [tsxAttributeResolution6.jsx] +//// [file.jsx] // Error ; ; diff --git a/tests/baselines/reference/tsxAttributeResolution7.errors.txt b/tests/baselines/reference/tsxAttributeResolution7.errors.txt index 4d05254ace8d5..acbd7f407de8b 100644 --- a/tests/baselines/reference/tsxAttributeResolution7.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution7.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxAttributeResolution7.tsx(9,8): error TS2322: Type 'number' is not assignable to type 'string'. +tests/cases/conformance/jsx/file.tsx(9,8): error TS2322: Type 'number' is not assignable to type 'string'. -==== tests/cases/conformance/jsx/tsxAttributeResolution7.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxAttributeResolution7.js b/tests/baselines/reference/tsxAttributeResolution7.js index 7ebd2e8f4db8a..d474e48b21bcd 100644 --- a/tests/baselines/reference/tsxAttributeResolution7.js +++ b/tests/baselines/reference/tsxAttributeResolution7.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution7.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -15,7 +15,7 @@ declare module JSX { ; -//// [tsxAttributeResolution7.jsx] +//// [file.jsx] // Error ; // OK diff --git a/tests/baselines/reference/tsxAttributeResolution8.js b/tests/baselines/reference/tsxAttributeResolution8.js index 50fff6c80fddc..e1b00c6b573e9 100644 --- a/tests/baselines/reference/tsxAttributeResolution8.js +++ b/tests/baselines/reference/tsxAttributeResolution8.js @@ -1,4 +1,4 @@ -//// [tsxAttributeResolution8.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -10,7 +10,7 @@ var x: any; // Should be OK -//// [tsxAttributeResolution8.jsx] +//// [file.jsx] var x; // Should be OK ; diff --git a/tests/baselines/reference/tsxAttributeResolution8.symbols b/tests/baselines/reference/tsxAttributeResolution8.symbols index 9bb09c6cd85e4..ae194978a3516 100644 --- a/tests/baselines/reference/tsxAttributeResolution8.symbols +++ b/tests/baselines/reference/tsxAttributeResolution8.symbols @@ -1,23 +1,23 @@ -=== tests/cases/conformance/jsx/tsxAttributeResolution8.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxAttributeResolution8.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxAttributeResolution8.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxAttributeResolution8.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) test1: {x: string}; ->test1 : Symbol(test1, Decl(tsxAttributeResolution8.tsx, 2, 30)) ->x : Symbol(x, Decl(tsxAttributeResolution8.tsx, 3, 10)) +>test1 : Symbol(test1, Decl(file.tsx, 2, 30)) +>x : Symbol(x, Decl(file.tsx, 3, 10)) } } var x: any; ->x : Symbol(x, Decl(tsxAttributeResolution8.tsx, 7, 3)) +>x : Symbol(x, Decl(file.tsx, 7, 3)) // Should be OK ->test1 : Symbol(JSX.IntrinsicElements.test1, Decl(tsxAttributeResolution8.tsx, 2, 30)) +>test1 : Symbol(JSX.IntrinsicElements.test1, Decl(file.tsx, 2, 30)) diff --git a/tests/baselines/reference/tsxAttributeResolution8.types b/tests/baselines/reference/tsxAttributeResolution8.types index db89d6678b669..99a60c24ce215 100644 --- a/tests/baselines/reference/tsxAttributeResolution8.types +++ b/tests/baselines/reference/tsxAttributeResolution8.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxAttributeResolution8.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxElementResolution1.errors.txt b/tests/baselines/reference/tsxElementResolution1.errors.txt index b54430bd106c8..0042c5b052c24 100644 --- a/tests/baselines/reference/tsxElementResolution1.errors.txt +++ b/tests/baselines/reference/tsxElementResolution1.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxElementResolution1.tsx(12,1): error TS2339: Property 'span' does not exist on type 'JSX.IntrinsicElements'. +tests/cases/conformance/jsx/file.tsx(12,1): error TS2339: Property 'span' does not exist on type 'JSX.IntrinsicElements'. -==== tests/cases/conformance/jsx/tsxElementResolution1.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxElementResolution1.js b/tests/baselines/reference/tsxElementResolution1.js index c7e0536bde28e..47c60fba1b38a 100644 --- a/tests/baselines/reference/tsxElementResolution1.js +++ b/tests/baselines/reference/tsxElementResolution1.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution1.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -12,7 +12,7 @@ declare module JSX { // Fail ; -//// [tsxElementResolution1.jsx] +//// [file.jsx] // OK
; // Fail diff --git a/tests/baselines/reference/tsxElementResolution10.errors.txt b/tests/baselines/reference/tsxElementResolution10.errors.txt index 6dcee7d18fa8d..9214ffe7dbb3f 100644 --- a/tests/baselines/reference/tsxElementResolution10.errors.txt +++ b/tests/baselines/reference/tsxElementResolution10.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution10.tsx(13,1): error TS2605: JSX element type '{ x: number; }' is not a constructor function for JSX elements. +tests/cases/conformance/jsx/file.tsx(13,1): error TS2605: JSX element type '{ x: number; }' is not a constructor function for JSX elements. Property 'render' is missing in type '{ x: number; }'. -==== tests/cases/conformance/jsx/tsxElementResolution10.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface ElementClass { diff --git a/tests/baselines/reference/tsxElementResolution10.js b/tests/baselines/reference/tsxElementResolution10.js index 84c8619ab9635..72cd1cb9f0030 100644 --- a/tests/baselines/reference/tsxElementResolution10.js +++ b/tests/baselines/reference/tsxElementResolution10.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution10.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface ElementClass { @@ -20,7 +20,7 @@ var Obj2: Obj2type; ; // OK -//// [tsxElementResolution10.jsx] +//// [file.jsx] var Obj1; ; // Error, no render member var Obj2; diff --git a/tests/baselines/reference/tsxElementResolution11.errors.txt b/tests/baselines/reference/tsxElementResolution11.errors.txt index 4f3ee00d82f00..f6a4913e558e6 100644 --- a/tests/baselines/reference/tsxElementResolution11.errors.txt +++ b/tests/baselines/reference/tsxElementResolution11.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxElementResolution11.tsx(17,7): error TS2339: Property 'x' does not exist on type '{ q?: number; }'. +tests/cases/conformance/jsx/file.tsx(17,7): error TS2339: Property 'x' does not exist on type '{ q?: number; }'. -==== tests/cases/conformance/jsx/tsxElementResolution11.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface ElementAttributesProperty { } diff --git a/tests/baselines/reference/tsxElementResolution11.js b/tests/baselines/reference/tsxElementResolution11.js index fb8572116b16f..dfed67210ed14 100644 --- a/tests/baselines/reference/tsxElementResolution11.js +++ b/tests/baselines/reference/tsxElementResolution11.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution11.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface ElementAttributesProperty { } @@ -24,7 +24,7 @@ var Obj3: Obj3type; ; // OK -//// [tsxElementResolution11.jsx] +//// [file.jsx] var Obj1; ; // OK var Obj2; diff --git a/tests/baselines/reference/tsxElementResolution12.errors.txt b/tests/baselines/reference/tsxElementResolution12.errors.txt index 71a22b502aa34..4a15005f6fb72 100644 --- a/tests/baselines/reference/tsxElementResolution12.errors.txt +++ b/tests/baselines/reference/tsxElementResolution12.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/jsx/tsxElementResolution12.tsx(17,2): error TS2304: Cannot find name 'Obj2'. -tests/cases/conformance/jsx/tsxElementResolution12.tsx(23,1): error TS2607: JSX element class does not support attributes because it does not have a 'pr' property -tests/cases/conformance/jsx/tsxElementResolution12.tsx(30,7): error TS2322: Type 'string' is not assignable to type 'number'. +tests/cases/conformance/jsx/file.tsx(17,2): error TS2304: Cannot find name 'Obj2'. +tests/cases/conformance/jsx/file.tsx(23,1): error TS2607: JSX element class does not support attributes because it does not have a 'pr' property +tests/cases/conformance/jsx/file.tsx(30,7): error TS2322: Type 'string' is not assignable to type 'number'. -==== tests/cases/conformance/jsx/tsxElementResolution12.tsx (3 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== declare module JSX { interface Element { } interface ElementAttributesProperty { pr: any; } diff --git a/tests/baselines/reference/tsxElementResolution12.js b/tests/baselines/reference/tsxElementResolution12.js index 12973efdda7a1..b4dd94ef0eb8b 100644 --- a/tests/baselines/reference/tsxElementResolution12.js +++ b/tests/baselines/reference/tsxElementResolution12.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution12.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface ElementAttributesProperty { pr: any; } @@ -31,7 +31,7 @@ var Obj4: Obj4type; ; // Error -//// [tsxElementResolution12.jsx] +//// [file.jsx] var Obj1; ; // OK var obj2; diff --git a/tests/baselines/reference/tsxElementResolution13.js b/tests/baselines/reference/tsxElementResolution13.js index f8631bdec0c2b..461c494bc5887 100644 --- a/tests/baselines/reference/tsxElementResolution13.js +++ b/tests/baselines/reference/tsxElementResolution13.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution13.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface ElementAttributesProperty { pr1: any; pr2: any; } @@ -11,6 +11,6 @@ var obj1: Obj1; ; // Error -//// [tsxElementResolution13.jsx] +//// [file.jsx] var obj1; ; // Error diff --git a/tests/baselines/reference/tsxElementResolution13.symbols b/tests/baselines/reference/tsxElementResolution13.symbols index 4022602e53a14..94758b291acaf 100644 --- a/tests/baselines/reference/tsxElementResolution13.symbols +++ b/tests/baselines/reference/tsxElementResolution13.symbols @@ -1,25 +1,25 @@ -=== tests/cases/conformance/jsx/tsxElementResolution13.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxElementResolution13.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxElementResolution13.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface ElementAttributesProperty { pr1: any; pr2: any; } ->ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(tsxElementResolution13.tsx, 1, 22)) ->pr1 : Symbol(pr1, Decl(tsxElementResolution13.tsx, 2, 38)) ->pr2 : Symbol(pr2, Decl(tsxElementResolution13.tsx, 2, 48)) +>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(file.tsx, 1, 22)) +>pr1 : Symbol(pr1, Decl(file.tsx, 2, 38)) +>pr2 : Symbol(pr2, Decl(file.tsx, 2, 48)) } interface Obj1 { ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution13.tsx, 3, 1)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1)) new(n: string): any; ->n : Symbol(n, Decl(tsxElementResolution13.tsx, 6, 5)) +>n : Symbol(n, Decl(file.tsx, 6, 5)) } var obj1: Obj1; ->obj1 : Symbol(obj1, Decl(tsxElementResolution13.tsx, 8, 3)) ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution13.tsx, 3, 1)) +>obj1 : Symbol(obj1, Decl(file.tsx, 8, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1)) ; // Error >x : Symbol(unknown) diff --git a/tests/baselines/reference/tsxElementResolution13.types b/tests/baselines/reference/tsxElementResolution13.types index 613835f32113e..57884f86b56db 100644 --- a/tests/baselines/reference/tsxElementResolution13.types +++ b/tests/baselines/reference/tsxElementResolution13.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxElementResolution13.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxElementResolution14.js b/tests/baselines/reference/tsxElementResolution14.js index e1e440db5f3bc..d594aba237bc9 100644 --- a/tests/baselines/reference/tsxElementResolution14.js +++ b/tests/baselines/reference/tsxElementResolution14.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution14.tsx] +//// [file.tsx] declare module JSX { interface Element { } } @@ -10,6 +10,6 @@ var obj1: Obj1; ; // OK -//// [tsxElementResolution14.jsx] +//// [file.jsx] var obj1; ; // OK diff --git a/tests/baselines/reference/tsxElementResolution14.symbols b/tests/baselines/reference/tsxElementResolution14.symbols index 58236a4e462f6..2400ef620ebc4 100644 --- a/tests/baselines/reference/tsxElementResolution14.symbols +++ b/tests/baselines/reference/tsxElementResolution14.symbols @@ -1,20 +1,20 @@ -=== tests/cases/conformance/jsx/tsxElementResolution14.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxElementResolution14.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxElementResolution14.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) } interface Obj1 { ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution14.tsx, 2, 1)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 2, 1)) new(n: string): {}; ->n : Symbol(n, Decl(tsxElementResolution14.tsx, 5, 5)) +>n : Symbol(n, Decl(file.tsx, 5, 5)) } var obj1: Obj1; ->obj1 : Symbol(obj1, Decl(tsxElementResolution14.tsx, 7, 3)) ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution14.tsx, 2, 1)) +>obj1 : Symbol(obj1, Decl(file.tsx, 7, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 2, 1)) ; // OK >x : Symbol(unknown) diff --git a/tests/baselines/reference/tsxElementResolution14.types b/tests/baselines/reference/tsxElementResolution14.types index 80f9555030fc2..2768a6c531d0b 100644 --- a/tests/baselines/reference/tsxElementResolution14.types +++ b/tests/baselines/reference/tsxElementResolution14.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxElementResolution14.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxElementResolution15.errors.txt b/tests/baselines/reference/tsxElementResolution15.errors.txt index 24480ab7f2b41..79cbd1a37af11 100644 --- a/tests/baselines/reference/tsxElementResolution15.errors.txt +++ b/tests/baselines/reference/tsxElementResolution15.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxElementResolution15.tsx(3,12): error TS2608: The global type 'JSX.ElementAttributesProperty' may not have more than one property +tests/cases/conformance/jsx/file.tsx(3,12): error TS2608: The global type 'JSX.ElementAttributesProperty' may not have more than one property -==== tests/cases/conformance/jsx/tsxElementResolution15.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface ElementAttributesProperty { pr1: any; pr2: any; } diff --git a/tests/baselines/reference/tsxElementResolution15.js b/tests/baselines/reference/tsxElementResolution15.js index 831b3a54b413a..6c8560f225d9b 100644 --- a/tests/baselines/reference/tsxElementResolution15.js +++ b/tests/baselines/reference/tsxElementResolution15.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution15.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface ElementAttributesProperty { pr1: any; pr2: any; } @@ -12,6 +12,6 @@ var Obj1: Obj1type; ; // Error -//// [tsxElementResolution15.jsx] +//// [file.jsx] var Obj1; ; // Error diff --git a/tests/baselines/reference/tsxElementResolution16.errors.txt b/tests/baselines/reference/tsxElementResolution16.errors.txt index 0e30cad9673a0..1a887c3999577 100644 --- a/tests/baselines/reference/tsxElementResolution16.errors.txt +++ b/tests/baselines/reference/tsxElementResolution16.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution16.tsx(8,1): error TS2602: JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist. -tests/cases/conformance/jsx/tsxElementResolution16.tsx(8,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists +tests/cases/conformance/jsx/file.tsx(8,1): error TS2602: JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist. +tests/cases/conformance/jsx/file.tsx(8,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists -==== tests/cases/conformance/jsx/tsxElementResolution16.tsx (2 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { } diff --git a/tests/baselines/reference/tsxElementResolution16.js b/tests/baselines/reference/tsxElementResolution16.js index 1961215fa05e2..a5abea6717fbb 100644 --- a/tests/baselines/reference/tsxElementResolution16.js +++ b/tests/baselines/reference/tsxElementResolution16.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution16.tsx] +//// [file.tsx] declare module JSX { } @@ -9,6 +9,6 @@ var obj1: Obj1; ; // Error (JSX.Element is implicit any) -//// [tsxElementResolution16.jsx] +//// [file.jsx] var obj1; ; // Error (JSX.Element is implicit any) diff --git a/tests/baselines/reference/tsxElementResolution18.errors.txt b/tests/baselines/reference/tsxElementResolution18.errors.txt index a4728b2f749e5..5b8468696c019 100644 --- a/tests/baselines/reference/tsxElementResolution18.errors.txt +++ b/tests/baselines/reference/tsxElementResolution18.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxElementResolution18.tsx(6,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists +tests/cases/conformance/jsx/file1.tsx(6,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists -==== tests/cases/conformance/jsx/tsxElementResolution18.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file1.tsx (1 errors) ==== declare module JSX { interface Element { } } diff --git a/tests/baselines/reference/tsxElementResolution18.js b/tests/baselines/reference/tsxElementResolution18.js index 0b5138b7b4927..4481b9033f4c5 100644 --- a/tests/baselines/reference/tsxElementResolution18.js +++ b/tests/baselines/reference/tsxElementResolution18.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution18.tsx] +//// [file1.tsx] declare module JSX { interface Element { } } @@ -7,6 +7,6 @@ declare module JSX {
; -//// [tsxElementResolution18.jsx] +//// [file1.jsx] // Error under implicit any
; diff --git a/tests/baselines/reference/tsxElementResolution2.js b/tests/baselines/reference/tsxElementResolution2.js index 1d06656d529a5..c6934e9df899b 100644 --- a/tests/baselines/reference/tsxElementResolution2.js +++ b/tests/baselines/reference/tsxElementResolution2.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution2.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -12,7 +12,7 @@ declare module JSX { // OK ; -//// [tsxElementResolution2.jsx] +//// [file.jsx] // OK
; // OK diff --git a/tests/baselines/reference/tsxElementResolution2.symbols b/tests/baselines/reference/tsxElementResolution2.symbols index 2935bcd4f63d5..efb1d9ae5dcd7 100644 --- a/tests/baselines/reference/tsxElementResolution2.symbols +++ b/tests/baselines/reference/tsxElementResolution2.symbols @@ -1,23 +1,23 @@ -=== tests/cases/conformance/jsx/tsxElementResolution2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxElementResolution2.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxElementResolution2.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxElementResolution2.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [x: string]: any; ->x : Symbol(x, Decl(tsxElementResolution2.tsx, 3, 6)) +>x : Symbol(x, Decl(file.tsx, 3, 6)) } } // OK
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxElementResolution2.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // OK ; ->span : Symbol(JSX.IntrinsicElements, Decl(tsxElementResolution2.tsx, 1, 22)) +>span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxElementResolution2.types b/tests/baselines/reference/tsxElementResolution2.types index 56ea51582539b..4fd87304a72d4 100644 --- a/tests/baselines/reference/tsxElementResolution2.types +++ b/tests/baselines/reference/tsxElementResolution2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxElementResolution2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxElementResolution3.errors.txt b/tests/baselines/reference/tsxElementResolution3.errors.txt index bc3c7c5ebfc55..1b8b6c5834c15 100644 --- a/tests/baselines/reference/tsxElementResolution3.errors.txt +++ b/tests/baselines/reference/tsxElementResolution3.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution3.tsx(12,1): error TS2324: Property 'n' is missing in type '{ n: string; }'. -tests/cases/conformance/jsx/tsxElementResolution3.tsx(12,7): error TS2339: Property 'w' does not exist on type '{ n: string; }'. +tests/cases/conformance/jsx/file.tsx(12,1): error TS2324: Property 'n' is missing in type '{ n: string; }'. +tests/cases/conformance/jsx/file.tsx(12,7): error TS2339: Property 'w' does not exist on type '{ n: string; }'. -==== tests/cases/conformance/jsx/tsxElementResolution3.tsx (2 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxElementResolution3.js b/tests/baselines/reference/tsxElementResolution3.js index 607d1c5ec66fc..75b23db761e19 100644 --- a/tests/baselines/reference/tsxElementResolution3.js +++ b/tests/baselines/reference/tsxElementResolution3.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution3.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -12,7 +12,7 @@ declare module JSX { // Error ; -//// [tsxElementResolution3.jsx] +//// [file.jsx] // OK
; // Error diff --git a/tests/baselines/reference/tsxElementResolution4.errors.txt b/tests/baselines/reference/tsxElementResolution4.errors.txt index 0e383af5e7b13..e6dd599defc8d 100644 --- a/tests/baselines/reference/tsxElementResolution4.errors.txt +++ b/tests/baselines/reference/tsxElementResolution4.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution4.tsx(16,1): error TS2324: Property 'm' is missing in type '{ m: string; }'. -tests/cases/conformance/jsx/tsxElementResolution4.tsx(16,7): error TS2339: Property 'q' does not exist on type '{ m: string; }'. +tests/cases/conformance/jsx/file.tsx(16,1): error TS2324: Property 'm' is missing in type '{ m: string; }'. +tests/cases/conformance/jsx/file.tsx(16,7): error TS2339: Property 'q' does not exist on type '{ m: string; }'. -==== tests/cases/conformance/jsx/tsxElementResolution4.tsx (2 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxElementResolution4.js b/tests/baselines/reference/tsxElementResolution4.js index ea395cb507762..40d86816f7667 100644 --- a/tests/baselines/reference/tsxElementResolution4.js +++ b/tests/baselines/reference/tsxElementResolution4.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution4.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -17,7 +17,7 @@ declare module JSX { ; -//// [tsxElementResolution4.jsx] +//// [file.jsx] // OK
; // OK diff --git a/tests/baselines/reference/tsxElementResolution5.js b/tests/baselines/reference/tsxElementResolution5.js index 8aadfec0f782e..4dcd644e47164 100644 --- a/tests/baselines/reference/tsxElementResolution5.js +++ b/tests/baselines/reference/tsxElementResolution5.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution5.tsx] +//// [file1.tsx] declare module JSX { interface Element { } } @@ -7,6 +7,6 @@ declare module JSX {
; -//// [tsxElementResolution5.jsx] +//// [file1.jsx] // OK, but implicit any
; diff --git a/tests/baselines/reference/tsxElementResolution5.symbols b/tests/baselines/reference/tsxElementResolution5.symbols index 8bbbfaaeb689d..461ffd78aaa5c 100644 --- a/tests/baselines/reference/tsxElementResolution5.symbols +++ b/tests/baselines/reference/tsxElementResolution5.symbols @@ -1,9 +1,9 @@ -=== tests/cases/conformance/jsx/tsxElementResolution5.tsx === +=== tests/cases/conformance/jsx/file1.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxElementResolution5.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file1.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxElementResolution5.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file1.tsx, 0, 20)) } // OK, but implicit any diff --git a/tests/baselines/reference/tsxElementResolution5.types b/tests/baselines/reference/tsxElementResolution5.types index ba3509f4fa135..cdfb91c706728 100644 --- a/tests/baselines/reference/tsxElementResolution5.types +++ b/tests/baselines/reference/tsxElementResolution5.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxElementResolution5.tsx === +=== tests/cases/conformance/jsx/file1.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxElementResolution6.errors.txt b/tests/baselines/reference/tsxElementResolution6.errors.txt index 1336cc6df0c06..66269efee9f2d 100644 --- a/tests/baselines/reference/tsxElementResolution6.errors.txt +++ b/tests/baselines/reference/tsxElementResolution6.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxElementResolution6.tsx(8,1): error TS2339: Property 'div' does not exist on type 'JSX.IntrinsicElements'. +tests/cases/conformance/jsx/file.tsx(8,1): error TS2339: Property 'div' does not exist on type 'JSX.IntrinsicElements'. -==== tests/cases/conformance/jsx/tsxElementResolution6.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxElementResolution6.js b/tests/baselines/reference/tsxElementResolution6.js index 1b6d174fea8b0..43d0512c893e1 100644 --- a/tests/baselines/reference/tsxElementResolution6.js +++ b/tests/baselines/reference/tsxElementResolution6.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution6.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { } @@ -9,7 +9,7 @@ var div: any;
; -//// [tsxElementResolution6.jsx] +//// [file.jsx] var div; // Still an error
; diff --git a/tests/baselines/reference/tsxElementResolution7.errors.txt b/tests/baselines/reference/tsxElementResolution7.errors.txt index b8549e19535ff..20b5b730d4cd6 100644 --- a/tests/baselines/reference/tsxElementResolution7.errors.txt +++ b/tests/baselines/reference/tsxElementResolution7.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution7.tsx(12,5): error TS2339: Property 'other' does not exist on type 'typeof my'. -tests/cases/conformance/jsx/tsxElementResolution7.tsx(19,11): error TS2339: Property 'non' does not exist on type 'typeof my'. +tests/cases/conformance/jsx/file.tsx(12,5): error TS2339: Property 'other' does not exist on type 'typeof my'. +tests/cases/conformance/jsx/file.tsx(19,11): error TS2339: Property 'non' does not exist on type 'typeof my'. -==== tests/cases/conformance/jsx/tsxElementResolution7.tsx (2 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxElementResolution7.js b/tests/baselines/reference/tsxElementResolution7.js index 7df44b052a214..06daf11ceac21 100644 --- a/tests/baselines/reference/tsxElementResolution7.js +++ b/tests/baselines/reference/tsxElementResolution7.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution7.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { } @@ -21,7 +21,7 @@ module q { } -//// [tsxElementResolution7.jsx] +//// [file.jsx] var my; (function (my) { })(my || (my = {})); diff --git a/tests/baselines/reference/tsxElementResolution8.errors.txt b/tests/baselines/reference/tsxElementResolution8.errors.txt index 92ff05d1aedb7..5f54bc23cd055 100644 --- a/tests/baselines/reference/tsxElementResolution8.errors.txt +++ b/tests/baselines/reference/tsxElementResolution8.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/jsx/tsxElementResolution8.tsx(8,2): error TS2604: JSX element type 'Div' does not have any construct or call signatures. -tests/cases/conformance/jsx/tsxElementResolution8.tsx(34,2): error TS2604: JSX element type 'Obj3' does not have any construct or call signatures. +tests/cases/conformance/jsx/file.tsx(8,2): error TS2604: JSX element type 'Div' does not have any construct or call signatures. +tests/cases/conformance/jsx/file.tsx(34,2): error TS2604: JSX element type 'Obj3' does not have any construct or call signatures. -==== tests/cases/conformance/jsx/tsxElementResolution8.tsx (2 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxElementResolution8.js b/tests/baselines/reference/tsxElementResolution8.js index 4217761c4025c..d82f26ee8b51a 100644 --- a/tests/baselines/reference/tsxElementResolution8.js +++ b/tests/baselines/reference/tsxElementResolution8.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution8.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { } @@ -35,7 +35,7 @@ var Obj3: Obj3; ; // Error -//// [tsxElementResolution8.jsx] +//// [file.jsx] // Error var Div = 3;
; diff --git a/tests/baselines/reference/tsxElementResolution9.js b/tests/baselines/reference/tsxElementResolution9.js index c897a51eaeb56..bc65bb0bb02d2 100644 --- a/tests/baselines/reference/tsxElementResolution9.js +++ b/tests/baselines/reference/tsxElementResolution9.js @@ -1,4 +1,4 @@ -//// [tsxElementResolution9.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { } @@ -26,7 +26,7 @@ var Obj3: Obj3; ; // OK -//// [tsxElementResolution9.jsx] +//// [file.jsx] var Obj1; ; // Error, return type is not an object type var Obj2; diff --git a/tests/baselines/reference/tsxElementResolution9.symbols b/tests/baselines/reference/tsxElementResolution9.symbols index bfa04219ef990..e38c64d084753 100644 --- a/tests/baselines/reference/tsxElementResolution9.symbols +++ b/tests/baselines/reference/tsxElementResolution9.symbols @@ -1,67 +1,67 @@ -=== tests/cases/conformance/jsx/tsxElementResolution9.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxElementResolution9.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxElementResolution9.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { } ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxElementResolution9.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) } interface Obj1 { ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution9.tsx, 3, 1), Decl(tsxElementResolution9.tsx, 9, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3)) new(n: string): { x: number }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 6, 5)) ->x : Symbol(x, Decl(tsxElementResolution9.tsx, 6, 18)) +>n : Symbol(n, Decl(file.tsx, 6, 5)) +>x : Symbol(x, Decl(file.tsx, 6, 18)) new(n: number): { y: string }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 7, 5)) ->y : Symbol(y, Decl(tsxElementResolution9.tsx, 7, 18)) +>n : Symbol(n, Decl(file.tsx, 7, 5)) +>y : Symbol(y, Decl(file.tsx, 7, 18)) } var Obj1: Obj1; ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution9.tsx, 3, 1), Decl(tsxElementResolution9.tsx, 9, 3)) ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution9.tsx, 3, 1), Decl(tsxElementResolution9.tsx, 9, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3)) ; // Error, return type is not an object type ->Obj1 : Symbol(Obj1, Decl(tsxElementResolution9.tsx, 3, 1), Decl(tsxElementResolution9.tsx, 9, 3)) +>Obj1 : Symbol(Obj1, Decl(file.tsx, 3, 1), Decl(file.tsx, 9, 3)) interface Obj2 { ->Obj2 : Symbol(Obj2, Decl(tsxElementResolution9.tsx, 10, 9), Decl(tsxElementResolution9.tsx, 16, 3)) +>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3)) (n: string): { x: number }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 13, 2)) ->x : Symbol(x, Decl(tsxElementResolution9.tsx, 13, 15)) +>n : Symbol(n, Decl(file.tsx, 13, 2)) +>x : Symbol(x, Decl(file.tsx, 13, 15)) (n: number): { y: string }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 14, 2)) ->y : Symbol(y, Decl(tsxElementResolution9.tsx, 14, 15)) +>n : Symbol(n, Decl(file.tsx, 14, 2)) +>y : Symbol(y, Decl(file.tsx, 14, 15)) } var Obj2: Obj2; ->Obj2 : Symbol(Obj2, Decl(tsxElementResolution9.tsx, 10, 9), Decl(tsxElementResolution9.tsx, 16, 3)) ->Obj2 : Symbol(Obj2, Decl(tsxElementResolution9.tsx, 10, 9), Decl(tsxElementResolution9.tsx, 16, 3)) +>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3)) +>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3)) ; // Error, return type is not an object type ->Obj2 : Symbol(Obj2, Decl(tsxElementResolution9.tsx, 10, 9), Decl(tsxElementResolution9.tsx, 16, 3)) +>Obj2 : Symbol(Obj2, Decl(file.tsx, 10, 9), Decl(file.tsx, 16, 3)) interface Obj3 { ->Obj3 : Symbol(Obj3, Decl(tsxElementResolution9.tsx, 17, 9), Decl(tsxElementResolution9.tsx, 23, 3)) +>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3)) (n: string): { x: number }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 20, 2)) ->x : Symbol(x, Decl(tsxElementResolution9.tsx, 20, 15)) +>n : Symbol(n, Decl(file.tsx, 20, 2)) +>x : Symbol(x, Decl(file.tsx, 20, 15)) (n: number): { x: number; y: string }; ->n : Symbol(n, Decl(tsxElementResolution9.tsx, 21, 2)) ->x : Symbol(x, Decl(tsxElementResolution9.tsx, 21, 15)) ->y : Symbol(y, Decl(tsxElementResolution9.tsx, 21, 26)) +>n : Symbol(n, Decl(file.tsx, 21, 2)) +>x : Symbol(x, Decl(file.tsx, 21, 15)) +>y : Symbol(y, Decl(file.tsx, 21, 26)) } var Obj3: Obj3; ->Obj3 : Symbol(Obj3, Decl(tsxElementResolution9.tsx, 17, 9), Decl(tsxElementResolution9.tsx, 23, 3)) ->Obj3 : Symbol(Obj3, Decl(tsxElementResolution9.tsx, 17, 9), Decl(tsxElementResolution9.tsx, 23, 3)) +>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3)) +>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3)) ; // OK ->Obj3 : Symbol(Obj3, Decl(tsxElementResolution9.tsx, 17, 9), Decl(tsxElementResolution9.tsx, 23, 3)) +>Obj3 : Symbol(Obj3, Decl(file.tsx, 17, 9), Decl(file.tsx, 23, 3)) >x : Symbol(unknown) diff --git a/tests/baselines/reference/tsxElementResolution9.types b/tests/baselines/reference/tsxElementResolution9.types index 6725bd216bd33..dd84e6f07b5ff 100644 --- a/tests/baselines/reference/tsxElementResolution9.types +++ b/tests/baselines/reference/tsxElementResolution9.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxElementResolution9.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxEmit1.js b/tests/baselines/reference/tsxEmit1.js index baa75526dd775..bfa78a3e96c5e 100644 --- a/tests/baselines/reference/tsxEmit1.js +++ b/tests/baselines/reference/tsxEmit1.js @@ -1,4 +1,4 @@ -//// [tsxEmit1.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -40,7 +40,7 @@ var whitespace3 =
; -//// [tsxEmit1.jsx] +//// [file.jsx] var p; var selfClosed1 =
; var selfClosed2 =
; diff --git a/tests/baselines/reference/tsxEmit1.symbols b/tests/baselines/reference/tsxEmit1.symbols index aaca98ae9dbf3..9d373bc62bec2 100644 --- a/tests/baselines/reference/tsxEmit1.symbols +++ b/tests/baselines/reference/tsxEmit1.symbols @@ -1,163 +1,163 @@ -=== tests/cases/conformance/jsx/tsxEmit1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxEmit1.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxEmit1.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxEmit1.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } var p; ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) var selfClosed1 =
; ->selfClosed1 : Symbol(selfClosed1, Decl(tsxEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed1 : Symbol(selfClosed1, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var selfClosed2 =
; ->selfClosed2 : Symbol(selfClosed2, Decl(tsxEmit1.tsx, 9, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed2 : Symbol(selfClosed2, Decl(file.tsx, 9, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) var selfClosed3 =
; ->selfClosed3 : Symbol(selfClosed3, Decl(tsxEmit1.tsx, 10, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed3 : Symbol(selfClosed3, Decl(file.tsx, 10, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) var selfClosed4 =
; ->selfClosed4 : Symbol(selfClosed4, Decl(tsxEmit1.tsx, 11, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed4 : Symbol(selfClosed4, Decl(file.tsx, 11, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed5 =
; ->selfClosed5 : Symbol(selfClosed5, Decl(tsxEmit1.tsx, 12, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed5 : Symbol(selfClosed5, Decl(file.tsx, 12, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed6 =
; ->selfClosed6 : Symbol(selfClosed6, Decl(tsxEmit1.tsx, 13, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed6 : Symbol(selfClosed6, Decl(file.tsx, 13, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed7 =
; ->selfClosed7 : Symbol(selfClosed7, Decl(tsxEmit1.tsx, 14, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>selfClosed7 : Symbol(selfClosed7, Decl(file.tsx, 14, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) >y : Symbol(unknown) var openClosed1 =
; ->openClosed1 : Symbol(openClosed1, Decl(tsxEmit1.tsx, 16, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>openClosed1 : Symbol(openClosed1, Decl(file.tsx, 16, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed2 =
foo
; ->openClosed2 : Symbol(openClosed2, Decl(tsxEmit1.tsx, 17, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>openClosed2 : Symbol(openClosed2, Decl(file.tsx, 17, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed3 =
{p}
; ->openClosed3 : Symbol(openClosed3, Decl(tsxEmit1.tsx, 18, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>openClosed3 : Symbol(openClosed3, Decl(file.tsx, 18, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed4 =
{p < p}
; ->openClosed4 : Symbol(openClosed4, Decl(tsxEmit1.tsx, 19, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>openClosed4 : Symbol(openClosed4, Decl(file.tsx, 19, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed5 =
{p > p}
; ->openClosed5 : Symbol(openClosed5, Decl(tsxEmit1.tsx, 20, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>openClosed5 : Symbol(openClosed5, Decl(file.tsx, 20, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) class SomeClass { ->SomeClass : Symbol(SomeClass, Decl(tsxEmit1.tsx, 20, 43)) +>SomeClass : Symbol(SomeClass, Decl(file.tsx, 20, 43)) f() { ->f : Symbol(f, Decl(tsxEmit1.tsx, 22, 17)) +>f : Symbol(f, Decl(file.tsx, 22, 17)) var rewrites1 =
{() => this}
; ->rewrites1 : Symbol(rewrites1, Decl(tsxEmit1.tsx, 24, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->this : Symbol(SomeClass, Decl(tsxEmit1.tsx, 20, 43)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites1 : Symbol(rewrites1, Decl(file.tsx, 24, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>this : Symbol(SomeClass, Decl(file.tsx, 20, 43)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites2 =
{[p, ...p, p]}
; ->rewrites2 : Symbol(rewrites2, Decl(tsxEmit1.tsx, 25, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites2 : Symbol(rewrites2, Decl(file.tsx, 25, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites3 =
{{p}}
; ->rewrites3 : Symbol(rewrites3, Decl(tsxEmit1.tsx, 26, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 26, 25)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites3 : Symbol(rewrites3, Decl(file.tsx, 26, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 26, 25)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites4 =
this}>
; ->rewrites4 : Symbol(rewrites4, Decl(tsxEmit1.tsx, 28, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites4 : Symbol(rewrites4, Decl(file.tsx, 28, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->this : Symbol(SomeClass, Decl(tsxEmit1.tsx, 20, 43)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>this : Symbol(SomeClass, Decl(file.tsx, 20, 43)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites5 =
; ->rewrites5 : Symbol(rewrites5, Decl(tsxEmit1.tsx, 29, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites5 : Symbol(rewrites5, Decl(file.tsx, 29, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites6 =
; ->rewrites6 : Symbol(rewrites6, Decl(tsxEmit1.tsx, 30, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>rewrites6 : Symbol(rewrites6, Decl(file.tsx, 30, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->p : Symbol(p, Decl(tsxEmit1.tsx, 30, 27)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 30, 27)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) } } var whitespace1 =
; ->whitespace1 : Symbol(whitespace1, Decl(tsxEmit1.tsx, 34, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>whitespace1 : Symbol(whitespace1, Decl(file.tsx, 34, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var whitespace2 =
{p}
; ->whitespace2 : Symbol(whitespace2, Decl(tsxEmit1.tsx, 35, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>whitespace2 : Symbol(whitespace2, Decl(file.tsx, 35, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 7, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var whitespace3 =
->whitespace3 : Symbol(whitespace3, Decl(tsxEmit1.tsx, 36, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>whitespace3 : Symbol(whitespace3, Decl(file.tsx, 36, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) {p} ->p : Symbol(p, Decl(tsxEmit1.tsx, 7, 3)) +>p : Symbol(p, Decl(file.tsx, 7, 3))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit1.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types index a427270354ea8..64ad0420baffb 100644 --- a/tests/baselines/reference/tsxEmit1.types +++ b/tests/baselines/reference/tsxEmit1.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxEmit1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxEmit2.js b/tests/baselines/reference/tsxEmit2.js index 1101df49a1c43..66b1494e8256b 100644 --- a/tests/baselines/reference/tsxEmit2.js +++ b/tests/baselines/reference/tsxEmit2.js @@ -1,4 +1,4 @@ -//// [tsxEmit2.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -14,7 +14,7 @@ var spreads4 =
{p2}
; var spreads5 =
{p2}
; -//// [tsxEmit2.jsx] +//// [file.jsx] var p1, p2, p3; var spreads1 =
{p2}
; var spreads2 =
{p2}
; diff --git a/tests/baselines/reference/tsxEmit2.symbols b/tests/baselines/reference/tsxEmit2.symbols index 5eefc31710d88..5e070bc83a969 100644 --- a/tests/baselines/reference/tsxEmit2.symbols +++ b/tests/baselines/reference/tsxEmit2.symbols @@ -1,58 +1,58 @@ -=== tests/cases/conformance/jsx/tsxEmit2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxEmit2.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxEmit2.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxEmit2.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } var p1, p2, p3; ->p1 : Symbol(p1, Decl(tsxEmit2.tsx, 7, 3)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->p3 : Symbol(p3, Decl(tsxEmit2.tsx, 7, 11)) +>p1 : Symbol(p1, Decl(file.tsx, 7, 3)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>p3 : Symbol(p3, Decl(file.tsx, 7, 11)) var spreads1 =
{p2}
; ->spreads1 : Symbol(spreads1, Decl(tsxEmit2.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>spreads1 : Symbol(spreads1, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads2 =
{p2}
; ->spreads2 : Symbol(spreads2, Decl(tsxEmit2.tsx, 9, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>spreads2 : Symbol(spreads2, Decl(file.tsx, 9, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads3 =
{p2}
; ->spreads3 : Symbol(spreads3, Decl(tsxEmit2.tsx, 10, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>spreads3 : Symbol(spreads3, Decl(file.tsx, 10, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxEmit2.tsx, 7, 11)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 7, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads4 =
{p2}
; ->spreads4 : Symbol(spreads4, Decl(tsxEmit2.tsx, 11, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>spreads4 : Symbol(spreads4, Decl(file.tsx, 11, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxEmit2.tsx, 7, 11)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 7, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads5 =
{p2}
; ->spreads5 : Symbol(spreads5, Decl(tsxEmit2.tsx, 12, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>spreads5 : Symbol(spreads5, Decl(file.tsx, 12, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) >y : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxEmit2.tsx, 7, 11)) ->p2 : Symbol(p2, Decl(tsxEmit2.tsx, 7, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 7, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 7, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxEmit2.types b/tests/baselines/reference/tsxEmit2.types index f5633b739e3b1..5b267d8b80262 100644 --- a/tests/baselines/reference/tsxEmit2.types +++ b/tests/baselines/reference/tsxEmit2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxEmit2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxEmit3.js b/tests/baselines/reference/tsxEmit3.js index aa958a0c79b8d..ccb9041e9314a 100644 --- a/tests/baselines/reference/tsxEmit3.js +++ b/tests/baselines/reference/tsxEmit3.js @@ -1,4 +1,4 @@ -//// [tsxEmit3.tsx] +//// [file.tsx] declare module JSX { interface Element { } @@ -41,7 +41,7 @@ module M { } -//// [tsxEmit3.jsx] +//// [file.jsx] var M; (function (M) { var Foo = (function () { @@ -83,4 +83,4 @@ var M; // Emit M_1.Foo M_1.Foo, ; })(M || (M = {})); -//# sourceMappingURL=tsxEmit3.jsx.map \ No newline at end of file +//# sourceMappingURL=file.jsx.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.js.map b/tests/baselines/reference/tsxEmit3.js.map index 1f1ba0926a063..b53526b5d11fd 100644 --- a/tests/baselines/reference/tsxEmit3.js.map +++ b/tests/baselines/reference/tsxEmit3.js.map @@ -1,2 +1,2 @@ -//// [tsxEmit3.jsx.map] -{"version":3,"file":"tsxEmit3.jsx","sourceRoot":"","sources":["tsxEmit3.tsx"],"names":["M","M.Foo","M.Foo.constructor","M.S","M.S.Bar","M.S.Bar.constructor"],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACTA;QAAmBC;QAAgBC,CAACA;QAACD,UAACA;IAADA,CAACA,AAAtCD,IAAsCA;IAAzBA,KAAGA,MAAsBA,CAAAA;IACtCA,IAAcA,CAACA,CAKdA;IALDA,WAAcA,CAACA,EAACA,CAACA;QAChBG;YAAAC;YAAmBC,CAACA;YAADD,UAACA;QAADA,CAACA,AAApBD,IAAoBA;QAAPA,KAAGA,MAAIA,CAAAA;IAIrBA,CAACA,EALaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAKdA;AACFA,CAACA,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACTA,aAAaA;IACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IAEbA,IAAcA,CAACA,CAMdA;IANDA,WAAcA,CAACA,EAACA,CAACA;QAChBG,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;QAEbA,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IACdA,CAACA,EANaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAMdA;AAEFA,CAACA,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACTA,eAAeA;IACfA,GAACA,CAACA,GAAGA,EAAEA,CAACA,GAACA,CAACA,GAAGA,GAAGA,CAACA;AAClBA,CAACA,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACTA,IAAIA,CAACA,GAAGA,GAAGA,CAACA;IACZA,eAAeA;IACfA,OAAGA,EAAEA,CAACA,OAAGA,GAAGA,CAACA;AACdA,CAACA,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file +//// [file.jsx.map] +{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":["M","M.Foo","M.Foo.constructor","M.S","M.S.Bar","M.S.Bar.constructor"],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACTA;QAAmBC;QAAgBC,CAACA;QAACD,UAACA;IAADA,CAACA,AAAtCD,IAAsCA;IAAzBA,KAAGA,MAAsBA,CAAAA;IACtCA,IAAcA,CAACA,CAKdA;IALDA,WAAcA,CAACA,EAACA,CAACA;QAChBG;YAAAC;YAAmBC,CAACA;YAADD,UAACA;QAADA,CAACA,AAApBD,IAAoBA;QAAPA,KAAGA,MAAIA,CAAAA;IAIrBA,CAACA,EALaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAKdA;AACFA,CAACA,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACTA,aAAaA;IACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IAEbA,IAAcA,CAACA,CAMdA;IANDA,WAAcA,CAACA,EAACA,CAACA;QAChBG,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;QAEbA,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IACdA,CAACA,EANaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAMdA;AAEFA,CAACA,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACTA,eAAeA;IACfA,GAACA,CAACA,GAAGA,EAAEA,CAACA,GAACA,CAACA,GAAGA,GAAGA,CAACA;AAClBA,CAACA,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACTA,IAAIA,CAACA,GAAGA,GAAGA,CAACA;IACZA,eAAeA;IACfA,OAAGA,EAAEA,CAACA,OAAGA,GAAGA,CAACA;AACdA,CAACA,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt index 514be1e532d18..770221ebcb50e 100644 --- a/tests/baselines/reference/tsxEmit3.sourcemap.txt +++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt @@ -1,12 +1,12 @@ =================================================================== -JsFile: tsxEmit3.jsx -mapUrl: tsxEmit3.jsx.map +JsFile: file.jsx +mapUrl: file.jsx.map sourceRoot: -sources: tsxEmit3.tsx +sources: file.tsx =================================================================== ------------------------------------------------------------------- -emittedFile:tests/cases/conformance/jsx/tsxEmit3.jsx -sourceFile:tsxEmit3.tsx +emittedFile:tests/cases/conformance/jsx/file.jsx +sourceFile:file.tsx ------------------------------------------------------------------- >>>var M; 1 > @@ -761,7 +761,7 @@ sourceFile:tsxEmit3.tsx 5 > ^^^^^ 6 > ^ 7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^-> +8 > ^^^^^^^^^^^^^^-> 1 > > 2 >} @@ -782,4 +782,4 @@ sourceFile:tsxEmit3.tsx 6 >Emitted(41, 11) Source(36, 9) + SourceIndex(0) 7 >Emitted(41, 19) Source(40, 2) + SourceIndex(0) --- ->>>//# sourceMappingURL=tsxEmit3.jsx.map \ No newline at end of file +>>>//# sourceMappingURL=file.jsx.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.symbols b/tests/baselines/reference/tsxEmit3.symbols index 64542d125b924..3b88d4e03719f 100644 --- a/tests/baselines/reference/tsxEmit3.symbols +++ b/tests/baselines/reference/tsxEmit3.symbols @@ -1,26 +1,26 @@ -=== tests/cases/conformance/jsx/tsxEmit3.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxEmit3.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxEmit3.tsx, 1, 20)) +>Element : Symbol(Element, Decl(file.tsx, 1, 20)) interface IntrinsicElements { } ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxEmit3.tsx, 2, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 2, 22)) } module M { ->M : Symbol(M, Decl(tsxEmit3.tsx, 4, 1), Decl(tsxEmit3.tsx, 14, 1), Decl(tsxEmit3.tsx, 28, 1), Decl(tsxEmit3.tsx, 33, 1)) +>M : Symbol(M, Decl(file.tsx, 4, 1), Decl(file.tsx, 14, 1), Decl(file.tsx, 28, 1), Decl(file.tsx, 33, 1)) export class Foo { constructor() { } } ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) export module S { ->S : Symbol(S, Decl(tsxEmit3.tsx, 7, 39), Decl(tsxEmit3.tsx, 18, 14)) +>S : Symbol(S, Decl(file.tsx, 7, 39), Decl(file.tsx, 18, 14)) export class Bar { } ->Bar : Symbol(Bar, Decl(tsxEmit3.tsx, 8, 18)) +>Bar : Symbol(Bar, Decl(file.tsx, 8, 18)) // Emit Foo // Foo, ; @@ -28,49 +28,49 @@ module M { } module M { ->M : Symbol(M, Decl(tsxEmit3.tsx, 4, 1), Decl(tsxEmit3.tsx, 14, 1), Decl(tsxEmit3.tsx, 28, 1), Decl(tsxEmit3.tsx, 33, 1)) +>M : Symbol(M, Decl(file.tsx, 4, 1), Decl(file.tsx, 14, 1), Decl(file.tsx, 28, 1), Decl(file.tsx, 33, 1)) // Emit M.Foo Foo, ; ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) export module S { ->S : Symbol(S, Decl(tsxEmit3.tsx, 7, 39), Decl(tsxEmit3.tsx, 18, 14)) +>S : Symbol(S, Decl(file.tsx, 7, 39), Decl(file.tsx, 18, 14)) // Emit M.Foo Foo, ; ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) // Emit S.Bar Bar, ; ->Bar : Symbol(Bar, Decl(tsxEmit3.tsx, 8, 18)) ->Bar : Symbol(Bar, Decl(tsxEmit3.tsx, 8, 18)) +>Bar : Symbol(Bar, Decl(file.tsx, 8, 18)) +>Bar : Symbol(Bar, Decl(file.tsx, 8, 18)) } } module M { ->M : Symbol(M, Decl(tsxEmit3.tsx, 4, 1), Decl(tsxEmit3.tsx, 14, 1), Decl(tsxEmit3.tsx, 28, 1), Decl(tsxEmit3.tsx, 33, 1)) +>M : Symbol(M, Decl(file.tsx, 4, 1), Decl(file.tsx, 14, 1), Decl(file.tsx, 28, 1), Decl(file.tsx, 33, 1)) // Emit M.S.Bar S.Bar, ; ->S.Bar : Symbol(S.Bar, Decl(tsxEmit3.tsx, 8, 18)) ->S : Symbol(S, Decl(tsxEmit3.tsx, 7, 39), Decl(tsxEmit3.tsx, 18, 14)) ->Bar : Symbol(S.Bar, Decl(tsxEmit3.tsx, 8, 18)) ->Bar : Symbol(S.Bar, Decl(tsxEmit3.tsx, 8, 18)) +>S.Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18)) +>S : Symbol(S, Decl(file.tsx, 7, 39), Decl(file.tsx, 18, 14)) +>Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18)) +>Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18)) } module M { ->M : Symbol(M, Decl(tsxEmit3.tsx, 4, 1), Decl(tsxEmit3.tsx, 14, 1), Decl(tsxEmit3.tsx, 28, 1), Decl(tsxEmit3.tsx, 33, 1)) +>M : Symbol(M, Decl(file.tsx, 4, 1), Decl(file.tsx, 14, 1), Decl(file.tsx, 28, 1), Decl(file.tsx, 33, 1)) var M = 100; ->M : Symbol(M, Decl(tsxEmit3.tsx, 36, 4)) +>M : Symbol(M, Decl(file.tsx, 36, 4)) // Emit M_1.Foo Foo, ; ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) ->Foo : Symbol(Foo, Decl(tsxEmit3.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) +>Foo : Symbol(Foo, Decl(file.tsx, 6, 10)) } diff --git a/tests/baselines/reference/tsxEmit3.types b/tests/baselines/reference/tsxEmit3.types index f4db9a3f36fd6..49a5cf8a51b3f 100644 --- a/tests/baselines/reference/tsxEmit3.types +++ b/tests/baselines/reference/tsxEmit3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxEmit3.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxErrorRecovery1.errors.txt b/tests/baselines/reference/tsxErrorRecovery1.errors.txt index 7aea986526b99..0937b0d37ac78 100644 --- a/tests/baselines/reference/tsxErrorRecovery1.errors.txt +++ b/tests/baselines/reference/tsxErrorRecovery1.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/jsx/tsxErrorRecovery1.tsx(5,19): error TS1109: Expression expected. -tests/cases/conformance/jsx/tsxErrorRecovery1.tsx(8,11): error TS2304: Cannot find name 'a'. -tests/cases/conformance/jsx/tsxErrorRecovery1.tsx(8,12): error TS1005: '}' expected. -tests/cases/conformance/jsx/tsxErrorRecovery1.tsx(9,1): error TS17002: Expected corresponding JSX closing tag for 'div'. +tests/cases/conformance/jsx/file.tsx(5,19): error TS1109: Expression expected. +tests/cases/conformance/jsx/file.tsx(8,11): error TS2304: Cannot find name 'a'. +tests/cases/conformance/jsx/file.tsx(8,12): error TS1005: '}' expected. +tests/cases/conformance/jsx/file.tsx(9,1): error TS17002: Expected corresponding JSX closing tag for 'div'. -==== tests/cases/conformance/jsx/tsxErrorRecovery1.tsx (4 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (4 errors) ==== declare namespace JSX { interface Element { } } diff --git a/tests/baselines/reference/tsxErrorRecovery1.js b/tests/baselines/reference/tsxErrorRecovery1.js index 62db6b0f01242..6b9d2d5de47c0 100644 --- a/tests/baselines/reference/tsxErrorRecovery1.js +++ b/tests/baselines/reference/tsxErrorRecovery1.js @@ -1,4 +1,4 @@ -//// [tsxErrorRecovery1.tsx] +//// [file.tsx] declare namespace JSX { interface Element { } } @@ -9,7 +9,7 @@ function foo() { var y = { a: 1 }; -//// [tsxErrorRecovery1.jsx] +//// [file.jsx] function foo() { var x =
{}div> } diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.js b/tests/baselines/reference/tsxGenericArrowFunctionParsing.js index f493347ca9c4a..3478923f9ee92 100644 --- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.js +++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.js @@ -1,4 +1,4 @@ -//// [tsxGenericArrowFunctionParsing.tsx] +//// [file.tsx] declare module JSX { interface Element { isElement; } } @@ -27,7 +27,7 @@ x5.isElement; -//// [tsxGenericArrowFunctionParsing.jsx] +//// [file.jsx] var T, T1, T2; // This is an element var x1 = () => ; diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols b/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols index 3bfd5505e766c..85dec56b2f832 100644 --- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols +++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols @@ -1,67 +1,67 @@ -=== tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxGenericArrowFunctionParsing.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { isElement; } ->Element : Symbol(Element, Decl(tsxGenericArrowFunctionParsing.tsx, 0, 20)) ->isElement : Symbol(isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) +>isElement : Symbol(isElement, Decl(file.tsx, 1, 20)) } var T, T1, T2; ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) ->T1 : Symbol(T1, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 6)) ->T2 : Symbol(T2, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 10)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) +>T1 : Symbol(T1, Decl(file.tsx, 4, 6)) +>T2 : Symbol(T2, Decl(file.tsx, 4, 10)) // This is an element var x1 = () => {}; ->x1 : Symbol(x1, Decl(tsxGenericArrowFunctionParsing.tsx, 7, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) +>x1 : Symbol(x1, Decl(file.tsx, 7, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) x1.isElement; ->x1.isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) ->x1 : Symbol(x1, Decl(tsxGenericArrowFunctionParsing.tsx, 7, 3)) ->isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) +>x1.isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) +>x1 : Symbol(x1, Decl(file.tsx, 7, 3)) +>isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) // This is a generic function var x2 = () => {}; ->x2 : Symbol(x2, Decl(tsxGenericArrowFunctionParsing.tsx, 11, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 11, 10)) +>x2 : Symbol(x2, Decl(file.tsx, 11, 3)) +>T : Symbol(T, Decl(file.tsx, 11, 10)) x2(); ->x2 : Symbol(x2, Decl(tsxGenericArrowFunctionParsing.tsx, 11, 3)) +>x2 : Symbol(x2, Decl(file.tsx, 11, 3)) // This is a generic function var x3 = () => {}; ->x3 : Symbol(x3, Decl(tsxGenericArrowFunctionParsing.tsx, 15, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 15, 10)) ->T1 : Symbol(T1, Decl(tsxGenericArrowFunctionParsing.tsx, 15, 12)) +>x3 : Symbol(x3, Decl(file.tsx, 15, 3)) +>T : Symbol(T, Decl(file.tsx, 15, 10)) +>T1 : Symbol(T1, Decl(file.tsx, 15, 12)) x3(); ->x3 : Symbol(x3, Decl(tsxGenericArrowFunctionParsing.tsx, 15, 3)) +>x3 : Symbol(x3, Decl(file.tsx, 15, 3)) // This is an element var x4 = () => {}; ->x4 : Symbol(x4, Decl(tsxGenericArrowFunctionParsing.tsx, 19, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) +>x4 : Symbol(x4, Decl(file.tsx, 19, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) >extends : Symbol(unknown) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) x4.isElement; ->x4.isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) ->x4 : Symbol(x4, Decl(tsxGenericArrowFunctionParsing.tsx, 19, 3)) ->isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) +>x4.isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) +>x4 : Symbol(x4, Decl(file.tsx, 19, 3)) +>isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) // This is an element var x5 = () => {}; ->x5 : Symbol(x5, Decl(tsxGenericArrowFunctionParsing.tsx, 23, 3)) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) +>x5 : Symbol(x5, Decl(file.tsx, 23, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) >extends : Symbol(unknown) ->T : Symbol(T, Decl(tsxGenericArrowFunctionParsing.tsx, 4, 3)) +>T : Symbol(T, Decl(file.tsx, 4, 3)) x5.isElement; ->x5.isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) ->x5 : Symbol(x5, Decl(tsxGenericArrowFunctionParsing.tsx, 23, 3)) ->isElement : Symbol(JSX.Element.isElement, Decl(tsxGenericArrowFunctionParsing.tsx, 1, 20)) +>x5.isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) +>x5 : Symbol(x5, Decl(file.tsx, 23, 3)) +>isElement : Symbol(JSX.Element.isElement, Decl(file.tsx, 1, 20)) diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types index a7d98d35b640a..d5a9436872a83 100644 --- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types +++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxOpeningClosingNames.js b/tests/baselines/reference/tsxOpeningClosingNames.js index 80adad0f406dc..d704d43b5bab0 100644 --- a/tests/baselines/reference/tsxOpeningClosingNames.js +++ b/tests/baselines/reference/tsxOpeningClosingNames.js @@ -1,4 +1,4 @@ -//// [tsxOpeningClosingNames.tsx] +//// [file.tsx] declare module JSX { interface Element { } } @@ -10,5 +10,5 @@ declare module A.B.C { foo -//// [tsxOpeningClosingNames.jsx] +//// [file.jsx] foo; diff --git a/tests/baselines/reference/tsxOpeningClosingNames.symbols b/tests/baselines/reference/tsxOpeningClosingNames.symbols index e9734fb5ee1d9..08da0bf05fbd7 100644 --- a/tests/baselines/reference/tsxOpeningClosingNames.symbols +++ b/tests/baselines/reference/tsxOpeningClosingNames.symbols @@ -1,18 +1,18 @@ -=== tests/cases/conformance/jsx/tsxOpeningClosingNames.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxOpeningClosingNames.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxOpeningClosingNames.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) } declare module A.B.C { ->A : Symbol(A, Decl(tsxOpeningClosingNames.tsx, 2, 1)) ->B : Symbol(B, Decl(tsxOpeningClosingNames.tsx, 4, 17)) ->C : Symbol(C, Decl(tsxOpeningClosingNames.tsx, 4, 19)) +>A : Symbol(A, Decl(file.tsx, 2, 1)) +>B : Symbol(B, Decl(file.tsx, 4, 17)) +>C : Symbol(C, Decl(file.tsx, 4, 19)) var D: any; ->D : Symbol(D, Decl(tsxOpeningClosingNames.tsx, 5, 5)) +>D : Symbol(D, Decl(file.tsx, 5, 5)) } foo diff --git a/tests/baselines/reference/tsxOpeningClosingNames.types b/tests/baselines/reference/tsxOpeningClosingNames.types index b02564ae104a7..ac36205029e46 100644 --- a/tests/baselines/reference/tsxOpeningClosingNames.types +++ b/tests/baselines/reference/tsxOpeningClosingNames.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxOpeningClosingNames.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxParseTests1.js b/tests/baselines/reference/tsxParseTests1.js index 7ab98cab31441..c427a49cb0c31 100644 --- a/tests/baselines/reference/tsxParseTests1.js +++ b/tests/baselines/reference/tsxParseTests1.js @@ -1,4 +1,4 @@ -//// [tsxParseTests1.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { div; span; } @@ -7,5 +7,5 @@ declare module JSX { var x =
; -//// [tsxParseTests1.jsx] +//// [file.jsx] var x =
; diff --git a/tests/baselines/reference/tsxParseTests1.symbols b/tests/baselines/reference/tsxParseTests1.symbols index f7b179f254ffe..0ee595a9a3ddc 100644 --- a/tests/baselines/reference/tsxParseTests1.symbols +++ b/tests/baselines/reference/tsxParseTests1.symbols @@ -1,24 +1,24 @@ -=== tests/cases/conformance/jsx/tsxParseTests1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxParseTests1.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxParseTests1.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { div; span; } ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxParseTests1.tsx, 1, 22)) ->div : Symbol(div, Decl(tsxParseTests1.tsx, 2, 30)) ->span : Symbol(span, Decl(tsxParseTests1.tsx, 2, 35)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(div, Decl(file.tsx, 2, 30)) +>span : Symbol(span, Decl(file.tsx, 2, 35)) } var x =
; ->x : Symbol(x, Decl(tsxParseTests1.tsx, 5, 3)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) ->span : Symbol(JSX.IntrinsicElements.span, Decl(tsxParseTests1.tsx, 2, 35)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) ->span : Symbol(JSX.IntrinsicElements.span, Decl(tsxParseTests1.tsx, 2, 35)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) ->div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests1.tsx, 2, 30)) +>x : Symbol(x, Decl(file.tsx, 5, 3)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) +>span : Symbol(JSX.IntrinsicElements.span, Decl(file.tsx, 2, 35)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) +>span : Symbol(JSX.IntrinsicElements.span, Decl(file.tsx, 2, 35)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(file.tsx, 2, 30)) diff --git a/tests/baselines/reference/tsxParseTests1.types b/tests/baselines/reference/tsxParseTests1.types index 78e49a227e224..375791fe4bbdb 100644 --- a/tests/baselines/reference/tsxParseTests1.types +++ b/tests/baselines/reference/tsxParseTests1.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxParseTests1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js index 260bd9cd22804..5b13c463bd6e2 100644 --- a/tests/baselines/reference/tsxReactEmit1.js +++ b/tests/baselines/reference/tsxReactEmit1.js @@ -1,4 +1,4 @@ -//// [tsxReactEmit1.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -41,7 +41,7 @@ var whitespace3 =
; -//// [tsxReactEmit1.js] +//// [file.js] var p; var selfClosed1 = React.createElement("div", null); var selfClosed2 = React.createElement("div", {x: "1"}); diff --git a/tests/baselines/reference/tsxReactEmit1.symbols b/tests/baselines/reference/tsxReactEmit1.symbols index 4149142dd8205..640f666c0d880 100644 --- a/tests/baselines/reference/tsxReactEmit1.symbols +++ b/tests/baselines/reference/tsxReactEmit1.symbols @@ -1,167 +1,167 @@ -=== tests/cases/conformance/jsx/tsxReactEmit1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxReactEmit1.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxReactEmit1.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxReactEmit1.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } declare var React: any; ->React : Symbol(React, Decl(tsxReactEmit1.tsx, 6, 11)) +>React : Symbol(React, Decl(file.tsx, 6, 11)) var p; ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) var selfClosed1 =
; ->selfClosed1 : Symbol(selfClosed1, Decl(tsxReactEmit1.tsx, 9, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed1 : Symbol(selfClosed1, Decl(file.tsx, 9, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var selfClosed2 =
; ->selfClosed2 : Symbol(selfClosed2, Decl(tsxReactEmit1.tsx, 10, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed2 : Symbol(selfClosed2, Decl(file.tsx, 10, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) var selfClosed3 =
; ->selfClosed3 : Symbol(selfClosed3, Decl(tsxReactEmit1.tsx, 11, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed3 : Symbol(selfClosed3, Decl(file.tsx, 11, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) var selfClosed4 =
; ->selfClosed4 : Symbol(selfClosed4, Decl(tsxReactEmit1.tsx, 12, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed4 : Symbol(selfClosed4, Decl(file.tsx, 12, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed5 =
; ->selfClosed5 : Symbol(selfClosed5, Decl(tsxReactEmit1.tsx, 13, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed5 : Symbol(selfClosed5, Decl(file.tsx, 13, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed6 =
; ->selfClosed6 : Symbol(selfClosed6, Decl(tsxReactEmit1.tsx, 14, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed6 : Symbol(selfClosed6, Decl(file.tsx, 14, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) >y : Symbol(unknown) var selfClosed7 =
; ->selfClosed7 : Symbol(selfClosed7, Decl(tsxReactEmit1.tsx, 15, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>selfClosed7 : Symbol(selfClosed7, Decl(file.tsx, 15, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) >y : Symbol(unknown) >b : Symbol(unknown) var openClosed1 =
; ->openClosed1 : Symbol(openClosed1, Decl(tsxReactEmit1.tsx, 17, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>openClosed1 : Symbol(openClosed1, Decl(file.tsx, 17, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed2 =
foo
; ->openClosed2 : Symbol(openClosed2, Decl(tsxReactEmit1.tsx, 18, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>openClosed2 : Symbol(openClosed2, Decl(file.tsx, 18, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed3 =
{p}
; ->openClosed3 : Symbol(openClosed3, Decl(tsxReactEmit1.tsx, 19, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>openClosed3 : Symbol(openClosed3, Decl(file.tsx, 19, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed4 =
{p < p}
; ->openClosed4 : Symbol(openClosed4, Decl(tsxReactEmit1.tsx, 20, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>openClosed4 : Symbol(openClosed4, Decl(file.tsx, 20, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var openClosed5 =
{p > p}
; ->openClosed5 : Symbol(openClosed5, Decl(tsxReactEmit1.tsx, 21, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>openClosed5 : Symbol(openClosed5, Decl(file.tsx, 21, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >n : Symbol(unknown) >b : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) class SomeClass { ->SomeClass : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45)) +>SomeClass : Symbol(SomeClass, Decl(file.tsx, 21, 45)) f() { ->f : Symbol(f, Decl(tsxReactEmit1.tsx, 23, 17)) +>f : Symbol(f, Decl(file.tsx, 23, 17)) var rewrites1 =
{() => this}
; ->rewrites1 : Symbol(rewrites1, Decl(tsxReactEmit1.tsx, 25, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites1 : Symbol(rewrites1, Decl(file.tsx, 25, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>this : Symbol(SomeClass, Decl(file.tsx, 21, 45)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites2 =
{[p, ...p, p]}
; ->rewrites2 : Symbol(rewrites2, Decl(tsxReactEmit1.tsx, 26, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites2 : Symbol(rewrites2, Decl(file.tsx, 26, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites3 =
{{p}}
; ->rewrites3 : Symbol(rewrites3, Decl(tsxReactEmit1.tsx, 27, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 27, 25)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites3 : Symbol(rewrites3, Decl(file.tsx, 27, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 27, 25)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites4 =
this}>
; ->rewrites4 : Symbol(rewrites4, Decl(tsxReactEmit1.tsx, 29, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites4 : Symbol(rewrites4, Decl(file.tsx, 29, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>this : Symbol(SomeClass, Decl(file.tsx, 21, 45)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites5 =
; ->rewrites5 : Symbol(rewrites5, Decl(tsxReactEmit1.tsx, 30, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites5 : Symbol(rewrites5, Decl(file.tsx, 30, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var rewrites6 =
; ->rewrites6 : Symbol(rewrites6, Decl(tsxReactEmit1.tsx, 31, 5)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>rewrites6 : Symbol(rewrites6, Decl(file.tsx, 31, 5)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >a : Symbol(unknown) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 31, 27)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 31, 27)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) } } var whitespace1 =
; ->whitespace1 : Symbol(whitespace1, Decl(tsxReactEmit1.tsx, 35, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>whitespace1 : Symbol(whitespace1, Decl(file.tsx, 35, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var whitespace2 =
{p}
; ->whitespace2 : Symbol(whitespace2, Decl(tsxReactEmit1.tsx, 36, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>whitespace2 : Symbol(whitespace2, Decl(file.tsx, 36, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 8, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var whitespace3 =
->whitespace3 : Symbol(whitespace3, Decl(tsxReactEmit1.tsx, 37, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>whitespace3 : Symbol(whitespace3, Decl(file.tsx, 37, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) {p} ->p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3)) +>p : Symbol(p, Decl(file.tsx, 8, 3))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types index e180d2b6b7065..9173fde2ccc60 100644 --- a/tests/baselines/reference/tsxReactEmit1.types +++ b/tests/baselines/reference/tsxReactEmit1.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmit1.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js index 4b2b46955617d..fd7fff1697628 100644 --- a/tests/baselines/reference/tsxReactEmit2.js +++ b/tests/baselines/reference/tsxReactEmit2.js @@ -1,4 +1,4 @@ -//// [tsxReactEmit2.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -15,7 +15,7 @@ var spreads4 =
{p2}
; var spreads5 =
{p2}
; -//// [tsxReactEmit2.js] +//// [file.js] var p1, p2, p3; var spreads1 = React.createElement("div", React.__spread({}, p1), p2); var spreads2 = React.createElement("div", React.__spread({}, p1), p2); diff --git a/tests/baselines/reference/tsxReactEmit2.symbols b/tests/baselines/reference/tsxReactEmit2.symbols index 049fdb1819b6f..6262b94aa41e3 100644 --- a/tests/baselines/reference/tsxReactEmit2.symbols +++ b/tests/baselines/reference/tsxReactEmit2.symbols @@ -1,60 +1,60 @@ -=== tests/cases/conformance/jsx/tsxReactEmit2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxReactEmit2.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxReactEmit2.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxReactEmit2.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } declare var React: any; ->React : Symbol(React, Decl(tsxReactEmit2.tsx, 6, 11)) +>React : Symbol(React, Decl(file.tsx, 6, 11)) var p1, p2, p3; ->p1 : Symbol(p1, Decl(tsxReactEmit2.tsx, 8, 3)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 8, 11)) +>p1 : Symbol(p1, Decl(file.tsx, 8, 3)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>p3 : Symbol(p3, Decl(file.tsx, 8, 11)) var spreads1 =
{p2}
; ->spreads1 : Symbol(spreads1, Decl(tsxReactEmit2.tsx, 9, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>spreads1 : Symbol(spreads1, Decl(file.tsx, 9, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads2 =
{p2}
; ->spreads2 : Symbol(spreads2, Decl(tsxReactEmit2.tsx, 10, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>spreads2 : Symbol(spreads2, Decl(file.tsx, 10, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads3 =
{p2}
; ->spreads3 : Symbol(spreads3, Decl(tsxReactEmit2.tsx, 11, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>spreads3 : Symbol(spreads3, Decl(file.tsx, 11, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 8, 11)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 8, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads4 =
{p2}
; ->spreads4 : Symbol(spreads4, Decl(tsxReactEmit2.tsx, 12, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>spreads4 : Symbol(spreads4, Decl(file.tsx, 12, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 8, 11)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 8, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) var spreads5 =
{p2}
; ->spreads5 : Symbol(spreads5, Decl(tsxReactEmit2.tsx, 13, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>spreads5 : Symbol(spreads5, Decl(file.tsx, 13, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >x : Symbol(unknown) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) >y : Symbol(unknown) ->p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 8, 11)) ->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22)) +>p3 : Symbol(p3, Decl(file.tsx, 8, 11)) +>p2 : Symbol(p2, Decl(file.tsx, 8, 7)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxReactEmit2.types b/tests/baselines/reference/tsxReactEmit2.types index e28910b62c7b1..928eeecadfac9 100644 --- a/tests/baselines/reference/tsxReactEmit2.types +++ b/tests/baselines/reference/tsxReactEmit2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmit2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxReactEmit3.js b/tests/baselines/reference/tsxReactEmit3.js index 239105485342e..bd42177e18728 100644 --- a/tests/baselines/reference/tsxReactEmit3.js +++ b/tests/baselines/reference/tsxReactEmit3.js @@ -1,4 +1,4 @@ -//// [tsxReactEmit3.tsx] +//// [test.tsx] declare module JSX { interface Element { } } declare var React: any; @@ -7,5 +7,5 @@ declare var Foo, Bar, baz; q s ; -//// [tsxReactEmit3.js] +//// [test.js] React.createElement(Foo, null, " ", React.createElement(Bar, null, " q "), " ", React.createElement(Bar, null), " s ", React.createElement(Bar, null), React.createElement(Bar, null)); diff --git a/tests/baselines/reference/tsxReactEmit3.symbols b/tests/baselines/reference/tsxReactEmit3.symbols index 042488cf04cf2..cec45805c1e70 100644 --- a/tests/baselines/reference/tsxReactEmit3.symbols +++ b/tests/baselines/reference/tsxReactEmit3.symbols @@ -1,23 +1,23 @@ -=== tests/cases/conformance/jsx/tsxReactEmit3.tsx === +=== tests/cases/conformance/jsx/test.tsx === declare module JSX { interface Element { } } ->JSX : Symbol(JSX, Decl(tsxReactEmit3.tsx, 0, 0)) ->Element : Symbol(Element, Decl(tsxReactEmit3.tsx, 1, 20)) +>JSX : Symbol(JSX, Decl(test.tsx, 0, 0)) +>Element : Symbol(Element, Decl(test.tsx, 1, 20)) declare var React: any; ->React : Symbol(React, Decl(tsxReactEmit3.tsx, 2, 11)) +>React : Symbol(React, Decl(test.tsx, 2, 11)) declare var Foo, Bar, baz; ->Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 4, 11)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->baz : Symbol(baz, Decl(tsxReactEmit3.tsx, 4, 21)) +>Foo : Symbol(Foo, Decl(test.tsx, 4, 11)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>baz : Symbol(baz, Decl(test.tsx, 4, 21)) q s ; ->Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 4, 11)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16)) ->Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 4, 11)) +>Foo : Symbol(Foo, Decl(test.tsx, 4, 11)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>Bar : Symbol(Bar, Decl(test.tsx, 4, 16)) +>Foo : Symbol(Foo, Decl(test.tsx, 4, 11)) diff --git a/tests/baselines/reference/tsxReactEmit3.types b/tests/baselines/reference/tsxReactEmit3.types index 8babe724fa17a..8416ec015b273 100644 --- a/tests/baselines/reference/tsxReactEmit3.types +++ b/tests/baselines/reference/tsxReactEmit3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmit3.tsx === +=== tests/cases/conformance/jsx/test.tsx === declare module JSX { interface Element { } } >JSX : any diff --git a/tests/baselines/reference/tsxReactEmit4.errors.txt b/tests/baselines/reference/tsxReactEmit4.errors.txt index fca2b02823746..23578d4ed91a4 100644 --- a/tests/baselines/reference/tsxReactEmit4.errors.txt +++ b/tests/baselines/reference/tsxReactEmit4.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/jsx/tsxReactEmit4.tsx(12,5): error TS2304: Cannot find name 'blah'. +tests/cases/conformance/jsx/file.tsx(12,5): error TS2304: Cannot find name 'blah'. -==== tests/cases/conformance/jsx/tsxReactEmit4.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js index dcbfafcef2f2b..d61cea24d2cf0 100644 --- a/tests/baselines/reference/tsxReactEmit4.js +++ b/tests/baselines/reference/tsxReactEmit4.js @@ -1,4 +1,4 @@ -//// [tsxReactEmit4.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -17,7 +17,7 @@ var openClosed1 =
// Should emit React.__spread({}, p, {x: 0}) var spread1 =
; -//// [tsxReactEmit4.js] +//// [file.js] var p; var openClosed1 = React.createElement("div", null, blah); // Should emit React.__spread({}, p, {x: 0}) diff --git a/tests/baselines/reference/tsxReactEmitEntities.js b/tests/baselines/reference/tsxReactEmitEntities.js index 7517c85fc7370..c1fba50fd8fee 100644 --- a/tests/baselines/reference/tsxReactEmitEntities.js +++ b/tests/baselines/reference/tsxReactEmitEntities.js @@ -1,4 +1,4 @@ -//// [tsxReactEmitEntities.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -10,5 +10,5 @@ declare var React: any;
Dot goes here: · ¬AnEntity;
; -//// [tsxReactEmitEntities.js] +//// [file.js] React.createElement("div", null, "Dot goes here: · ¬AnEntity; "); diff --git a/tests/baselines/reference/tsxReactEmitEntities.symbols b/tests/baselines/reference/tsxReactEmitEntities.symbols index 7de35241a3a13..b633f57ec1333 100644 --- a/tests/baselines/reference/tsxReactEmitEntities.symbols +++ b/tests/baselines/reference/tsxReactEmitEntities.symbols @@ -1,21 +1,21 @@ -=== tests/cases/conformance/jsx/tsxReactEmitEntities.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxReactEmitEntities.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxReactEmitEntities.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxReactEmitEntities.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxReactEmitEntities.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } declare var React: any; ->React : Symbol(React, Decl(tsxReactEmitEntities.tsx, 6, 11)) +>React : Symbol(React, Decl(file.tsx, 6, 11))
Dot goes here: · ¬AnEntity;
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitEntities.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitEntities.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxReactEmitEntities.types b/tests/baselines/reference/tsxReactEmitEntities.types index e1c9cb6e6bfbf..d6d6c285d7954 100644 --- a/tests/baselines/reference/tsxReactEmitEntities.types +++ b/tests/baselines/reference/tsxReactEmitEntities.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmitEntities.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.js b/tests/baselines/reference/tsxReactEmitWhitespace.js index a1b5894106fc9..9614cbf2f2cf4 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace.js @@ -1,4 +1,4 @@ -//// [tsxReactEmitWhitespace.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -52,7 +52,7 @@ var p = 0; -//// [tsxReactEmitWhitespace.js] +//// [file.js] // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT var p = 0; diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.symbols b/tests/baselines/reference/tsxReactEmitWhitespace.symbols index 3aa3f0d0f8adb..a0d8266faa0e1 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.symbols +++ b/tests/baselines/reference/tsxReactEmitWhitespace.symbols @@ -1,93 +1,93 @@ -=== tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxReactEmitWhitespace.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxReactEmitWhitespace.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxReactEmitWhitespace.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } declare var React: any; ->React : Symbol(React, Decl(tsxReactEmitWhitespace.tsx, 6, 11)) +>React : Symbol(React, Decl(file.tsx, 6, 11)) // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT var p = 0; ->p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 11, 3)) +>p : Symbol(p, Decl(file.tsx, 11, 3)) // Emit " "
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit " ", p, " "
{p}
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) ->p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 11, 3)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>p : Symbol(p, Decl(file.tsx, 11, 3)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit only p
->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) {p} ->p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 11, 3)) +>p : Symbol(p, Decl(file.tsx, 11, 3))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit only p
->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) {p} ->p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 11, 3)) +>p : Symbol(p, Decl(file.tsx, 11, 3))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit " 3"
3 ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit " 3 "
3
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit "3"
->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) 3
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit no args
->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Emit "foo" + ' ' + "bar"
->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) foo bar
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.types b/tests/baselines/reference/tsxReactEmitWhitespace.types index 4622aef19917e..824aa5cfdae99 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.types +++ b/tests/baselines/reference/tsxReactEmitWhitespace.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.js b/tests/baselines/reference/tsxReactEmitWhitespace2.js index 091a193cdc5c1..f649ca43ebd4b 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.js @@ -1,4 +1,4 @@ -//// [tsxReactEmitWhitespace2.tsx] +//// [file.tsx] declare module JSX { interface Element { } interface IntrinsicElements { @@ -16,7 +16,7 @@ declare var React: any; -//// [tsxReactEmitWhitespace2.js] +//// [file.js] // Emit ' word' in the last string React.createElement("div", null, "word ", React.createElement("code", null, "code"), " word"); // Same here diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.symbols b/tests/baselines/reference/tsxReactEmitWhitespace2.symbols index 44ff4cba292e5..a79445c28afa0 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.symbols +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.symbols @@ -1,38 +1,38 @@ -=== tests/cases/conformance/jsx/tsxReactEmitWhitespace2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { ->JSX : Symbol(JSX, Decl(tsxReactEmitWhitespace2.tsx, 0, 0)) +>JSX : Symbol(JSX, Decl(file.tsx, 0, 0)) interface Element { } ->Element : Symbol(Element, Decl(tsxReactEmitWhitespace2.tsx, 0, 20)) +>Element : Symbol(Element, Decl(file.tsx, 0, 20)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22)) [s: string]: any; ->s : Symbol(s, Decl(tsxReactEmitWhitespace2.tsx, 3, 3)) +>s : Symbol(s, Decl(file.tsx, 3, 3)) } } declare var React: any; ->React : Symbol(React, Decl(tsxReactEmitWhitespace2.tsx, 6, 11)) +>React : Symbol(React, Decl(file.tsx, 6, 11)) // Emit ' word' in the last string
word code word
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->code : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->code : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>code : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>code : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // Same here
code word
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->code : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->code : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>code : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>code : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) // And here
word
; ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->code : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) ->div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmitWhitespace2.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>code : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) +>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.types b/tests/baselines/reference/tsxReactEmitWhitespace2.types index 7287e59b9b15f..73c65f50aca54 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.types +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/jsx/tsxReactEmitWhitespace2.tsx === +=== tests/cases/conformance/jsx/file.tsx === declare module JSX { >JSX : any From 57e17d26639483e756c459e752fc35e8cb2e9723 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 14:06:54 -0700 Subject: [PATCH 009/353] Test cases for different typescript syntax not supported errors during js files compilation --- ...CompilationAmbientVarDeclarationSyntax.errors.txt | 9 +++++++++ .../jsFileCompilationDecoratorSyntax.errors.txt | 9 +++++++++ .../reference/jsFileCompilationEnumSyntax.errors.txt | 9 +++++++++ ...sFileCompilationExportAssignmentSyntax.errors.txt | 9 +++++++++ ...CompilationHeritageClauseSyntaxOfClass.errors.txt | 9 +++++++++ .../jsFileCompilationImportEqualsSyntax.errors.txt | 9 +++++++++ .../jsFileCompilationInterfaceSyntax.errors.txt | 9 +++++++++ .../jsFileCompilationModuleSyntax.errors.txt | 9 +++++++++ .../jsFileCompilationOptionalParameter.errors.txt | 9 +++++++++ ...jsFileCompilationPropertySyntaxOfClass.errors.txt | 9 +++++++++ ...leCompilationPublicMethodSyntaxOfClass.errors.txt | 12 ++++++++++++ ...FileCompilationPublicParameterModifier.errors.txt | 9 +++++++++ ...eCompilationReturnTypeSyntaxOfFunction.errors.txt | 9 +++++++++ .../jsFileCompilationTypeAliasSyntax.errors.txt | 9 +++++++++ ...ileCompilationTypeArgumentSyntaxOfCall.errors.txt | 9 +++++++++ .../jsFileCompilationTypeAssertions.errors.txt | 9 +++++++++ .../jsFileCompilationTypeOfParameter.errors.txt | 9 +++++++++ ...eCompilationTypeParameterSyntaxOfClass.errors.txt | 9 +++++++++ ...mpilationTypeParameterSyntaxOfFunction.errors.txt | 9 +++++++++ .../jsFileCompilationTypeSyntaxOfVar.errors.txt | 9 +++++++++ .../jsFileCompilationAmbientVarDeclarationSyntax.ts | 2 ++ .../compiler/jsFileCompilationDecoratorSyntax.ts | 2 ++ tests/cases/compiler/jsFileCompilationEnumSyntax.ts | 2 ++ .../jsFileCompilationExportAssignmentSyntax.ts | 2 ++ .../jsFileCompilationHeritageClauseSyntaxOfClass.ts | 2 ++ .../compiler/jsFileCompilationImportEqualsSyntax.ts | 2 ++ .../compiler/jsFileCompilationInterfaceSyntax.ts | 2 ++ .../cases/compiler/jsFileCompilationModuleSyntax.ts | 2 ++ .../compiler/jsFileCompilationOptionalParameter.ts | 2 ++ .../jsFileCompilationPropertySyntaxOfClass.ts | 2 ++ .../jsFileCompilationPublicMethodSyntaxOfClass.ts | 5 +++++ .../jsFileCompilationPublicParameterModifier.ts | 2 ++ .../jsFileCompilationReturnTypeSyntaxOfFunction.ts | 2 ++ .../compiler/jsFileCompilationTypeAliasSyntax.ts | 2 ++ .../jsFileCompilationTypeArgumentSyntaxOfCall.ts | 2 ++ .../compiler/jsFileCompilationTypeAssertions.ts | 2 ++ .../compiler/jsFileCompilationTypeOfParameter.ts | 2 ++ .../jsFileCompilationTypeParameterSyntaxOfClass.ts | 2 ++ ...jsFileCompilationTypeParameterSyntaxOfFunction.ts | 2 ++ .../compiler/jsFileCompilationTypeSyntaxOfVar.ts | 2 ++ 40 files changed, 226 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt create mode 100644 tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationEnumSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts create mode 100644 tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationModuleSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationOptionalParameter.ts create mode 100644 tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts create mode 100644 tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts create mode 100644 tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts create mode 100644 tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeAssertions.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeOfParameter.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts create mode 100644 tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts diff --git a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt new file mode 100644 index 0000000000000..d3175d9f116a0 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + declare var v; + ~~~~~~~ +!!! error TS8009: 'declare' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt new file mode 100644 index 0000000000000..80fb4ded96d0e --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + @internal class C { } + ~~~~~~~~~ +!!! error TS8017: 'decorators' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt new file mode 100644 index 0000000000000..bc0bb189c95d4 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + enum E { } + ~ +!!! error TS8015: 'enum declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt new file mode 100644 index 0000000000000..f64628d3bc9a6 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + export = b; + ~~~~~~~~~~~ +!!! error TS8003: 'export=' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt new file mode 100644 index 0000000000000..cf030d3c4f2af --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + class C implements D { } + ~~~~~~~~~~~~ +!!! error TS8005: 'implements clauses' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt new file mode 100644 index 0000000000000..54314ef431e95 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + import a = b; + ~~~~~~~~~~~~~ +!!! error TS8002: 'import ... =' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt new file mode 100644 index 0000000000000..07fc015fc7239 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + interface I { } + ~ +!!! error TS8006: 'interface declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt new file mode 100644 index 0000000000000..e63eede29bdb9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + module M { } + ~ +!!! error TS8007: 'module declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt new file mode 100644 index 0000000000000..1eefd3b8eaec7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + function F(p?) { } + ~ +!!! error TS8009: '?' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt new file mode 100644 index 0000000000000..613dc7a51a365 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,11): error TS8014: 'property declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + class C { v } + ~ +!!! error TS8014: 'property declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt new file mode 100644 index 0000000000000..8585285c1ed6c --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt @@ -0,0 +1,12 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + class C { + public foo() { + ~~~~~~ +!!! error TS8009: 'public' can only be used in a .ts file. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt new file mode 100644 index 0000000000000..aac386f2dd11a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + class C { constructor(public x) { }} + ~~~~~~ +!!! error TS8012: 'parameter modifiers' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt new file mode 100644 index 0000000000000..48528b14531c0 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + function F(): number { } + ~~~~~~ +!!! error TS8010: 'types' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt new file mode 100644 index 0000000000000..3afd84da9bebe --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,1): error TS8008: 'type aliases' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + type a = b; + ~~~~~~~~~~~ +!!! error TS8008: 'type aliases' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt new file mode 100644 index 0000000000000..78a92e9460aa1 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + Foo(); + ~~~~~~ +!!! error TS8011: 'type arguments' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt new file mode 100644 index 0000000000000..d7c8faab8dc47 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + var v = undefined; + ~~~~~~ +!!! error TS8016: 'type assertion expressions' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt new file mode 100644 index 0000000000000..41638f5107753 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + function F(a: number) { } + ~~~~~~ +!!! error TS8010: 'types' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt new file mode 100644 index 0000000000000..6267d2f37fe31 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + class C { } + ~ +!!! error TS8004: 'type parameter declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt new file mode 100644 index 0000000000000..4a5e222058beb --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + function F() { } + ~ +!!! error TS8004: 'type parameter declarations' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt new file mode 100644 index 0000000000000..ceef95023df60 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt @@ -0,0 +1,9 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + var v: () => number; + ~~~~~~~~~~~~ +!!! error TS8010: 'types' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts new file mode 100644 index 0000000000000..636866e7eeb79 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +declare var v; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts new file mode 100644 index 0000000000000..2670e1503a915 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +@internal class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationEnumSyntax.ts b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts new file mode 100644 index 0000000000000..ad1126ebf27a8 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +enum E { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts new file mode 100644 index 0000000000000..42a6e36efc867 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +export = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts new file mode 100644 index 0000000000000..0a289515cb3c7 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts @@ -0,0 +1,2 @@ +// @filename: a.js +class C implements D { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts new file mode 100644 index 0000000000000..85e9a7efb6d19 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +import a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts new file mode 100644 index 0000000000000..014edddc34190 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +interface I { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts new file mode 100644 index 0000000000000..4de8f393a9389 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +module M { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationOptionalParameter.ts b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts new file mode 100644 index 0000000000000..47b445e38aceb --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts @@ -0,0 +1,2 @@ +// @filename: a.js +function F(p?) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts new file mode 100644 index 0000000000000..209efc3e12eab --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts @@ -0,0 +1,2 @@ +// @filename: a.js +class C { v } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts new file mode 100644 index 0000000000000..cd59f862ac841 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts @@ -0,0 +1,5 @@ +// @filename: a.js +class C { + public foo() { + } +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts new file mode 100644 index 0000000000000..cb7a051016d13 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts @@ -0,0 +1,2 @@ +// @filename: a.js +class C { constructor(public x) { }} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts new file mode 100644 index 0000000000000..01080ef8556dc --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts @@ -0,0 +1,2 @@ +// @filename: a.js +function F(): number { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts new file mode 100644 index 0000000000000..d4b9aeb0b812c --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts @@ -0,0 +1,2 @@ +// @filename: a.js +type a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts new file mode 100644 index 0000000000000..2a8d892c80d2c --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts @@ -0,0 +1,2 @@ +// @filename: a.js +Foo(); \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts new file mode 100644 index 0000000000000..29f0c18c81b90 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts @@ -0,0 +1,2 @@ +// @filename: a.js +var v = undefined; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts new file mode 100644 index 0000000000000..f7c98808ad5d9 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts @@ -0,0 +1,2 @@ +// @filename: a.js +function F(a: number) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts new file mode 100644 index 0000000000000..6b340a63dda8a --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts @@ -0,0 +1,2 @@ +// @filename: a.js +class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts new file mode 100644 index 0000000000000..5e2581676b8f5 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts @@ -0,0 +1,2 @@ +// @filename: a.js +function F() { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts new file mode 100644 index 0000000000000..e6289fd6eb090 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts @@ -0,0 +1,2 @@ +// @filename: a.js +var v: () => number; \ No newline at end of file From 7e30827ebe029f534738734ab8fc4c8b6825c610 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 14:09:29 -0700 Subject: [PATCH 010/353] Test for rest parameters(copied from language service tests) --- tests/baselines/reference/jsFileCompilationRestParameter.js | 5 +++++ .../reference/jsFileCompilationRestParameter.symbols | 5 +++++ .../baselines/reference/jsFileCompilationRestParameter.types | 5 +++++ tests/cases/compiler/jsFileCompilationRestParameter.ts | 4 ++++ 4 files changed, 19 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationRestParameter.js create mode 100644 tests/baselines/reference/jsFileCompilationRestParameter.symbols create mode 100644 tests/baselines/reference/jsFileCompilationRestParameter.types create mode 100644 tests/cases/compiler/jsFileCompilationRestParameter.ts diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.js b/tests/baselines/reference/jsFileCompilationRestParameter.js new file mode 100644 index 0000000000000..bcba97af02497 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationRestParameter.js @@ -0,0 +1,5 @@ +//// [a.js] +function foo(...a) { } + +//// [b.js] +function foo(...a) { } diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.symbols b/tests/baselines/reference/jsFileCompilationRestParameter.symbols new file mode 100644 index 0000000000000..4ce7529b83d20 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationRestParameter.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/a.js === +function foo(...a) { } +>foo : Symbol(foo, Decl(a.js, 0, 0)) +>a : Symbol(a, Decl(a.js, 0, 13)) + diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.types b/tests/baselines/reference/jsFileCompilationRestParameter.types new file mode 100644 index 0000000000000..54d0ec8631f40 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationRestParameter.types @@ -0,0 +1,5 @@ +=== tests/cases/compiler/a.js === +function foo(...a) { } +>foo : (...a: any[]) => void +>a : any[] + diff --git a/tests/cases/compiler/jsFileCompilationRestParameter.ts b/tests/cases/compiler/jsFileCompilationRestParameter.ts new file mode 100644 index 0000000000000..71d04eec64e42 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationRestParameter.ts @@ -0,0 +1,4 @@ +// @filename: a.js +// @target: es6 +// @out: b.js +function foo(...a) { } \ No newline at end of file From 225235427a49a08225cfddf5568278b11878044d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 14:25:44 -0700 Subject: [PATCH 011/353] Verify syntax error in js file are reported --- src/harness/harness.ts | 4 +++- .../jsFileCompilationSyntaxError.errors.txt | 14 ++++++++++++++ .../cases/compiler/jsFileCompilationSyntaxError.ts | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt create mode 100644 tests/cases/compiler/jsFileCompilationSyntaxError.ts diff --git a/src/harness/harness.ts b/src/harness/harness.ts index ad2648ef2086f..be924fe6ae91d 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -173,7 +173,9 @@ module Utils { ts.forEachChild(node, child => { childNodesAndArrays.push(child); }, array => { childNodesAndArrays.push(array); }); for (let childName in node) { - if (childName === "parent" || childName === "nextContainer" || childName === "modifiers" || childName === "externalModuleIndicator") { + if (childName === "parent" || childName === "nextContainer" || childName === "modifiers" || childName === "externalModuleIndicator" || + // for now ignore jsdoc comments + childName === "jsDocComment") { continue; } let child = (node)[childName]; diff --git a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt new file mode 100644 index 0000000000000..d742e68dbdcaa --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt @@ -0,0 +1,14 @@ +error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +tests/cases/compiler/a.js(3,6): error TS1223: 'type' tag already specified. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.js (1 errors) ==== + /** + * @type {number} + * @type {string} + ~~~~ +!!! error TS1223: 'type' tag already specified. + */ + var v; + \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationSyntaxError.ts b/tests/cases/compiler/jsFileCompilationSyntaxError.ts new file mode 100644 index 0000000000000..e6d379e0e3ba9 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationSyntaxError.ts @@ -0,0 +1,6 @@ +// @filename: a.js +/** + * @type {number} + * @type {string} + */ +var v; From 3107bbb4a11fb04289fd6ea5d75f43061fbec784 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 10 Sep 2015 14:59:40 -0700 Subject: [PATCH 012/353] Let tsconfig to pick up js files --- src/compiler/commandLineParser.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index d22bc98668840..1bc2c49e75d63 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -476,7 +476,13 @@ namespace ts { let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); for (let i = 0; i < sysFiles.length; i++) { let name = sysFiles[i]; - if (fileExtensionIs(name, ".d.ts")) { + if (fileExtensionIs(name, ".js")) { + let baseName = name.substr(0, name.length - ".js".length); + if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts") && !contains(sysFiles, baseName + ".d.ts")) { + fileNames.push(name); + } + } + else if (fileExtensionIs(name, ".d.ts")) { let baseName = name.substr(0, name.length - ".d.ts".length); if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts")) { fileNames.push(name); From 60f295f27a1224dd184a0c5a49d97ae453a65470 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 14 Sep 2015 15:33:49 -0700 Subject: [PATCH 013/353] Cleanup of options of project runner --- src/harness/projectsRunner.ts | 66 ++++++++----------- ...ootAbsolutePathMixedSubfolderNoOutdir.json | 4 +- ...ootAbsolutePathMixedSubfolderNoOutdir.json | 4 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...tePathMixedSubfolderSpecifyOutputFile.json | 4 +- ...tePathMixedSubfolderSpecifyOutputFile.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...AbsolutePathModuleMultifolderNoOutdir.json | 4 +- ...AbsolutePathModuleMultifolderNoOutdir.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...athModuleMultifolderSpecifyOutputFile.json | 4 +- ...athModuleMultifolderSpecifyOutputFile.json | 4 +- ...pRootAbsolutePathModuleSimpleNoOutdir.json | 4 +- ...pRootAbsolutePathModuleSimpleNoOutdir.json | 4 +- ...athModuleSimpleSpecifyOutputDirectory.json | 4 +- ...athModuleSimpleSpecifyOutputDirectory.json | 4 +- ...lutePathModuleSimpleSpecifyOutputFile.json | 4 +- ...lutePathModuleSimpleSpecifyOutputFile.json | 4 +- ...otAbsolutePathModuleSubfolderNoOutdir.json | 4 +- ...otAbsolutePathModuleSubfolderNoOutdir.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 4 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 4 +- ...apRootAbsolutePathMultifolderNoOutdir.json | 4 +- ...apRootAbsolutePathMultifolderNoOutdir.json | 4 +- ...PathMultifolderSpecifyOutputDirectory.json | 4 +- ...PathMultifolderSpecifyOutputDirectory.json | 4 +- ...olutePathMultifolderSpecifyOutputFile.json | 4 +- ...olutePathMultifolderSpecifyOutputFile.json | 4 +- .../mapRootAbsolutePathSimpleNoOutdir.json | 4 +- .../mapRootAbsolutePathSimpleNoOutdir.json | 4 +- ...olutePathSimpleSpecifyOutputDirectory.json | 4 +- ...olutePathSimpleSpecifyOutputDirectory.json | 4 +- ...otAbsolutePathSimpleSpecifyOutputFile.json | 4 +- ...otAbsolutePathSimpleSpecifyOutputFile.json | 4 +- ...mapRootAbsolutePathSingleFileNoOutdir.json | 4 +- ...mapRootAbsolutePathSingleFileNoOutdir.json | 4 +- ...ePathSingleFileSpecifyOutputDirectory.json | 4 +- ...ePathSingleFileSpecifyOutputDirectory.json | 4 +- ...solutePathSingleFileSpecifyOutputFile.json | 4 +- ...solutePathSingleFileSpecifyOutputFile.json | 4 +- .../mapRootAbsolutePathSubfolderNoOutdir.json | 4 +- .../mapRootAbsolutePathSubfolderNoOutdir.json | 4 +- ...tePathSubfolderSpecifyOutputDirectory.json | 4 +- ...tePathSubfolderSpecifyOutputDirectory.json | 4 +- ...bsolutePathSubfolderSpecifyOutputFile.json | 4 +- ...bsolutePathSubfolderSpecifyOutputFile.json | 4 +- ...ootRelativePathMixedSubfolderNoOutdir.json | 2 +- ...ootRelativePathMixedSubfolderNoOutdir.json | 2 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...vePathMixedSubfolderSpecifyOutputFile.json | 2 +- ...vePathMixedSubfolderSpecifyOutputFile.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...RelativePathModuleMultifolderNoOutdir.json | 2 +- ...RelativePathModuleMultifolderNoOutdir.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...athModuleMultifolderSpecifyOutputFile.json | 2 +- ...athModuleMultifolderSpecifyOutputFile.json | 2 +- ...pRootRelativePathModuleSimpleNoOutdir.json | 2 +- ...pRootRelativePathModuleSimpleNoOutdir.json | 2 +- ...athModuleSimpleSpecifyOutputDirectory.json | 2 +- ...athModuleSimpleSpecifyOutputDirectory.json | 2 +- ...tivePathModuleSimpleSpecifyOutputFile.json | 2 +- ...tivePathModuleSimpleSpecifyOutputFile.json | 2 +- ...otRelativePathModuleSubfolderNoOutdir.json | 2 +- ...otRelativePathModuleSubfolderNoOutdir.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 2 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 2 +- ...apRootRelativePathMultifolderNoOutdir.json | 2 +- ...apRootRelativePathMultifolderNoOutdir.json | 2 +- ...PathMultifolderSpecifyOutputDirectory.json | 2 +- ...PathMultifolderSpecifyOutputDirectory.json | 2 +- ...ativePathMultifolderSpecifyOutputFile.json | 2 +- ...ativePathMultifolderSpecifyOutputFile.json | 2 +- .../mapRootRelativePathSimpleNoOutdir.json | 2 +- .../mapRootRelativePathSimpleNoOutdir.json | 2 +- ...ativePathSimpleSpecifyOutputDirectory.json | 2 +- ...ativePathSimpleSpecifyOutputDirectory.json | 2 +- ...otRelativePathSimpleSpecifyOutputFile.json | 2 +- ...otRelativePathSimpleSpecifyOutputFile.json | 2 +- ...mapRootRelativePathSingleFileNoOutdir.json | 2 +- ...mapRootRelativePathSingleFileNoOutdir.json | 2 +- ...ePathSingleFileSpecifyOutputDirectory.json | 2 +- ...ePathSingleFileSpecifyOutputDirectory.json | 2 +- ...lativePathSingleFileSpecifyOutputFile.json | 2 +- ...lativePathSingleFileSpecifyOutputFile.json | 2 +- .../mapRootRelativePathSubfolderNoOutdir.json | 2 +- .../mapRootRelativePathSubfolderNoOutdir.json | 2 +- ...vePathSubfolderSpecifyOutputDirectory.json | 2 +- ...vePathSubfolderSpecifyOutputDirectory.json | 2 +- ...elativePathSubfolderSpecifyOutputFile.json | 2 +- ...elativePathSubfolderSpecifyOutputFile.json | 2 +- .../amd/maprootUrlMixedSubfolderNoOutdir.json | 2 +- .../maprootUrlMixedSubfolderNoOutdir.json | 2 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 2 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- .../maprootUrlModuleMultifolderNoOutdir.json | 2 +- .../maprootUrlModuleMultifolderNoOutdir.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 2 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 2 +- .../amd/maprootUrlModuleSimpleNoOutdir.json | 2 +- .../node/maprootUrlModuleSimpleNoOutdir.json | 2 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 2 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 2 +- ...prootUrlModuleSimpleSpecifyOutputFile.json | 2 +- ...prootUrlModuleSimpleSpecifyOutputFile.json | 2 +- .../maprootUrlModuleSubfolderNoOutdir.json | 2 +- .../maprootUrlModuleSubfolderNoOutdir.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 2 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 2 +- .../amd/maprootUrlMultifolderNoOutdir.json | 2 +- .../node/maprootUrlMultifolderNoOutdir.json | 2 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 2 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 2 +- ...aprootUrlMultifolderSpecifyOutputFile.json | 2 +- ...aprootUrlMultifolderSpecifyOutputFile.json | 2 +- .../amd/maprootUrlSimpleNoOutdir.json | 2 +- .../node/maprootUrlSimpleNoOutdir.json | 2 +- ...aprootUrlSimpleSpecifyOutputDirectory.json | 2 +- ...aprootUrlSimpleSpecifyOutputDirectory.json | 2 +- .../maprootUrlSimpleSpecifyOutputFile.json | 2 +- .../maprootUrlSimpleSpecifyOutputFile.json | 2 +- .../amd/maprootUrlSingleFileNoOutdir.json | 2 +- .../node/maprootUrlSingleFileNoOutdir.json | 2 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 2 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 2 +- ...maprootUrlSingleFileSpecifyOutputFile.json | 2 +- ...maprootUrlSingleFileSpecifyOutputFile.json | 2 +- .../amd/maprootUrlSubfolderNoOutdir.json | 2 +- .../node/maprootUrlSubfolderNoOutdir.json | 2 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 2 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 2 +- .../maprootUrlSubfolderSpecifyOutputFile.json | 2 +- .../maprootUrlSubfolderSpecifyOutputFile.json | 2 +- ...rlsourcerootUrlMixedSubfolderNoOutdir.json | 4 +- ...rlsourcerootUrlMixedSubfolderNoOutdir.json | 4 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 4 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...ourcerootUrlModuleMultifolderNoOutdir.json | 4 +- ...ourcerootUrlModuleMultifolderNoOutdir.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 4 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 4 +- ...tUrlsourcerootUrlModuleSimpleNoOutdir.json | 4 +- ...tUrlsourcerootUrlModuleSimpleNoOutdir.json | 4 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 4 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 4 +- ...erootUrlModuleSimpleSpecifyOutputFile.json | 4 +- ...erootUrlModuleSimpleSpecifyOutputFile.json | 4 +- ...lsourcerootUrlModuleSubfolderNoOutdir.json | 4 +- ...lsourcerootUrlModuleSubfolderNoOutdir.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 4 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 4 +- ...otUrlsourcerootUrlMultifolderNoOutdir.json | 4 +- ...otUrlsourcerootUrlMultifolderNoOutdir.json | 4 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 4 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 4 +- ...cerootUrlMultifolderSpecifyOutputFile.json | 4 +- ...cerootUrlMultifolderSpecifyOutputFile.json | 4 +- ...maprootUrlsourcerootUrlSimpleNoOutdir.json | 4 +- ...maprootUrlsourcerootUrlSimpleNoOutdir.json | 4 +- ...cerootUrlSimpleSpecifyOutputDirectory.json | 4 +- ...cerootUrlSimpleSpecifyOutputDirectory.json | 4 +- ...lsourcerootUrlSimpleSpecifyOutputFile.json | 4 +- ...lsourcerootUrlSimpleSpecifyOutputFile.json | 4 +- ...ootUrlsourcerootUrlSingleFileNoOutdir.json | 4 +- ...ootUrlsourcerootUrlSingleFileNoOutdir.json | 4 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 4 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 4 +- ...rcerootUrlSingleFileSpecifyOutputFile.json | 4 +- ...rcerootUrlSingleFileSpecifyOutputFile.json | 4 +- ...rootUrlsourcerootUrlSubfolderNoOutdir.json | 4 +- ...rootUrlsourcerootUrlSubfolderNoOutdir.json | 4 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 4 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 4 +- ...urcerootUrlSubfolderSpecifyOutputFile.json | 4 +- ...urcerootUrlSubfolderSpecifyOutputFile.json | 4 +- ...renceResolutionRelativePathsNoResolve.json | 1 + ...renceResolutionRelativePathsNoResolve.json | 1 + ...renceResolutionSameFileTwiceNoResolve.json | 1 + ...renceResolutionSameFileTwiceNoResolve.json | 1 + .../rootDirectory/amd/rootDirectory.json | 2 +- .../rootDirectory/node/rootDirectory.json | 2 +- .../amd/rootDirectoryErrors.json | 2 +- .../node/rootDirectoryErrors.json | 2 +- .../amd/rootDirectoryWithSourceRoot.json | 2 +- .../node/rootDirectoryWithSourceRoot.json | 2 +- ...ootAbsolutePathMixedSubfolderNoOutdir.json | 4 +- ...ootAbsolutePathMixedSubfolderNoOutdir.json | 4 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 4 +- ...tePathMixedSubfolderSpecifyOutputFile.json | 4 +- ...tePathMixedSubfolderSpecifyOutputFile.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...erSpecifyOutputFileAndOutputDirectory.json | 4 +- ...AbsolutePathModuleMultifolderNoOutdir.json | 4 +- ...AbsolutePathModuleMultifolderNoOutdir.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...duleMultifolderSpecifyOutputDirectory.json | 4 +- ...athModuleMultifolderSpecifyOutputFile.json | 4 +- ...athModuleMultifolderSpecifyOutputFile.json | 4 +- ...eRootAbsolutePathModuleSimpleNoOutdir.json | 4 +- ...eRootAbsolutePathModuleSimpleNoOutdir.json | 4 +- ...athModuleSimpleSpecifyOutputDirectory.json | 4 +- ...athModuleSimpleSpecifyOutputDirectory.json | 4 +- ...lutePathModuleSimpleSpecifyOutputFile.json | 4 +- ...lutePathModuleSimpleSpecifyOutputFile.json | 4 +- ...otAbsolutePathModuleSubfolderNoOutdir.json | 4 +- ...otAbsolutePathModuleSubfolderNoOutdir.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 4 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 4 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 4 +- ...ceRootAbsolutePathMultifolderNoOutdir.json | 4 +- ...ceRootAbsolutePathMultifolderNoOutdir.json | 4 +- ...PathMultifolderSpecifyOutputDirectory.json | 4 +- ...PathMultifolderSpecifyOutputDirectory.json | 4 +- ...olutePathMultifolderSpecifyOutputFile.json | 4 +- ...olutePathMultifolderSpecifyOutputFile.json | 4 +- .../sourceRootAbsolutePathSimpleNoOutdir.json | 4 +- .../sourceRootAbsolutePathSimpleNoOutdir.json | 4 +- ...olutePathSimpleSpecifyOutputDirectory.json | 4 +- ...olutePathSimpleSpecifyOutputDirectory.json | 4 +- ...otAbsolutePathSimpleSpecifyOutputFile.json | 4 +- ...otAbsolutePathSimpleSpecifyOutputFile.json | 4 +- ...rceRootAbsolutePathSingleFileNoOutdir.json | 4 +- ...rceRootAbsolutePathSingleFileNoOutdir.json | 4 +- ...ePathSingleFileSpecifyOutputDirectory.json | 4 +- ...ePathSingleFileSpecifyOutputDirectory.json | 4 +- ...solutePathSingleFileSpecifyOutputFile.json | 4 +- ...solutePathSingleFileSpecifyOutputFile.json | 4 +- ...urceRootAbsolutePathSubfolderNoOutdir.json | 4 +- ...urceRootAbsolutePathSubfolderNoOutdir.json | 4 +- ...tePathSubfolderSpecifyOutputDirectory.json | 4 +- ...tePathSubfolderSpecifyOutputDirectory.json | 4 +- ...bsolutePathSubfolderSpecifyOutputFile.json | 4 +- ...bsolutePathSubfolderSpecifyOutputFile.json | 4 +- ...ootRelativePathMixedSubfolderNoOutdir.json | 2 +- ...ootRelativePathMixedSubfolderNoOutdir.json | 2 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...hMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...vePathMixedSubfolderSpecifyOutputFile.json | 2 +- ...vePathMixedSubfolderSpecifyOutputFile.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...RelativePathModuleMultifolderNoOutdir.json | 2 +- ...RelativePathModuleMultifolderNoOutdir.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...athModuleMultifolderSpecifyOutputFile.json | 2 +- ...athModuleMultifolderSpecifyOutputFile.json | 2 +- ...eRootRelativePathModuleSimpleNoOutdir.json | 2 +- ...eRootRelativePathModuleSimpleNoOutdir.json | 2 +- ...athModuleSimpleSpecifyOutputDirectory.json | 2 +- ...athModuleSimpleSpecifyOutputDirectory.json | 2 +- ...tivePathModuleSimpleSpecifyOutputFile.json | 2 +- ...tivePathModuleSimpleSpecifyOutputFile.json | 2 +- ...otRelativePathModuleSubfolderNoOutdir.json | 2 +- ...otRelativePathModuleSubfolderNoOutdir.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 2 +- ...ePathModuleSubfolderSpecifyOutputFile.json | 2 +- ...ceRootRelativePathMultifolderNoOutdir.json | 2 +- ...ceRootRelativePathMultifolderNoOutdir.json | 2 +- ...PathMultifolderSpecifyOutputDirectory.json | 2 +- ...PathMultifolderSpecifyOutputDirectory.json | 2 +- ...ativePathMultifolderSpecifyOutputFile.json | 2 +- ...ativePathMultifolderSpecifyOutputFile.json | 2 +- .../sourceRootRelativePathSimpleNoOutdir.json | 2 +- .../sourceRootRelativePathSimpleNoOutdir.json | 2 +- ...ativePathSimpleSpecifyOutputDirectory.json | 2 +- ...ativePathSimpleSpecifyOutputDirectory.json | 2 +- ...otRelativePathSimpleSpecifyOutputFile.json | 2 +- ...otRelativePathSimpleSpecifyOutputFile.json | 2 +- ...rceRootRelativePathSingleFileNoOutdir.json | 2 +- ...rceRootRelativePathSingleFileNoOutdir.json | 2 +- ...ePathSingleFileSpecifyOutputDirectory.json | 2 +- ...ePathSingleFileSpecifyOutputDirectory.json | 2 +- ...lativePathSingleFileSpecifyOutputFile.json | 2 +- ...lativePathSingleFileSpecifyOutputFile.json | 2 +- ...urceRootRelativePathSubfolderNoOutdir.json | 2 +- ...urceRootRelativePathSubfolderNoOutdir.json | 2 +- ...vePathSubfolderSpecifyOutputDirectory.json | 2 +- ...vePathSubfolderSpecifyOutputDirectory.json | 2 +- ...elativePathSubfolderSpecifyOutputFile.json | 2 +- ...elativePathSubfolderSpecifyOutputFile.json | 2 +- .../sourcerootUrlMixedSubfolderNoOutdir.json | 2 +- .../sourcerootUrlMixedSubfolderNoOutdir.json | 2 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...lMixedSubfolderSpecifyOutputDirectory.json | 2 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 2 +- ...ootUrlMixedSubfolderSpecifyOutputFile.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...erSpecifyOutputFileAndOutputDirectory.json | 2 +- ...ourcerootUrlModuleMultifolderNoOutdir.json | 2 +- ...ourcerootUrlModuleMultifolderNoOutdir.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...duleMultifolderSpecifyOutputDirectory.json | 2 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 2 +- ...UrlModuleMultifolderSpecifyOutputFile.json | 2 +- .../sourcerootUrlModuleSimpleNoOutdir.json | 2 +- .../sourcerootUrlModuleSimpleNoOutdir.json | 2 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 2 +- ...UrlModuleSimpleSpecifyOutputDirectory.json | 2 +- ...erootUrlModuleSimpleSpecifyOutputFile.json | 2 +- ...erootUrlModuleSimpleSpecifyOutputFile.json | 2 +- .../sourcerootUrlModuleSubfolderNoOutdir.json | 2 +- .../sourcerootUrlModuleSubfolderNoOutdir.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...ModuleSubfolderSpecifyOutputDirectory.json | 2 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 2 +- ...otUrlModuleSubfolderSpecifyOutputFile.json | 2 +- .../amd/sourcerootUrlMultifolderNoOutdir.json | 2 +- .../sourcerootUrlMultifolderNoOutdir.json | 2 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 2 +- ...tUrlMultifolderSpecifyOutputDirectory.json | 2 +- ...cerootUrlMultifolderSpecifyOutputFile.json | 2 +- ...cerootUrlMultifolderSpecifyOutputFile.json | 2 +- .../amd/sourcerootUrlSimpleNoOutdir.json | 2 +- .../node/sourcerootUrlSimpleNoOutdir.json | 2 +- ...cerootUrlSimpleSpecifyOutputDirectory.json | 2 +- ...cerootUrlSimpleSpecifyOutputDirectory.json | 2 +- .../sourcerootUrlSimpleSpecifyOutputFile.json | 2 +- .../sourcerootUrlSimpleSpecifyOutputFile.json | 2 +- .../amd/sourcerootUrlSingleFileNoOutdir.json | 2 +- .../node/sourcerootUrlSingleFileNoOutdir.json | 2 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 2 +- ...otUrlSingleFileSpecifyOutputDirectory.json | 2 +- ...rcerootUrlSingleFileSpecifyOutputFile.json | 2 +- ...rcerootUrlSingleFileSpecifyOutputFile.json | 2 +- .../amd/sourcerootUrlSubfolderNoOutdir.json | 2 +- .../node/sourcerootUrlSubfolderNoOutdir.json | 2 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 2 +- ...ootUrlSubfolderSpecifyOutputDirectory.json | 2 +- ...urcerootUrlSubfolderSpecifyOutputFile.json | 2 +- ...urcerootUrlSubfolderSpecifyOutputFile.json | 2 +- 361 files changed, 539 insertions(+), 543 deletions(-) diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index fe4ab8ea8ea4f..12e3222a54177 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -6,19 +6,11 @@ interface ProjectRunnerTestCase { scenario: string; projectRoot: string; // project where it lives - this also is the current directory when compiling inputFiles: string[]; // list of input files to be given to program - out?: string; // --out - outDir?: string; // --outDir - sourceMap?: boolean; // --map - mapRoot?: string; // --mapRoot resolveMapRoot?: boolean; // should we resolve this map root and give compiler the absolute disk path as map root? - sourceRoot?: string; // --sourceRoot resolveSourceRoot?: boolean; // should we resolve this source root and give compiler the absolute disk path as map root? - declaration?: boolean; // --d baselineCheck?: boolean; // Verify the baselines of output files, if this is false, we will write to output to the disk but there is no verification of baselines runTest?: boolean; // Run the resulting test bug?: string; // If there is any bug associated with this test case - noResolve?: boolean; - rootDir?: string; // --rootDir } interface ProjectRunnerTestCaseResolutionInfo extends ProjectRunnerTestCase { @@ -58,7 +50,7 @@ class ProjectRunner extends RunnerBase { } private runProjectTestCase(testCaseFileName: string) { - let testCase: ProjectRunnerTestCase; + let testCase: ProjectRunnerTestCase & ts.CompilerOptions; let testFileText: string = null; try { @@ -69,7 +61,7 @@ class ProjectRunner extends RunnerBase { } try { - testCase = JSON.parse(testFileText); + testCase = JSON.parse(testFileText); } catch (e) { assert(false, "Testcase: " + testCaseFileName + " does not contain valid json format: " + e.message); @@ -155,18 +147,35 @@ class ProjectRunner extends RunnerBase { }; function createCompilerOptions(): ts.CompilerOptions { - return { - declaration: !!testCase.declaration, - sourceMap: !!testCase.sourceMap, - outFile: testCase.out, - outDir: testCase.outDir, + // Set the special options that depend on other testcase options + let compilerOptions: ts.CompilerOptions = { mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? Harness.IO.resolvePath(testCase.mapRoot) : testCase.mapRoot, sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? Harness.IO.resolvePath(testCase.sourceRoot) : testCase.sourceRoot, module: moduleKind, moduleResolution: ts.ModuleResolutionKind.Classic, // currently all tests use classic module resolution kind, this will change in the future - noResolve: testCase.noResolve, - rootDir: testCase.rootDir }; + + // Set the values specified using json + let optionNameMap: ts.Map = {}; + ts.forEach(ts.optionDeclarations, option => { + optionNameMap[option.name] = option; + }); + for (let name in testCase) { + if (name !== "mapRoot" && name !== "sourceRoot" && ts.hasProperty(optionNameMap, name)) { + let option = optionNameMap[name]; + let optType = option.type; + let value = testCase[name]; + if (typeof optType !== "string") { + let key = value.toLowerCase(); + if (ts.hasProperty(optType, key)) { + value = optType[key]; + } + } + compilerOptions[option.name] = value; + } + } + + return compilerOptions; } function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile { @@ -342,26 +351,9 @@ class ProjectRunner extends RunnerBase { let compilerResult: BatchCompileProjectTestCaseResult; function getCompilerResolutionInfo() { - let resolutionInfo: ProjectRunnerTestCaseResolutionInfo = { - scenario: testCase.scenario, - projectRoot: testCase.projectRoot, - inputFiles: testCase.inputFiles, - out: testCase.out, - outDir: testCase.outDir, - sourceMap: testCase.sourceMap, - mapRoot: testCase.mapRoot, - resolveMapRoot: testCase.resolveMapRoot, - sourceRoot: testCase.sourceRoot, - resolveSourceRoot: testCase.resolveSourceRoot, - declaration: testCase.declaration, - baselineCheck: testCase.baselineCheck, - runTest: testCase.runTest, - bug: testCase.bug, - rootDir: testCase.rootDir, - resolvedInputFiles: ts.map(compilerResult.program.getSourceFiles(), inputFile => inputFile.fileName), - emittedFiles: ts.map(compilerResult.outputFiles, outputFile => outputFile.emittedFileName) - }; - + let resolutionInfo: ProjectRunnerTestCaseResolutionInfo & ts.CompilerOptions = JSON.parse(JSON.stringify(testCase)); + resolutionInfo.resolvedInputFiles = ts.map(compilerResult.program.getSourceFiles(), inputFile => inputFile.fileName); + resolutionInfo.emittedFiles = ts.map(compilerResult.outputFiles, outputFile => outputFile.emittedFileName); return resolutionInfo; } diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json index fa9e0b566a937..8a96d681f2427 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json index fa9e0b566a937..8a96d681f2427 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index ebaec46d1e3e9..997c2ed46c0d4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index ebaec46d1e3e9..997c2ed46c0d4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index ee020b0ff8054..40f9da3afbfe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index ee020b0ff8054..40f9da3afbfe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index ed7bcd289e722..d23b5b2408fa4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index ed7bcd289e722..d23b5b2408fa4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 8f512dcc98c55..7474a34ec8ce7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 8f512dcc98c55..7474a34ec8ce7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 4f65daf7560a9..b0c916710122d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 4f65daf7560a9..b0c916710122d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 6432d5ae91e75..588d2404ef8da 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 6432d5ae91e75..588d2404ef8da 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json index 31a0fb89c5026..ff1b014410ef8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json index 31a0fb89c5026..ff1b014410ef8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 355458526bc92..a155932652879 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 355458526bc92..a155932652879 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index f703a63b71fba..971d1a2aaab6a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index f703a63b71fba..971d1a2aaab6a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json index a6bc71dd664d0..27d5d010b40f1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json index a6bc71dd664d0..27d5d010b40f1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index e873c8fc472e5..8e16e5d165d1d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index e873c8fc472e5..8e16e5d165d1d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index d8f4cc74008a0..86f3cf5c9a961 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index d8f4cc74008a0..86f3cf5c9a961 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json index 49018ee59734b..f511365c917ed 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json index 49018ee59734b..f511365c917ed 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 097c9bbf2097c..b3c5617dffa61 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 097c9bbf2097c..b3c5617dffa61 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json index bcf3a4400aa95..81f0ad78eb302 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json index bcf3a4400aa95..81f0ad78eb302 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json index d5914d929503b..8a32acd12e1aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json index d5914d929503b..8a32acd12e1aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 2c5e1dae38a29..23cc45f96453c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 2c5e1dae38a29..23cc45f96453c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json index 8431a99c800ca..72a0dce300769 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json index 8431a99c800ca..72a0dce300769 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json index 4a180368e2023..d26b77e467512 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json index 4a180368e2023..d26b77e467512 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json index a44a569a0a608..e712eab1a751e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json index a44a569a0a608..e712eab1a751e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json index 7c0069605da79..c66cea7fd447e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json index 7c0069605da79..c66cea7fd447e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json index 1b09decc58d02..a3c1bede2a1ef 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json index 1b09decc58d02..a3c1bede2a1ef 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index a02eb484aa248..ddd2bdee5a87a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index a02eb484aa248..ddd2bdee5a87a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json index ec516baecfe0f..d452a55784f64 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json index ec516baecfe0f..d452a55784f64 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", - "resolveMapRoot": true, "declaration": true, "baselineCheck": true, + "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles", + "resolveMapRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json index 5352fd8a988f2..af9fb8ba53bc7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json index 5352fd8a988f2..af9fb8ba53bc7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0a0d68e300a05..9faeb47e4c8ec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0a0d68e300a05..9faeb47e4c8ec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index 8e87f61b8df1b..4dc8fc45037de 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index 8e87f61b8df1b..4dc8fc45037de 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4ed441e255240..bf282177afdec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4ed441e255240..bf282177afdec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json index 8ec143b2dce59..42354ecded5e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json index 8ec143b2dce59..42354ecded5e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 96777b6f502f6..969b730a251b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 96777b6f502f6..969b730a251b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index f3c86f22eb74d..3a1983f88d979 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index f3c86f22eb74d..3a1983f88d979 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json index a4e8c09b004df..162bcbaa749a7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json index a4e8c09b004df..162bcbaa749a7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index f4a8884b58eea..440dbb0972e3a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index f4a8884b58eea..440dbb0972e3a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index fe0b8045a5c17..0dfc88c1aa5b5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index fe0b8045a5c17..0dfc88c1aa5b5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json index a2779060068a2..5abb8eec3dafc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json index a2779060068a2..5abb8eec3dafc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 120bb5afbb6ea..d587558fbaf01 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 120bb5afbb6ea..d587558fbaf01 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index a87c7d36d8ede..0eb8315ff9bec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index a87c7d36d8ede..0eb8315ff9bec 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json index 718cfdabf0f08..89fc00cb3ec51 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json index 718cfdabf0f08..89fc00cb3ec51 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index f51e53f02f6e7..d0034c920bc50 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index f51e53f02f6e7..d0034c920bc50 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json index 0d3f3ad02d5fd..17fc8719be6b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json index 0d3f3ad02d5fd..17fc8719be6b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json index d4d500a397e17..ee2758b4e8777 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json index d4d500a397e17..ee2758b4e8777 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 12801537d2bdf..de85b187e28df 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 12801537d2bdf..de85b187e28df 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json index d6bbe96a7e07c..0e7a2f759bc60 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json index d6bbe96a7e07c..0e7a2f759bc60 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json index bb7ccbf453ba8..f8b9e1b96c2b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json index bb7ccbf453ba8..f8b9e1b96c2b2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json index f654dbc3fac65..4960088c2691e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json index f654dbc3fac65..4960088c2691e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json index fc285030e8fa7..e14165a2094ee 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json index fc285030e8fa7..e14165a2094ee 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json index b5b1dfba62eea..f47e52efaae15 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json index b5b1dfba62eea..f47e52efaae15 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index a06e2f34d5ac5..d54421a13acff 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index a06e2f34d5ac5..d54421a13acff 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json index 772431187026e..da673bae82c96 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json index 772431187026e..da673bae82c96 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "../mapFiles", "declaration": true, "baselineCheck": true, + "mapRoot": "../mapFiles", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json index c661284121066..24e51c87f59b7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json index c661284121066..24e51c87f59b7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index b225c4e408f6b..9ad38e70ea2d5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index b225c4e408f6b..9ad38e70ea2d5 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json index f987aa49ffeb3..155d2931181df 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json index f987aa49ffeb3..155d2931181df 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2bb23cdc61028..f749081c10c40 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2bb23cdc61028..f749081c10c40 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json index 6ecdc26ccd446..e63320ddb6a21 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json index 6ecdc26ccd446..e63320ddb6a21 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 9884550745c4b..8bedb00204127 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 9884550745c4b..8bedb00204127 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json index e061982b32fc3..de091e6dd2861 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json index e061982b32fc3..de091e6dd2861 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json index f9f02dcf7894e..f8a6fa3cd5947 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json index f9f02dcf7894e..f8a6fa3cd5947 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json index db2995acf6956..c307775e5490c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json index db2995acf6956..c307775e5490c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json index e636ce61f7e6e..f0c017279578f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json index e636ce61f7e6e..f0c017279578f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json index 2c7699ff0faed..91546861e0159 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json index 2c7699ff0faed..91546861e0159 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index a61a50a760d15..80247e1b00972 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index a61a50a760d15..80247e1b00972 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json index 05da8c15292e1..00ba79cee2676 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json index 05da8c15292e1..00ba79cee2676 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json index 5ea7aa806651d..078c565dee6c9 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json index 5ea7aa806651d..078c565dee6c9 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json index 0d16b53af662f..dfd35e2a11e4c 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json index 0d16b53af662f..dfd35e2a11e4c 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json index 8fb63eb43b0b4..e515573b4d86f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json index 8fb63eb43b0b4..e515573b4d86f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json index 6f141f8151104..6ea29c1e036a1 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json index 6f141f8151104..6ea29c1e036a1 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json index 1f73a2a33d6cc..999d4c5c3cbe7 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json index 1f73a2a33d6cc..999d4c5c3cbe7 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json index dcd18f3e946b5..85527f93f24e8 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json index dcd18f3e946b5..85527f93f24e8 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json index 689739aedcef4..9cdafc48766e3 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json index 689739aedcef4..9cdafc48766e3 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json index bbd1c10f32016..7ee5dedd0de58 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json index bbd1c10f32016..7ee5dedd0de58 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json index 634d80d7ff00d..d48c811492766 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json index 634d80d7ff00d..d48c811492766 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json index edd08fbfe107f..eb0a847c3cb3f 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json index edd08fbfe107f..eb0a847c3cb3f 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json index 0b2ea47302960..ec6fe614b436c 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json index 0b2ea47302960..ec6fe614b436c 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json index d4965ed4e7484..f8d936825fdcd 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json index d4965ed4e7484..f8d936825fdcd 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index 2f2a4280abf1c..25ba499857816 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index 2f2a4280abf1c..25ba499857816 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 006720b1cc3d5..4978c9691b4aa 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 006720b1cc3d5..4978c9691b4aa 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index c36f3ade5e08b..b1eff624a4bb3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index c36f3ade5e08b..b1eff624a4bb3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4741b9cf9e18d..f0c3ddab2a589 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4741b9cf9e18d..f0c3ddab2a589 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index ec6313ac50c0c..ce844561c4150 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index ec6313ac50c0c..ce844561c4150 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 9a0d0258ca4bd..a73eb85b5c4f2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 9a0d0258ca4bd..a73eb85b5c4f2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 3ecf4bc4cc448..713487cc8d08e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 3ecf4bc4cc448..713487cc8d08e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index d901eb0a79073..7b1ffa340c57f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index d901eb0a79073..7b1ffa340c57f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 278bc2c86e5de..bf1e9882756a0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 278bc2c86e5de..bf1e9882756a0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 2cfc9aebda200..53aa4866a4103 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 2cfc9aebda200..53aa4866a4103 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index fc4e8b7c9db59..e57d54bde3b55 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index fc4e8b7c9db59..e57d54bde3b55 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index a20ecf2d6c97d..76e138ca5119f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index a20ecf2d6c97d..76e138ca5119f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index cfa0ec5cb81b5..46ba3b1411432 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index cfa0ec5cb81b5..46ba3b1411432 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json index ddfa8259401e4..ae04c034c8cc9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json index ddfa8259401e4..ae04c034c8cc9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 6e6c3e73c0390..5bac47f1b0b8c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 6e6c3e73c0390..5bac47f1b0b8c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json index f6aa3055f76d9..b0159f72fc0e6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json index f6aa3055f76d9..b0159f72fc0e6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json index c85db0226a2c0..601a381b6bc25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json index c85db0226a2c0..601a381b6bc25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index ceda4546fcebf..72d412d2e5c2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index ceda4546fcebf..72d412d2e5c2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json index 2bdff3a64beee..ad03221057b16 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json index 2bdff3a64beee..ad03221057b16 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json index 2c66c2dc3a351..8ad3500d92659 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json index 2c66c2dc3a351..8ad3500d92659 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json index 4d7e0f659ef1b..82d34274776f0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json index 4d7e0f659ef1b..82d34274776f0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json index f68a658cc8b51..323adcd17b92e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json index f68a658cc8b51..323adcd17b92e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 5f6d0ccd74b8d..f3fb4f89412ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 5f6d0ccd74b8d..f3fb4f89412ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index 9dca1ba6d4b78..8d6923824ebc2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index 9dca1ba6d4b78..8d6923824ebc2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json index d3d7588f1caa6..0bdb289d92d02 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json index d3d7588f1caa6..0bdb289d92d02 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "mapRoot": "http://www.typescriptlang.org/", - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "mapRoot": "http://www.typescriptlang.org/", + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json index 16831b328e9c7..bb8d7b368595b 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json @@ -5,6 +5,7 @@ "foo.ts", "../../../bar/bar.ts" ], + "noResolve": true, "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json index 16831b328e9c7..bb8d7b368595b 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json @@ -5,6 +5,7 @@ "foo.ts", "../../../bar/bar.ts" ], + "noResolve": true, "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json index b22aefac3ef5c..482cfcd40b4e5 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json @@ -5,6 +5,7 @@ "test.ts", "../ReferenceResolution/test.ts" ], + "noResolve": true, "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json index b22aefac3ef5c..482cfcd40b4e5 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json @@ -5,6 +5,7 @@ "test.ts", "../ReferenceResolution/test.ts" ], + "noResolve": true, "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json index 2ec18b3ac5acf..bb79b1a7911e5 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json +++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json @@ -5,10 +5,10 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA", "sourceMap": true, "declaration": true, "baselineCheck": true, - "rootDir": "FolderA", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json index 2ec18b3ac5acf..bb79b1a7911e5 100644 --- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json +++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json @@ -5,10 +5,10 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA", "sourceMap": true, "declaration": true, "baselineCheck": true, - "rootDir": "FolderA", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json index fdde42592ca8d..42f348a4b56d6 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json @@ -5,9 +5,9 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA/FolderB/FolderC", "declaration": true, "baselineCheck": true, - "rootDir": "FolderA/FolderB/FolderC", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json index fdde42592ca8d..42f348a4b56d6 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json @@ -5,9 +5,9 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA/FolderB/FolderC", "declaration": true, "baselineCheck": true, - "rootDir": "FolderA/FolderB/FolderC", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.json b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.json index deb12150736aa..57e51ed359a2d 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.json +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.json @@ -5,10 +5,10 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA", "sourceMap": true, "sourceRoot": "SourceRootPath", "baselineCheck": true, - "rootDir": "FolderA", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.json b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.json index deb12150736aa..57e51ed359a2d 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.json +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.json @@ -5,10 +5,10 @@ "FolderA/FolderB/fileB.ts" ], "outDir": "outdir/simple", + "rootDir": "FolderA", "sourceMap": true, "sourceRoot": "SourceRootPath", "baselineCheck": true, - "rootDir": "FolderA", "resolvedInputFiles": [ "lib.d.ts", "FolderA/FolderB/FolderC/fileC.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index 43059eaa5c6bc..734abfe9f95a3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index 43059eaa5c6bc..734abfe9f95a3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 6d9cf2998a884..560eef6c4905a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 6d9cf2998a884..560eef6c4905a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index 09c6092f16447..bf155fe1fe347 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index 09c6092f16447..bf155fe1fe347 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 6fb17fa06b80c..87f1ac0b6fce1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 6fb17fa06b80c..87f1ac0b6fce1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,10 +7,10 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 9e98d46666fa0..2475d02eb4796 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 9e98d46666fa0..2475d02eb4796 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index d96a3e5f83237..8a746a518a3ad 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index d96a3e5f83237..8a746a518a3ad 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index b3e80123c047c..d68d0afc19910 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index b3e80123c047c..d68d0afc19910 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json index 6e1f133ef6486..09cb6b546b32b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json index 6e1f133ef6486..09cb6b546b32b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index c15e91877ae5c..d3ba076ef6fed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index c15e91877ae5c..d3ba076ef6fed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index e2621b2fa52f4..914b6e2d79252 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index e2621b2fa52f4..914b6e2d79252 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index b65bed6197951..cdd0d1b3328d9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index b65bed6197951..cdd0d1b3328d9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index a8662e09bf6ea..2e482f41e6640 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index a8662e09bf6ea..2e482f41e6640 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index a43e0f691728e..ba9d94f2b0c55 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index a43e0f691728e..ba9d94f2b0c55 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json index b84ccc2bc2308..c955083f7f13e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json index b84ccc2bc2308..c955083f7f13e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 43d3db291ff91..3fa14686a7c03 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 43d3db291ff91..3fa14686a7c03 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json index 6bd6db427c4f5..ed994f82308dc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json index 6bd6db427c4f5..ed994f82308dc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_multifolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json index f57c8110827d0..5ee7318ed14e8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json index f57c8110827d0..5ee7318ed14e8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 02981610092e3..a7a05e1024831 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 02981610092e3..a7a05e1024831 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json index 74add9e8d7bb9..3a215e043c6ea 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json index 74add9e8d7bb9..3a215e043c6ea 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_simple/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_simple/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json index 772190b485172..369da8c6254cd 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json index 772190b485172..369da8c6254cd 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 8a6eb54b7892f..6534ef2784766 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 8a6eb54b7892f..6534ef2784766 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json index ec9d13d68de6f..71b375b8650d6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json index ec9d13d68de6f..71b375b8650d6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_singleFile/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json index 03f06090742ea..3ec5d65f7a0d9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json index 03f06090742ea..3ec5d65f7a0d9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -5,10 +5,10 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 08bdabb1c6e3c..faa7592db458f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 08bdabb1c6e3c..faa7592db458f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -6,10 +6,10 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json index a6c034775ce78..73333fd4868bb 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json index a6c034775ce78..73333fd4868bb 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -6,10 +6,10 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", - "resolveSourceRoot": true, "declaration": true, "baselineCheck": true, + "sourceRoot": "tests/cases/projects/outputdir_subfolder/src", + "resolveSourceRoot": true, "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json index 0e73f218462dd..326bb4aaff6fe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json index 0e73f218462dd..326bb4aaff6fe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 99815d5266195..e47173aac84b1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 99815d5266195..e47173aac84b1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 82ef1c7d88290..19b2ec4e5ffc4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 82ef1c7d88290..19b2ec4e5ffc4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index d5f4fd9c6546e..cbab94f1153dc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index d5f4fd9c6546e..cbab94f1153dc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json index 2acbea1cc8dcc..79c4217ab5184 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json index 2acbea1cc8dcc..79c4217ab5184 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 6603e36c2811a..bb4c36687354a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 6603e36c2811a..bb4c36687354a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index 69a577baffdf8..dafceda24d0d1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index 69a577baffdf8..dafceda24d0d1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json index f28c784480f22..910f5cd7e8ff0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json index f28c784480f22..910f5cd7e8ff0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 77fa77f5fb05d..29a92a51eec08 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 77fa77f5fb05d..29a92a51eec08 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index a4a6698d3ca97..7d87bfe98f2cb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index a4a6698d3ca97..7d87bfe98f2cb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json index 8a3035f363273..6ffc10b044810 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json index 8a3035f363273..6ffc10b044810 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 9f10fc5e7e05a..28b99749a6e7e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 9f10fc5e7e05a..28b99749a6e7e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 71896f202b298..9a897de73348f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 71896f202b298..9a897de73348f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json index e7dfb0beff37c..b785e8311f369 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json index e7dfb0beff37c..b785e8311f369 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index bfb740034016f..83a4cf9e563ea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index bfb740034016f..83a4cf9e563ea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json index 1f2e577b0b3a1..f9f31a969c46e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json index 1f2e577b0b3a1..f9f31a969c46e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json index 4d33e85e2ba8d..a4fc65ac644a4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json index 4d33e85e2ba8d..a4fc65ac644a4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index bf86309b59a89..23096eb32674f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index bf86309b59a89..23096eb32674f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json index 4b371bf592416..e60785d9b5753 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json index 4b371bf592416..e60785d9b5753 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json index 06a55d4a7cce7..c7799ba328c60 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json index 06a55d4a7cce7..c7799ba328c60 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json index d87b6b22829be..c9eabb1402488 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json index d87b6b22829be..c9eabb1402488 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json index c80db3f739c73..39e0e9577bbb1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json index c80db3f739c73..39e0e9577bbb1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json index ff189067e6755..28fbd41bab9ff 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json index ff189067e6755..28fbd41bab9ff 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 8896f911a9998..d6c94f991650b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 8896f911a9998..d6c94f991650b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json index ddcfbd2ff9cc1..bc02869d35bee 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json index ddcfbd2ff9cc1..bc02869d35bee 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "../src", "declaration": true, "baselineCheck": true, + "sourceRoot": "../src", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json index ef5cb2df6335d..e949da7fdbf1d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json index ef5cb2df6335d..e949da7fdbf1d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index a46fe8457105a..892bc6673b9d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index a46fe8457105a..892bc6673b9d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 50a4518a1b08c..e19fbed25d901 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 50a4518a1b08c..e19fbed25d901 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index b6ef6b5bd517d..7808e3d9b28e9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index b6ef6b5bd517d..7808e3d9b28e9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -7,9 +7,9 @@ "out": "bin/outAndOutDirFile.js", "outDir": "outdir/outAndOutDirFolder", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json index c2594c0093cb8..f33a095e60eea 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json index c2594c0093cb8..f33a095e60eea 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index d2c6956bf8021..1a429c986d8ef 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index d2c6956bf8021..1a429c986d8ef 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index cc2a6c9b1aa06..dd54871f5637b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index cc2a6c9b1aa06..dd54871f5637b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json index 4a7cc668a6a86..0c8a05da3b10e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json index 4a7cc668a6a86..0c8a05da3b10e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 6766f67eab06d..efb3da725dcbc 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 6766f67eab06d..efb3da725dcbc 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 5419c5a822564..ecfa616be4c46 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 5419c5a822564..ecfa616be4c46 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json index d7f99610babea..46f3e8aad7da0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json index d7f99610babea..46f3e8aad7da0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 1e722cb852eb9..bfd34fb2ec0d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 1e722cb852eb9..bfd34fb2ec0d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index d80dacb3444d7..fedae84631765 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index d80dacb3444d7..fedae84631765 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json index a68d507bdf3e0..b2e2f7f7b9bd5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json index a68d507bdf3e0..b2e2f7f7b9bd5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 1641625569c29..0730753a4718b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 1641625569c29..0730753a4718b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json index 085ef5e8f1971..d1d60d81434f5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json index 085ef5e8f1971..d1d60d81434f5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json index 9df1fd3922ee8..46d15a907a47f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json index 9df1fd3922ee8..46d15a907a47f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json index 1a472ca17eedb..53336eb9a6f30 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json index 1a472ca17eedb..53336eb9a6f30 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json index 98a2dea24849d..a5cf9d7d10e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json index 98a2dea24849d..a5cf9d7d10e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json index dbef889efec2c..edb9f68ed0092 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json index dbef889efec2c..edb9f68ed0092 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json index afc78006729ea..0091f70060375 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json index afc78006729ea..0091f70060375 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json index 53e86654ad1d8..259d1eb920a76 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json index 53e86654ad1d8..259d1eb920a76 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "test.ts" diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json index 77912e79790f3..ac0c223a65fe1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json index 77912e79790f3..ac0c223a65fe1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json @@ -5,9 +5,9 @@ "test.ts" ], "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 362af3ded0523..40a5e623164ec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 362af3ded0523..40a5e623164ec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -6,9 +6,9 @@ ], "outDir": "outdir/simple", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json index 7c4bb20e942a6..b779b692d7780 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json index 7c4bb20e942a6..b779b692d7780 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json @@ -6,9 +6,9 @@ ], "out": "bin/test.js", "sourceMap": true, - "sourceRoot": "http://typescript.codeplex.com/", "declaration": true, "baselineCheck": true, + "sourceRoot": "http://typescript.codeplex.com/", "resolvedInputFiles": [ "lib.d.ts", "ref/m1.ts", From 8da3bd2ffd3ee662afd8f0bb9af441cd8ec6e741 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 15 Sep 2015 15:53:44 -0700 Subject: [PATCH 014/353] Project testcase to run tsconfig file --- src/compiler/program.ts | 4 +- src/compiler/tsc.ts | 2 +- src/harness/harness.ts | 10 +- src/harness/projectsRunner.ts | 141 ++++++++++++------ .../noProjectOptionAndInputFiles/amd/a.d.ts | 1 + .../noProjectOptionAndInputFiles/amd/a.js | 1 + .../amd/noProjectOptionAndInputFiles.json | 14 ++ .../noProjectOptionAndInputFiles/node/a.d.ts | 1 + .../noProjectOptionAndInputFiles/node/a.js | 1 + .../node/noProjectOptionAndInputFiles.json | 14 ++ .../project/projectOptionTest/amd/Test/a.d.ts | 1 + .../project/projectOptionTest/amd/Test/a.js | 1 + .../amd/projectOptionTest.json | 15 ++ .../projectOptionTest/node/Test/a.d.ts | 1 + .../project/projectOptionTest/node/Test/a.js | 1 + .../node/projectOptionTest.json | 15 ++ .../project/noProjectOptionAndInputFiles.json | 6 + tests/cases/project/projectOptionTest.json | 7 + tests/cases/projects/projectOption/Test/a.ts | 1 + tests/cases/projects/projectOption/Test/b.ts | 1 + .../projects/projectOption/Test/tsconfig.json | 1 + 21 files changed, 189 insertions(+), 50 deletions(-) create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.d.ts create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.js create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.json create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.d.ts create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.js create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.json create mode 100644 tests/baselines/reference/project/projectOptionTest/amd/Test/a.d.ts create mode 100644 tests/baselines/reference/project/projectOptionTest/amd/Test/a.js create mode 100644 tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.json create mode 100644 tests/baselines/reference/project/projectOptionTest/node/Test/a.d.ts create mode 100644 tests/baselines/reference/project/projectOptionTest/node/Test/a.js create mode 100644 tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.json create mode 100644 tests/cases/project/noProjectOptionAndInputFiles.json create mode 100644 tests/cases/project/projectOptionTest.json create mode 100644 tests/cases/projects/projectOption/Test/a.ts create mode 100644 tests/cases/projects/projectOption/Test/b.ts create mode 100644 tests/cases/projects/projectOption/Test/tsconfig.json diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 5124dccee04e8..3c1d3a97d168d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -14,10 +14,10 @@ namespace ts { export const version = "1.6.0"; - export function findConfigFile(searchPath: string): string { + export function findConfigFile(searchPath: string, moduleResolutionHost: ModuleResolutionHost): string { let fileName = "tsconfig.json"; while (true) { - if (sys.fileExists(fileName)) { + if (moduleResolutionHost.fileExists(fileName)) { return fileName; } let parentPath = getDirectoryPath(searchPath); diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 96759b6825012..805275776ad0a 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -188,7 +188,7 @@ namespace ts { } else if (commandLine.fileNames.length === 0 && isJSONSupported()) { let searchPath = normalizePath(sys.getCurrentDirectory()); - configFileName = findConfigFile(searchPath); + configFileName = findConfigFile(searchPath, sys); } if (commandLine.fileNames.length === 0 && !configFileName) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index be924fe6ae91d..9eb1cd45f53b1 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -430,6 +430,7 @@ module Harness { args(): string[]; getExecutingFilePath(): string; exit(exitCode?: number): void; + readDirectory(path: string, extension?: string, exclude?: string[]): string[]; } export var IO: IO; @@ -466,7 +467,8 @@ module Harness { export const directoryExists: typeof IO.directoryExists = fso.FolderExists; export const fileExists: typeof IO.fileExists = fso.FileExists; export const log: typeof IO.log = global.WScript && global.WScript.StdOut.WriteLine; - + export const readDirectory: typeof IO.readDirectory = (path, extension, exclude) => ts.sys.readDirectory(path, extension, exclude); + export function createDirectory(path: string) { if (directoryExists(path)) { fso.CreateFolder(path); @@ -534,6 +536,8 @@ module Harness { export const fileExists: typeof IO.fileExists = fs.existsSync; export const log: typeof IO.log = s => console.log(s); + export const readDirectory: typeof IO.readDirectory = (path, extension, exclude) => ts.sys.readDirectory(path, extension, exclude); + export function createDirectory(path: string) { if (!directoryExists(path)) { fs.mkdirSync(path); @@ -732,6 +736,10 @@ module Harness { export function writeFile(path: string, contents: string) { Http.writeToServerSync(serverRoot + path, "WRITE", contents); } + + export function readDirectory(path: string, extension?: string, exclude?: string[]) { + return listFiles(path).filter(f => !extension || ts.fileExtensionIs(f, extension)); + } } } diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 12e3222a54177..8b30a8be37b34 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -25,14 +25,14 @@ interface BatchCompileProjectTestCaseEmittedFile extends Harness.Compiler.Genera interface CompileProjectFilesResult { moduleKind: ts.ModuleKind; - program: ts.Program; + program?: ts.Program; + compilerOptions?: ts.CompilerOptions, errors: ts.Diagnostic[]; - sourceMapData: ts.SourceMapData[]; + sourceMapData?: ts.SourceMapData[]; } interface BatchCompileProjectTestCaseResult extends CompileProjectFilesResult { - outputFiles: BatchCompileProjectTestCaseEmittedFile[]; - nonSubfolderDiskFiles: number; + outputFiles?: BatchCompileProjectTestCaseEmittedFile[]; } class ProjectRunner extends RunnerBase { @@ -119,9 +119,10 @@ class ProjectRunner extends RunnerBase { function compileProjectFiles(moduleKind: ts.ModuleKind, getInputFiles: () => string[], getSourceFileText: (fileName: string) => string, - writeFile: (fileName: string, data: string, writeByteOrderMark: boolean) => void): CompileProjectFilesResult { + writeFile: (fileName: string, data: string, writeByteOrderMark: boolean) => void, + compilerOptions: ts.CompilerOptions): CompileProjectFilesResult { - let program = ts.createProgram(getInputFiles(), createCompilerOptions(), createCompilerHost()); + let program = ts.createProgram(getInputFiles(), compilerOptions, createCompilerHost()); let errors = ts.getPreEmitDiagnostics(program); let emitResult = program.emit(); @@ -146,38 +147,6 @@ class ProjectRunner extends RunnerBase { sourceMapData }; - function createCompilerOptions(): ts.CompilerOptions { - // Set the special options that depend on other testcase options - let compilerOptions: ts.CompilerOptions = { - mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? Harness.IO.resolvePath(testCase.mapRoot) : testCase.mapRoot, - sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? Harness.IO.resolvePath(testCase.sourceRoot) : testCase.sourceRoot, - module: moduleKind, - moduleResolution: ts.ModuleResolutionKind.Classic, // currently all tests use classic module resolution kind, this will change in the future - }; - - // Set the values specified using json - let optionNameMap: ts.Map = {}; - ts.forEach(ts.optionDeclarations, option => { - optionNameMap[option.name] = option; - }); - for (let name in testCase) { - if (name !== "mapRoot" && name !== "sourceRoot" && ts.hasProperty(optionNameMap, name)) { - let option = optionNameMap[name]; - let optType = option.type; - let value = testCase[name]; - if (typeof optType !== "string") { - let key = value.toLowerCase(); - if (ts.hasProperty(optType, key)) { - value = optType[key]; - } - } - compilerOptions[option.name] = value; - } - } - - return compilerOptions; - } - function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile { let sourceFile: ts.SourceFile = undefined; if (fileName === Harness.Compiler.defaultLibFileName) { @@ -212,23 +181,99 @@ class ProjectRunner extends RunnerBase { let nonSubfolderDiskFiles = 0; let outputFiles: BatchCompileProjectTestCaseEmittedFile[] = []; + let compilerOptions = createCompilerOptions(); + let inputFiles = testCase.inputFiles; + let configFileName: string; + if (compilerOptions.project) { + // Parse project + configFileName = ts.normalizePath(ts.combinePaths(compilerOptions.project, "tsconfig.json")); + assert(!inputFiles || inputFiles.length === 0, "cannot specify input files and project option together"); + } + else if (!inputFiles || inputFiles.length === 0) { + configFileName = ts.findConfigFile("", { fileExists, readFile: getSourceFileText }); + } + + if (configFileName) { + let result = ts.readConfigFile(configFileName, getSourceFileText); + if (result.error) { + return { + moduleKind, + errors: [result.error] + }; + } - let projectCompilerResult = compileProjectFiles(moduleKind, () => testCase.inputFiles, getSourceFileText, writeFile); + let configObject = result.config; + let configParseResult = ts.parseConfigFile(configObject, { fileExists, readFile: getSourceFileText, readDirectory }, ts.getDirectoryPath(configFileName)); + if (configParseResult.errors.length > 0) { + return { + moduleKind, + errors: configParseResult.errors + }; + } + inputFiles = configParseResult.fileNames; + compilerOptions = ts.extend(compilerOptions, configParseResult.options); + } + + let projectCompilerResult = compileProjectFiles(moduleKind, () => inputFiles, getSourceFileText, writeFile, compilerOptions); return { moduleKind, program: projectCompilerResult.program, + compilerOptions, sourceMapData: projectCompilerResult.sourceMapData, outputFiles, errors: projectCompilerResult.errors, - nonSubfolderDiskFiles, }; + function createCompilerOptions(): ts.CompilerOptions { + // Set the special options that depend on other testcase options + let compilerOptions: ts.CompilerOptions = { + mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? Harness.IO.resolvePath(testCase.mapRoot) : testCase.mapRoot, + sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? Harness.IO.resolvePath(testCase.sourceRoot) : testCase.sourceRoot, + module: moduleKind, + moduleResolution: ts.ModuleResolutionKind.Classic, // currently all tests use classic module resolution kind, this will change in the future + }; + + // Set the values specified using json + let optionNameMap: ts.Map = {}; + ts.forEach(ts.optionDeclarations, option => { + optionNameMap[option.name] = option; + }); + for (let name in testCase) { + if (name !== "mapRoot" && name !== "sourceRoot" && ts.hasProperty(optionNameMap, name)) { + let option = optionNameMap[name]; + let optType = option.type; + let value = testCase[name]; + if (typeof optType !== "string") { + let key = value.toLowerCase(); + if (ts.hasProperty(optType, key)) { + value = optType[key]; + } + } + compilerOptions[option.name] = value; + } + } + + return compilerOptions; + } + + function getFileNameInTheProjectTest(fileName: string): string { + return ts.isRootedDiskPath(fileName) + ? fileName + : ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(fileName); + } + + function readDirectory(rootDir: string, extension: string, exclude: string[]): string[] { + return Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude); + } + + function fileExists(fileName: string): boolean { + return Harness.IO.fileExists(getFileNameInTheProjectTest(fileName)); + } + function getSourceFileText(fileName: string): string { let text: string = undefined; try { - text = Harness.IO.readFile(ts.isRootedDiskPath(fileName) - ? fileName - : ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(fileName)); + text = Harness.IO.readFile(getFileNameInTheProjectTest(fileName)); } catch (e) { // text doesn't get defined. @@ -288,6 +333,9 @@ class ProjectRunner extends RunnerBase { function compileCompileDTsFiles(compilerResult: BatchCompileProjectTestCaseResult) { let allInputFiles: { emittedFileName: string; code: string; }[] = []; + if (!compilerResult.program) { + return; + } let compilerOptions = compilerResult.program.getCompilerOptions(); ts.forEach(compilerResult.program.getSourceFiles(), sourceFile => { @@ -317,7 +365,8 @@ class ProjectRunner extends RunnerBase { } }); - return compileProjectFiles(compilerResult.moduleKind, getInputFiles, getSourceFileText, writeFile); + // Dont allow config files since we are compiling existing source options + return compileProjectFiles(compilerResult.moduleKind, getInputFiles, getSourceFileText, writeFile, compilerResult.compilerOptions); function findOutpuDtsFile(fileName: string) { return ts.forEach(compilerResult.outputFiles, outputFile => outputFile.emittedFileName === fileName ? outputFile : undefined); @@ -352,7 +401,7 @@ class ProjectRunner extends RunnerBase { function getCompilerResolutionInfo() { let resolutionInfo: ProjectRunnerTestCaseResolutionInfo & ts.CompilerOptions = JSON.parse(JSON.stringify(testCase)); - resolutionInfo.resolvedInputFiles = ts.map(compilerResult.program.getSourceFiles(), inputFile => inputFile.fileName); + resolutionInfo.resolvedInputFiles = ts.map(compilerResult.program ? compilerResult.program.getSourceFiles() : undefined, inputFile => inputFile.fileName); resolutionInfo.emittedFiles = ts.map(compilerResult.outputFiles, outputFile => outputFile.emittedFileName); return resolutionInfo; } @@ -409,7 +458,7 @@ class ProjectRunner extends RunnerBase { it("Errors in generated Dts files for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => { if (!compilerResult.errors.length && testCase.declaration) { let dTsCompileResult = compileCompileDTsFiles(compilerResult); - if (dTsCompileResult.errors.length) { + if (dTsCompileResult && dTsCompileResult.errors.length) { Harness.Baseline.runBaseline("Errors in generated Dts files for (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + ".dts.errors.txt", () => { return getErrorsBaseline(dTsCompileResult); }); diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.d.ts b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.js b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.json b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.json new file mode 100644 index 0000000000000..32b8c5a28f727 --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.json @@ -0,0 +1,14 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption/Test", + "baselineCheck": true, + "declaration": true, + "resolvedInputFiles": [ + "lib.d.ts", + "a.ts" + ], + "emittedFiles": [ + "a.js", + "a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.d.ts b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.js b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.json b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.json new file mode 100644 index 0000000000000..32b8c5a28f727 --- /dev/null +++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.json @@ -0,0 +1,14 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption/Test", + "baselineCheck": true, + "declaration": true, + "resolvedInputFiles": [ + "lib.d.ts", + "a.ts" + ], + "emittedFiles": [ + "a.js", + "a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/projectOptionTest/amd/Test/a.d.ts b/tests/baselines/reference/project/projectOptionTest/amd/Test/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/amd/Test/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/projectOptionTest/amd/Test/a.js b/tests/baselines/reference/project/projectOptionTest/amd/Test/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/amd/Test/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.json b/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.json new file mode 100644 index 0000000000000..e2be92cb38a3a --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption", + "baselineCheck": true, + "declaration": true, + "project": "Test", + "resolvedInputFiles": [ + "lib.d.ts", + "Test/a.ts" + ], + "emittedFiles": [ + "Test/a.js", + "Test/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/projectOptionTest/node/Test/a.d.ts b/tests/baselines/reference/project/projectOptionTest/node/Test/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/node/Test/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/projectOptionTest/node/Test/a.js b/tests/baselines/reference/project/projectOptionTest/node/Test/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/node/Test/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.json b/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.json new file mode 100644 index 0000000000000..e2be92cb38a3a --- /dev/null +++ b/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption", + "baselineCheck": true, + "declaration": true, + "project": "Test", + "resolvedInputFiles": [ + "lib.d.ts", + "Test/a.ts" + ], + "emittedFiles": [ + "Test/a.js", + "Test/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/project/noProjectOptionAndInputFiles.json b/tests/cases/project/noProjectOptionAndInputFiles.json new file mode 100644 index 0000000000000..b391da41dc308 --- /dev/null +++ b/tests/cases/project/noProjectOptionAndInputFiles.json @@ -0,0 +1,6 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption/Test", + "baselineCheck": true, + "declaration": true +} \ No newline at end of file diff --git a/tests/cases/project/projectOptionTest.json b/tests/cases/project/projectOptionTest.json new file mode 100644 index 0000000000000..70ae0435eee6b --- /dev/null +++ b/tests/cases/project/projectOptionTest.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify project option", + "projectRoot": "tests/cases/projects/projectOption", + "baselineCheck": true, + "declaration": true, + "project": "Test" +} \ No newline at end of file diff --git a/tests/cases/projects/projectOption/Test/a.ts b/tests/cases/projects/projectOption/Test/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/projectOption/Test/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/projectOption/Test/b.ts b/tests/cases/projects/projectOption/Test/b.ts new file mode 100644 index 0000000000000..a6bd8e8d430e9 --- /dev/null +++ b/tests/cases/projects/projectOption/Test/b.ts @@ -0,0 +1 @@ +var test = 10; // Shouldnt get compiled so shouldnt error \ No newline at end of file diff --git a/tests/cases/projects/projectOption/Test/tsconfig.json b/tests/cases/projects/projectOption/Test/tsconfig.json new file mode 100644 index 0000000000000..1c0fb803356f6 --- /dev/null +++ b/tests/cases/projects/projectOption/Test/tsconfig.json @@ -0,0 +1 @@ +{ "files": [ "a.ts" ] } \ No newline at end of file From 8aeff929a1b50ad01b23453c0cfa88874f89fdae Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 11:21:13 -0700 Subject: [PATCH 015/353] Add tests when same named .ts and .js file exist with tsconfig file specifying .ts file --- .gitignore | 10 ---------- .../amd/SameNameTsSpecified/a.d.ts | 1 + .../amd/SameNameTsSpecified/a.js | 1 + .../jsFileCompilationSameNameFilesSpecified.json | 15 +++++++++++++++ .../node/SameNameTsSpecified/a.d.ts | 1 + .../node/SameNameTsSpecified/a.js | 1 + .../jsFileCompilationSameNameFilesSpecified.json | 15 +++++++++++++++ .../jsFileCompilationSameNameFilesSpecified.json | 7 +++++++ .../jsFileCompilation/SameNameTsSpecified/a.js | 1 + .../jsFileCompilation/SameNameTsSpecified/a.ts | 1 + .../SameNameTsSpecified/tsconfig.json | 1 + 11 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.json create mode 100644 tests/cases/project/jsFileCompilationSameNameFilesSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecified/tsconfig.json diff --git a/.gitignore b/.gitignore index 58a4554593978..1bdbe07800164 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,5 @@ node_modules/ built/* -tests/cases/*.js -tests/cases/*/*.js -tests/cases/*/*/*.js -tests/cases/*/*/*/*.js -tests/cases/*/*/*/*/*.js -tests/cases/*.js.map -tests/cases/*/*.js.map -tests/cases/*/*/*.js.map -tests/cases/*/*/*/*.js.map -tests/cases/*/*/*/*/*.js.map tests/cases/rwc/* tests/cases/test262/* tests/cases/perf/* diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/SameNameTsSpecified/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.json new file mode 100644 index 0000000000000..ddf148ea982ac --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameTsSpecified/a.ts" + ], + "emittedFiles": [ + "SameNameTsSpecified/a.js", + "SameNameTsSpecified/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/SameNameTsSpecified/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.json new file mode 100644 index 0000000000000..ddf148ea982ac --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameTsSpecified/a.ts" + ], + "emittedFiles": [ + "SameNameTsSpecified/a.js", + "SameNameTsSpecified/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesSpecified.json b/tests/cases/project/jsFileCompilationSameNameFilesSpecified.json new file mode 100644 index 0000000000000..656c973a98116 --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameFilesSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.ts b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/tsconfig.json new file mode 100644 index 0000000000000..1c0fb803356f6 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecified/tsconfig.json @@ -0,0 +1 @@ +{ "files": [ "a.ts" ] } \ No newline at end of file From 9daf635e5e612d7b7e2d110e258e0336e23978d9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 11:50:12 -0700 Subject: [PATCH 016/353] Verify and fix scenario when .js and .ts files with same name are present and tsconfig doesnt specify any filenames --- src/compiler/commandLineParser.ts | 2 +- src/harness/projectsRunner.ts | 8 +++++++- .../amd/SameNameFilesNotSpecified/a.d.ts | 1 + .../amd/SameNameFilesNotSpecified/a.js | 1 + ...sFileCompilationSameNameFilesNotSpecified.json | 15 +++++++++++++++ .../node/SameNameFilesNotSpecified/a.d.ts | 1 + .../node/SameNameFilesNotSpecified/a.js | 1 + ...sFileCompilationSameNameFilesNotSpecified.json | 15 +++++++++++++++ ...sFileCompilationSameNameFilesNotSpecified.json | 7 +++++++ .../SameNameFilesNotSpecified/a.js | 1 + .../SameNameFilesNotSpecified/a.ts | 1 + .../SameNameFilesNotSpecified/tsconfig.json | 0 12 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json create mode 100644 tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/tsconfig.json diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 7b776f8c6e15e..9283f8d939deb 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -474,7 +474,7 @@ namespace ts { } else { let exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; - let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); + let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)).concat(host.readDirectory(basePath, ".js", exclude)); for (let i = 0; i < sysFiles.length; i++) { let name = sysFiles[i]; if (fileExtensionIs(name, ".js")) { diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 8b30a8be37b34..32e61cb8d7b71 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -263,7 +263,13 @@ class ProjectRunner extends RunnerBase { } function readDirectory(rootDir: string, extension: string, exclude: string[]): string[] { - return Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude); + let harnessReadDirectoryResult = Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude); + let result: string[] = []; + for (let i = 0; i < harnessReadDirectoryResult.length; i++) { + result[i] = ts.getRelativePathToDirectoryOrUrl(testCase.projectRoot, harnessReadDirectoryResult[i], + getCurrentDirectory(), Harness.Compiler.getCanonicalFileName, /*isAbsolutePathAnUrl*/ false); + } + return result; } function fileExists(fileName: string): boolean { diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json new file mode 100644 index 0000000000000..2b4d6b2b35aa8 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecified/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecified/a.js", + "SameNameFilesNotSpecified/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json new file mode 100644 index 0000000000000..2b4d6b2b35aa8 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecified/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecified/a.js", + "SameNameFilesNotSpecified/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json new file mode 100644 index 0000000000000..75582ff44024d --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/tsconfig.json new file mode 100644 index 0000000000000..e69de29bb2d1d From 70d3de466880b5ebc7664c9a95ce12e24712cf14 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 12:38:11 -0700 Subject: [PATCH 017/353] When same named .d.ts and .js files are present and tscconfig contains .d.ts file --- .../amd/jsFileCompilationSameNameDTsSpecified.json | 12 ++++++++++++ .../node/jsFileCompilationSameNameDTsSpecified.json | 12 ++++++++++++ .../jsFileCompilationSameNameDTsSpecified.json | 7 +++++++ .../jsFileCompilation/SameNameDTsSpecified/a.d.ts | 1 + .../jsFileCompilation/SameNameDTsSpecified/a.js | 1 + .../SameNameDTsSpecified/tsconfig.json | 1 + 6 files changed, 34 insertions(+) create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json create mode 100644 tests/cases/project/jsFileCompilationSameNameDTsSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.d.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/tsconfig.json diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json new file mode 100644 index 0000000000000..e0f30e0ed4f94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsSpecified/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json new file mode 100644 index 0000000000000..e0f30e0ed4f94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsSpecified/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json b/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json new file mode 100644 index 0000000000000..9d0ec1282785b --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.d.ts new file mode 100644 index 0000000000000..d9e24d329b733 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.d.ts @@ -0,0 +1 @@ +declare var test: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/tsconfig.json new file mode 100644 index 0000000000000..e50280fa0d3a2 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecified/tsconfig.json @@ -0,0 +1 @@ +{ "files": [ "a.d.ts" ] } \ No newline at end of file From 0f73c1618c6da31a7d451c05f3d2c97b1fd1c93d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 12:41:44 -0700 Subject: [PATCH 018/353] When folder contains .d.ts as well as .js of same name and tsconfig doesnt contain any name --- .../jsFileCompilationSameNameDtsNotSpecified.json | 12 ++++++++++++ .../jsFileCompilationSameNameDtsNotSpecified.json | 12 ++++++++++++ .../jsFileCompilationSameNameDtsNotSpecified.json | 7 +++++++ .../jsFileCompilation/SameNameDtsNotSpecified/a.d.ts | 1 + .../jsFileCompilation/SameNameDtsNotSpecified/a.js | 1 + .../SameNameDtsNotSpecified/tsconfig.json | 0 6 files changed, 33 insertions(+) create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json create mode 100644 tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json new file mode 100644 index 0000000000000..4d345f51353d8 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecified/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json new file mode 100644 index 0000000000000..4d345f51353d8 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecified/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json new file mode 100644 index 0000000000000..cc11c7d2625d2 --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts new file mode 100644 index 0000000000000..16cb2db6fd7cc --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts @@ -0,0 +1 @@ +declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json new file mode 100644 index 0000000000000..e69de29bb2d1d From dbb2772ed8af81e0356a8da91f0bcf10a2fc92bc Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 12:47:45 -0700 Subject: [PATCH 019/353] Tests when the .ts and .js files are mixed in compilation with tscconfig file specifying them --- ...jsFileCompilationDifferentNamesSpecified.json | 16 ++++++++++++++++ .../amd/test.d.ts | 2 ++ .../amd/test.js | 2 ++ ...jsFileCompilationDifferentNamesSpecified.json | 16 ++++++++++++++++ .../node/test.d.ts | 2 ++ .../node/test.js | 2 ++ ...jsFileCompilationDifferentNamesSpecified.json | 7 +++++++ .../DifferentNamesSpecified/a.ts | 1 + .../DifferentNamesSpecified/b.js | 1 + .../DifferentNamesSpecified/tsconfig.json | 4 ++++ 10 files changed, 53 insertions(+) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js create mode 100644 tests/cases/project/jsFileCompilationDifferentNamesSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json new file mode 100644 index 0000000000000..0ba5af91d2183 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesSpecified/a.ts", + "DifferentNamesSpecified/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts new file mode 100644 index 0000000000000..bbae04a30bf94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts @@ -0,0 +1,2 @@ +declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js new file mode 100644 index 0000000000000..f2115703462fc --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js @@ -0,0 +1,2 @@ +var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json new file mode 100644 index 0000000000000..0ba5af91d2183 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesSpecified/a.ts", + "DifferentNamesSpecified/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts new file mode 100644 index 0000000000000..bbae04a30bf94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts @@ -0,0 +1,2 @@ +declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js new file mode 100644 index 0000000000000..f2115703462fc --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js @@ -0,0 +1,2 @@ +var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json new file mode 100644 index 0000000000000..d23706bab94ad --- /dev/null +++ b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js new file mode 100644 index 0000000000000..9fdf6253b8006 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/b.js @@ -0,0 +1 @@ +var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json new file mode 100644 index 0000000000000..582826bdceb79 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": { "out": "test.js" }, + "files": [ "a.ts", "b.js" ] +} \ No newline at end of file From 14b608241dad8212b374e7529876a6d29dba35e8 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 12:52:33 -0700 Subject: [PATCH 020/353] Tests when the .ts and .js files are mixed in compilation with tscconfig file doesnt specifying any names --- ...ileCompilationDifferentNamesNotSpecified.json | 16 ++++++++++++++++ .../amd/test.d.ts | 2 ++ .../amd/test.js | 2 ++ ...ileCompilationDifferentNamesNotSpecified.json | 16 ++++++++++++++++ .../node/test.d.ts | 2 ++ .../node/test.js | 2 ++ ...ileCompilationDifferentNamesNotSpecified.json | 7 +++++++ .../DifferentNamesNotSpecified/a.ts | 1 + .../DifferentNamesNotSpecified/b.js | 1 + .../DifferentNamesNotSpecified/tsconfig.json | 3 +++ 10 files changed, 52 insertions(+) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js create mode 100644 tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json new file mode 100644 index 0000000000000..7a7e0b2c453b5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesNotSpecified/a.ts", + "DifferentNamesNotSpecified/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts new file mode 100644 index 0000000000000..bbae04a30bf94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts @@ -0,0 +1,2 @@ +declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js new file mode 100644 index 0000000000000..f2115703462fc --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js @@ -0,0 +1,2 @@ +var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json new file mode 100644 index 0000000000000..7a7e0b2c453b5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecified", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesNotSpecified/a.ts", + "DifferentNamesNotSpecified/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts new file mode 100644 index 0000000000000..bbae04a30bf94 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts @@ -0,0 +1,2 @@ +declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js new file mode 100644 index 0000000000000..f2115703462fc --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js @@ -0,0 +1,2 @@ +var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json new file mode 100644 index 0000000000000..43fe621e0657b --- /dev/null +++ b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecified" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js new file mode 100644 index 0000000000000..9fdf6253b8006 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js @@ -0,0 +1 @@ +var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json new file mode 100644 index 0000000000000..1b726957fddd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json @@ -0,0 +1,3 @@ +{ + "compilerOptions": { "out": "test.js" } +} \ No newline at end of file From 2860435a2eb31e4a90fd86a2e04b8f900621aac6 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 13:18:29 -0700 Subject: [PATCH 021/353] Do not emit javascript files --- src/compiler/declarationEmitter.ts | 2 +- src/compiler/emitter.ts | 6 ++++-- src/compiler/utilities.ts | 2 +- .../getEmitOutputWithDeclarationFile3.baseline | 1 - ...CompilationAmbientVarDeclarationSyntax.errors.txt | 2 -- .../jsFileCompilationDecoratorSyntax.errors.txt | 2 -- .../reference/jsFileCompilationEmitDeclarations.js | 3 --- .../jsFileCompilationEmitTrippleSlashReference.js | 7 ------- .../reference/jsFileCompilationEnumSyntax.errors.txt | 2 -- ...sFileCompilationExportAssignmentSyntax.errors.txt | 2 -- ...CompilationHeritageClauseSyntaxOfClass.errors.txt | 2 -- .../jsFileCompilationImportEqualsSyntax.errors.txt | 2 -- .../jsFileCompilationInterfaceSyntax.errors.txt | 2 -- .../jsFileCompilationModuleSyntax.errors.txt | 2 -- .../jsFileCompilationOptionalParameter.errors.txt | 2 -- ...jsFileCompilationPropertySyntaxOfClass.errors.txt | 2 -- ...leCompilationPublicMethodSyntaxOfClass.errors.txt | 2 -- ...FileCompilationPublicParameterModifier.errors.txt | 2 -- .../reference/jsFileCompilationRestParameter.js | 1 - ...eCompilationReturnTypeSyntaxOfFunction.errors.txt | 2 -- .../jsFileCompilationSyntaxError.errors.txt | 2 -- .../jsFileCompilationTypeAliasSyntax.errors.txt | 2 -- ...ileCompilationTypeArgumentSyntaxOfCall.errors.txt | 2 -- .../jsFileCompilationTypeAssertions.errors.txt | 2 -- .../jsFileCompilationTypeOfParameter.errors.txt | 2 -- ...eCompilationTypeParameterSyntaxOfClass.errors.txt | 2 -- ...mpilationTypeParameterSyntaxOfFunction.errors.txt | 2 -- .../jsFileCompilationTypeSyntaxOfVar.errors.txt | 2 -- .../baselines/reference/jsFileCompilationWithOut.js | 2 -- .../reference/jsFileCompilationWithoutOut.errors.txt | 12 ------------ .../reference/jsFileCompilationWithoutOut.symbols | 10 ++++++++++ .../reference/jsFileCompilationWithoutOut.types | 10 ++++++++++ .../amd/test.d.ts | 1 - .../amd/test.js | 1 - .../node/test.d.ts | 1 - .../node/test.js | 1 - .../amd/test.d.ts | 1 - .../amd/test.js | 1 - .../node/test.d.ts | 1 - .../node/test.js | 1 - 40 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.symbols create mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.types diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index e5914d1006093..03d2e0453b14c 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -104,7 +104,7 @@ namespace ts { // Emit references corresponding to this file let emittedReferencedFiles: SourceFile[] = []; forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { + if (!isExternalModuleOrDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { // Check what references need to be added if (!compilerOptions.noResolve) { forEach(sourceFile.referencedFiles, fileReference => { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 56e996662c87a..bb9cb0a44e515 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -88,7 +88,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); emitFile(jsFilePath, targetSourceFile); } - else if (!isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { + else if (!isDeclarationFile(targetSourceFile) && + !isJavaScript(targetSourceFile.fileName) && + (compilerOptions.outFile || compilerOptions.out)) { emitFile(compilerOptions.outFile || compilerOptions.out); } } @@ -199,7 +201,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else { forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { + if (!isJavaScript(sourceFile.fileName) && !isExternalModuleOrDeclarationFile(sourceFile)) { emitSourceFile(sourceFile); } }); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cae0923094c8c..696d2f481e053 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1778,7 +1778,7 @@ namespace ts { } export function shouldEmitToOwnFile(sourceFile: SourceFile, compilerOptions: CompilerOptions): boolean { - if (!isDeclarationFile(sourceFile)) { + if (!isDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) { // 1. in-browser single file compilation scenario // 2. non supported extension file diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline index e99a102307073..1ce3d9f33c3b1 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline @@ -2,5 +2,4 @@ EmitSkipped: false FileName : declSingle.js var x = "hello"; var x1 = 1000; -var x2 = 1000; diff --git a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt index d3175d9f116a0..a210385d996be 100644 --- a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== declare var v; ~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt index 80fb4ded96d0e..6017ddc7a1120 100644 --- a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== @internal class C { } ~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js index c6711e4e85f42..4c9f6802fd94f 100644 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js @@ -15,11 +15,8 @@ var c = (function () { } return c; })(); -function foo() { -} //// [out.d.ts] declare class c { } -declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js index 04f36213b1bde..33077f3038f3e 100644 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js @@ -19,15 +19,8 @@ var c = (function () { } return c; })(); -function bar() { -} -/// -function foo() { -} //// [out.d.ts] declare class c { } -declare function bar(): void; -declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt index bc0bb189c95d4..6b9d97e55bb32 100644 --- a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== enum E { } ~ diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt index f64628d3bc9a6..a349e2bca13c8 100644 --- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== export = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt index cf030d3c4f2af..df014047b35f6 100644 --- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C implements D { } ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt index 54314ef431e95..e53bf2ac8608c 100644 --- a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== import a = b; ~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt index 07fc015fc7239..c46c3c05b3fbe 100644 --- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== interface I { } ~ diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt index e63eede29bdb9..8748064cc9608 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== module M { } ~ diff --git a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt index 1eefd3b8eaec7..68b131d39f92d 100644 --- a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(p?) { } ~ diff --git a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt index 613dc7a51a365..0ecf6f3c666c7 100644 --- a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,11): error TS8014: 'property declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { v } ~ diff --git a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt index 8585285c1ed6c..907775c7be65e 100644 --- a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { public foo() { diff --git a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt index aac386f2dd11a..e5072278f4c40 100644 --- a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { constructor(public x) { }} ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.js b/tests/baselines/reference/jsFileCompilationRestParameter.js index bcba97af02497..d28299c543aca 100644 --- a/tests/baselines/reference/jsFileCompilationRestParameter.js +++ b/tests/baselines/reference/jsFileCompilationRestParameter.js @@ -2,4 +2,3 @@ function foo(...a) { } //// [b.js] -function foo(...a) { } diff --git a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt index 48528b14531c0..50746dcfc82e1 100644 --- a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(): number { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt index d742e68dbdcaa..1ca6e25178823 100644 --- a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt +++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(3,6): error TS1223: 'type' tag already specified. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== /** * @type {number} diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt index 3afd84da9bebe..6af5751ea8545 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8008: 'type aliases' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== type a = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt index 78a92e9460aa1..cade211aa63a3 100644 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== Foo(); ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index d7c8faab8dc47..de1e1038db641 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== var v = undefined; ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt index 41638f5107753..ae3fd23c6efe6 100644 --- a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(a: number) { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt index 6267d2f37fe31..708ff378137f0 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt index 4a5e222058beb..391e8f476daa1 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F() { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt index ceef95023df60..a4486a5d49d7f 100644 --- a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt @@ -1,8 +1,6 @@ -error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== var v: () => number; ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationWithOut.js b/tests/baselines/reference/jsFileCompilationWithOut.js index 32d0261061f6f..7bab7b973ab6d 100644 --- a/tests/baselines/reference/jsFileCompilationWithOut.js +++ b/tests/baselines/reference/jsFileCompilationWithOut.js @@ -15,5 +15,3 @@ var c = (function () { } return c; })(); -function foo() { -} diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt deleted file mode 100644 index 32a60df099647..0000000000000 --- a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. - - -!!! error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. -==== tests/cases/compiler/a.ts (0 errors) ==== - class c { - } - -==== tests/cases/compiler/b.js (0 errors) ==== - function foo() { - } - \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.symbols b/tests/baselines/reference/jsFileCompilationWithoutOut.symbols new file mode 100644 index 0000000000000..5260b8d6cf36a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : Symbol(foo, Decl(b.js, 0, 0)) +} + diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.types b/tests/baselines/reference/jsFileCompilationWithoutOut.types new file mode 100644 index 0000000000000..dce83eeb8ebb7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.js === +function foo() { +>foo : () => void +} + diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js index f2115703462fc..e757934f20cc5 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js @@ -1,2 +1 @@ var test = 10; -var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js index f2115703462fc..e757934f20cc5 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js @@ -1,2 +1 @@ var test = 10; -var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js index f2115703462fc..e757934f20cc5 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js @@ -1,2 +1 @@ var test = 10; -var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js index f2115703462fc..e757934f20cc5 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js @@ -1,2 +1 @@ var test = 10; -var test2 = 10; // Should get compiled From 68c65cd29e658a9c24e096dbe3f8df0e1b0894ed Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 13:22:10 -0700 Subject: [PATCH 022/353] Test case when one of the input file is output file name --- ...lationWithOutFileNameSameAsInputJsFile.errors.txt | 12 ++++++++++++ ...ileCompilationWithOutFileNameSameAsInputJsFile.ts | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt create mode 100644 tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt new file mode 100644 index 0000000000000..32a60df099647 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt @@ -0,0 +1,12 @@ +error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. + + +!!! error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts new file mode 100644 index 0000000000000..da7d99dc5e7fb --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts @@ -0,0 +1,8 @@ +// @out: tests/cases/compiler/b.js +// @filename: a.ts +class c { +} + +// @filename: b.js +function foo() { +} From fce9f32bd452f6e3ccd9345c367512a5b36e4fb1 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 13:57:51 -0700 Subject: [PATCH 023/353] When tsconfig file doesnt contain file names, consume .js files of directory only if specified in the options --- src/compiler/commandLineParser.ts | 12 ++++++++++-- src/compiler/types.ts | 3 ++- ...ileCompilationDifferentNamesNotSpecified.json | 3 +-- ...ileCompilationDifferentNamesNotSpecified.json | 3 +-- ...erentNamesNotSpecifiedWithConsumeJsFiles.json | 16 ++++++++++++++++ .../amd/test.d.ts | 1 + .../amd/test.js | 1 + ...erentNamesNotSpecifiedWithConsumeJsFiles.json | 16 ++++++++++++++++ .../node/test.d.ts | 1 + .../node/test.js | 1 + ...ameNameDtsNotSpecifiedWithConsumeJsFiles.json | 12 ++++++++++++ ...ameNameDtsNotSpecifiedWithConsumeJsFiles.json | 12 ++++++++++++ .../a.d.ts | 1 + .../a.js | 1 + ...eNameFilesNotSpecifiedWithConsumeJsFiles.json | 15 +++++++++++++++ .../a.d.ts | 1 + .../a.js | 1 + ...eNameFilesNotSpecifiedWithConsumeJsFiles.json | 15 +++++++++++++++ ...erentNamesNotSpecifiedWithConsumeJsFiles.json | 7 +++++++ ...ameNameDtsNotSpecifiedWithConsumeJsFiles.json | 7 +++++++ ...eNameFilesNotSpecifiedWithConsumeJsFiles.json | 7 +++++++ .../DifferentNamesNotSpecified/b.js | 2 +- .../a.ts | 1 + .../b.js | 1 + .../tsconfig.json | 6 ++++++ .../a.d.ts | 1 + .../a.js | 1 + .../tsconfig.json | 1 + .../a.js | 1 + .../a.ts | 1 + .../tsconfig.json | 1 + 31 files changed, 144 insertions(+), 8 deletions(-) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 9283f8d939deb..09dea3cc844d4 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -245,6 +245,10 @@ namespace ts { }, description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6, error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic, + }, + { + name: "consumeJsFiles", + type: "boolean", } ]; @@ -414,8 +418,9 @@ namespace ts { export function parseConfigFile(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine { let errors: Diagnostic[] = []; + let options = getCompilerOptions(); return { - options: getCompilerOptions(), + options, fileNames: getFileNames(), errors }; @@ -474,7 +479,10 @@ namespace ts { } else { let exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; - let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)).concat(host.readDirectory(basePath, ".js", exclude)); + let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); + if (options.consumeJsFiles) { + sysFiles = sysFiles.concat(host.readDirectory(basePath, ".js", exclude)); + } for (let i = 0; i < sysFiles.length; i++) { let name = sysFiles[i]; if (fileExtensionIs(name, ".js")) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index d2757bb7937ca..9cd0024759335 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2061,7 +2061,8 @@ namespace ts { experimentalDecorators?: boolean; experimentalAsyncFunctions?: boolean; emitDecoratorMetadata?: boolean; - moduleResolution?: ModuleResolutionKind + moduleResolution?: ModuleResolutionKind; + consumeJsFiles?: boolean; /* @internal */ stripInternal?: boolean; // Skip checking lib.d.ts to help speed up tests. diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json index 7a7e0b2c453b5..6d04c74fa3899 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json @@ -6,8 +6,7 @@ "project": "DifferentNamesNotSpecified", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecified/a.ts", - "DifferentNamesNotSpecified/b.js" + "DifferentNamesNotSpecified/a.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json index 7a7e0b2c453b5..6d04c74fa3899 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json @@ -6,8 +6,7 @@ "project": "DifferentNamesNotSpecified", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecified/a.ts", - "DifferentNamesNotSpecified/b.js" + "DifferentNamesNotSpecified/a.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..c2cd78e81188e --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts", + "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..c2cd78e81188e --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts", + "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..99a11e4722c8c --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..99a11e4722c8c --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..0970535d97a48 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js", + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..0970535d97a48 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js", + "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..0571c55820f2d --- /dev/null +++ b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles" +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..a938517114ce9 --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles" +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json new file mode 100644 index 0000000000000..d8cb3f952ba9a --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js index 9fdf6253b8006..7ba71c35654a9 100644 --- a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js @@ -1 +1 @@ -var test2 = 10; // Should get compiled \ No newline at end of file +var test2 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js new file mode 100644 index 0000000000000..9fdf6253b8006 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js @@ -0,0 +1 @@ +var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json new file mode 100644 index 0000000000000..9be9952dd2b7f --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "out": "test.js", + "consumeJsFiles": true + } +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts new file mode 100644 index 0000000000000..16cb2db6fd7cc --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts @@ -0,0 +1 @@ +declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json new file mode 100644 index 0000000000000..df05c5d4d5290 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "consumeJsFiles": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json new file mode 100644 index 0000000000000..df05c5d4d5290 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "consumeJsFiles": true } } \ No newline at end of file From e32c920cc2f7c00736007c952616491eabb10117 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 14:02:20 -0700 Subject: [PATCH 024/353] Corrected scenario names in the test cases --- .../amd/jsFileCompilationDifferentNamesNotSpecified.json | 2 +- .../node/jsFileCompilationDifferentNamesNotSpecified.json | 2 +- .../amd/jsFileCompilationDifferentNamesSpecified.json | 2 +- .../node/jsFileCompilationDifferentNamesSpecified.json | 2 +- .../amd/jsFileCompilationSameNameDTsSpecified.json | 2 +- .../node/jsFileCompilationSameNameDTsSpecified.json | 2 +- .../amd/jsFileCompilationSameNameDtsNotSpecified.json | 2 +- .../node/jsFileCompilationSameNameDtsNotSpecified.json | 2 +- ...ileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json | 2 +- ...ileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json | 2 +- .../project/jsFileCompilationDifferentNamesNotSpecified.json | 2 +- .../cases/project/jsFileCompilationDifferentNamesSpecified.json | 2 +- tests/cases/project/jsFileCompilationSameNameDTsSpecified.json | 2 +- .../cases/project/jsFileCompilationSameNameDtsNotSpecified.json | 2 +- ...ileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json index 6d04c74fa3899..0729dbedfae94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json index 6d04c74fa3899..0729dbedfae94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json index 0ba5af91d2183..555acda2cd6bf 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json index 0ba5af91d2183..555acda2cd6bf 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json index e0f30e0ed4f94..d0ffac121e457 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json index e0f30e0ed4f94..d0ffac121e457 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json index 4d345f51353d8..a619f0e1e22b7 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json index 4d345f51353d8..a619f0e1e22b7 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json index 99a11e4722c8c..4a3803ead63cb 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json index 99a11e4722c8c..4a3803ead63cb 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json index 43fe621e0657b..253d6f0f1d4ad 100644 --- a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json +++ b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify anyt files", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json index d23706bab94ad..a8b0087521401 100644 --- a/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/cases/project/jsFileCompilationDifferentNamesSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json b/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json index 9d0ec1282785b..5f484c20e30e8 100644 --- a/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json +++ b/tests/cases/project/jsFileCompilationSameNameDTsSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json index cc11c7d2625d2..7b4a7efc0428a 100644 --- a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecified.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json index a938517114ce9..41a19f64c5cf2 100644 --- a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json @@ -1,5 +1,5 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, From 60e15b267dba291107a4200120ef7eda3ca4ab39 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Sep 2015 15:11:11 -0700 Subject: [PATCH 025/353] Report error when emitting declarations if the reference is to .js file --- src/compiler/declarationEmitter.ts | 40 ++++++++++++------- .../diagnosticInformationMap.generated.ts | 1 + src/compiler/diagnosticMessages.json | 4 ++ ...onsWithJsFileReferenceWithNoOut.errors.txt | 18 +++++++++ ...eclarationsWithJsFileReferenceWithNoOut.js | 32 +++++++++++++++ ...tionsWithJsFileReferenceWithOut.errors.txt | 18 +++++++++ ...nDeclarationsWithJsFileReferenceWithOut.js | 26 ++++++++++++ ...eclarationsWithJsFileReferenceWithNoOut.js | 27 +++++++++++++ ...ationsWithJsFileReferenceWithNoOut.symbols | 16 ++++++++ ...arationsWithJsFileReferenceWithNoOut.types | 16 ++++++++ ...tDeclarationsWithJsFileReferenceWithOut.js | 26 ++++++++++++ ...arationsWithJsFileReferenceWithOut.symbols | 16 ++++++++ ...clarationsWithJsFileReferenceWithOut.types | 16 ++++++++ ...eclarationsWithJsFileReferenceWithNoOut.ts | 14 +++++++ ...nDeclarationsWithJsFileReferenceWithOut.ts | 15 +++++++ ...eclarationsWithJsFileReferenceWithNoOut.ts | 13 ++++++ ...tDeclarationsWithJsFileReferenceWithOut.ts | 14 +++++++ 17 files changed, 298 insertions(+), 14 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types create mode 100644 tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts create mode 100644 tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts create mode 100644 tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts create mode 100644 tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 03d2e0453b14c..9ebca2397583a 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -68,16 +68,22 @@ namespace ts { if (!compilerOptions.noResolve) { let addedGlobalFileReference = false; forEach(root.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, root, fileReference); + if (isJavaScript(fileReference.fileName)) { + reportedDeclarationError = true; + diagnostics.push(createFileDiagnostic(root, fileReference.pos, fileReference.end - fileReference.pos, Diagnostics.js_file_cannot_be_referenced_in_ts_file_when_emitting_declarations)); + } + else { + let referencedFile = tryResolveScriptReference(host, root, fileReference); - // All the references that are not going to be part of same file - if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference - shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file - !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added + // All the references that are not going to be part of same file + if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference + shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file + !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added - writeReferencePath(referencedFile); - if (!isExternalModuleOrDeclarationFile(referencedFile)) { - addedGlobalFileReference = true; + writeReferencePath(referencedFile); + if (!isExternalModuleOrDeclarationFile(referencedFile)) { + addedGlobalFileReference = true; + } } } }); @@ -108,14 +114,20 @@ namespace ts { // Check what references need to be added if (!compilerOptions.noResolve) { forEach(sourceFile.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); + if (isJavaScript(fileReference.fileName)) { + reportedDeclarationError = true; + diagnostics.push(createFileDiagnostic(sourceFile, fileReference.pos, fileReference.end - fileReference.pos, Diagnostics.js_file_cannot_be_referenced_in_ts_file_when_emitting_declarations)); + } + else { + let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && - !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted + // If the reference file is a declaration file or an external module, emit that reference + if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && + !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted - writeReferencePath(referencedFile); - emittedReferencedFiles.push(referencedFile); + writeReferencePath(referencedFile); + emittedReferencedFiles.push(referencedFile); + } } }); } diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index ced0dd6d87ce6..610ee7e112565 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -611,6 +611,7 @@ namespace ts { enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." }, type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." }, decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." }, + js_file_cannot_be_referenced_in_ts_file_when_emitting_declarations: { code: 8018, category: DiagnosticCategory.Error, key: ".js file cannot be referenced in .ts file when emitting declarations." }, Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." }, class_expressions_are_not_currently_supported: { code: 9003, category: DiagnosticCategory.Error, key: "'class' expressions are not currently supported." }, JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index aaac6284f7deb..5d40a1e5ab294 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2438,6 +2438,10 @@ "category": "Error", "code": 8017 }, + ".js file cannot be referenced in .ts file when emitting declarations.": { + "category": "Error", + "code": 8018 + }, "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": { "category": "Error", diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt new file mode 100644 index 0000000000000..1d6ddb3ed30c9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -0,0 +1,18 @@ +tests/cases/compiler/b.ts(1,1): error TS8018: .js file cannot be referenced in .ts file when emitting declarations. + + +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (1 errors) ==== + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS8018: .js file cannot be referenced in .ts file when emitting declarations. + // error on above reference path when emitting declarations + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js new file mode 100644 index 0000000000000..6bd76de881bfc --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +/// +// error on above reference path when emitting declarations +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//// [b.js] +/// +// error on above reference path when emitting declarations +function foo() { +} + + +//// [a.d.ts] +declare class c { +} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt new file mode 100644 index 0000000000000..a658130e10aa9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt @@ -0,0 +1,18 @@ +tests/cases/compiler/b.ts(1,1): error TS8018: .js file cannot be referenced in .ts file when emitting declarations. + + +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (1 errors) ==== + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS8018: .js file cannot be referenced in .ts file when emitting declarations. + // error on above reference when emitting declarations + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js new file mode 100644 index 0000000000000..99dd961db4c5b --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +/// +// error on above reference when emitting declarations +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [out.js] +var c = (function () { + function c() { + } + return c; +})(); +/// +// error on above reference when emitting declarations +function foo() { +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js new file mode 100644 index 0000000000000..2d84420798686 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +/// +// no error on above reference path since not emitting declarations +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//// [b.js] +/// +// no error on above reference path since not emitting declarations +function foo() { +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols new file mode 100644 index 0000000000000..06b80b144a4fe --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.ts === +/// +// no error on above reference path since not emitting declarations +function foo() { +>foo : Symbol(foo, Decl(b.ts, 0, 0)) +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : Symbol(bar, Decl(c.js, 0, 0)) +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types new file mode 100644 index 0000000000000..ea9b48061c37c --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.ts === +/// +// no error on above reference path since not emitting declarations +function foo() { +>foo : () => void +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : () => void +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js new file mode 100644 index 0000000000000..55412253441db --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +/// +//no error on above reference since not emitting declarations +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [out.js] +var c = (function () { + function c() { + } + return c; +})(); +/// +//no error on above reference since not emitting declarations +function foo() { +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols new file mode 100644 index 0000000000000..2f3cf3e078567 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.ts === +/// +//no error on above reference since not emitting declarations +function foo() { +>foo : Symbol(foo, Decl(b.ts, 0, 0)) +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : Symbol(bar, Decl(c.js, 0, 0)) +} diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types new file mode 100644 index 0000000000000..cd9a6dfafba38 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.ts === +/// +//no error on above reference since not emitting declarations +function foo() { +>foo : () => void +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : () => void +} diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts new file mode 100644 index 0000000000000..f02035c3f65c0 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts @@ -0,0 +1,14 @@ +// @declaration: true +// @filename: a.ts +class c { +} + +// @filename: b.ts +/// +// error on above reference path when emitting declarations +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts new file mode 100644 index 0000000000000..04945af8205a6 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts @@ -0,0 +1,15 @@ +// @out: out.js +// @declaration: true +// @filename: a.ts +class c { +} + +// @filename: b.ts +/// +// error on above reference when emitting declarations +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts new file mode 100644 index 0000000000000..fc6acef20ee17 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts @@ -0,0 +1,13 @@ +// @filename: a.ts +class c { +} + +// @filename: b.ts +/// +// no error on above reference path since not emitting declarations +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts new file mode 100644 index 0000000000000..3ed1ca1039dc6 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts @@ -0,0 +1,14 @@ +// @out: out.js +// @filename: a.ts +class c { +} + +// @filename: b.ts +/// +//no error on above reference since not emitting declarations +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file From 62df49f3272b444664f702238b983af6b0bf0cf7 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 20 Sep 2015 17:22:50 +0900 Subject: [PATCH 026/353] support tsconfig full path --- src/compiler/program.ts | 4 ++-- src/compiler/tsc.ts | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 3da3c354fb236..3043f6be70847 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -862,8 +862,8 @@ namespace ts { const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]); if (importedFile && resolution.isExternalLibraryImport) { if (!isExternalModule(importedFile)) { - let start = getTokenPosOfNode(file.imports[i], file) - fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName)); + let start = getTokenPosOfNode(file.imports[i], file) + fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName)); } else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) { let start = getTokenPosOfNode(file.imports[i], file) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 96759b6825012..25e149cf6ca27 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -180,11 +180,18 @@ namespace ts { reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--project")); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } - configFileName = normalizePath(combinePaths(commandLine.options.project, "tsconfig.json")); if (commandLine.fileNames.length !== 0) { reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line)); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } + + let fileOrDirectory = normalizePath(commandLine.options.project); + if (!fileOrDirectory || sys.directoryExists(fileOrDirectory)) { + configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); + } + else { + configFileName = fileOrDirectory; + } } else if (commandLine.fileNames.length === 0 && isJSONSupported()) { let searchPath = normalizePath(sys.getCurrentDirectory()); From c30104e3b6e19a902d977ce19f0f58a5770e6fa1 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 21 Sep 2015 15:39:53 -0700 Subject: [PATCH 027/353] Add option --jsExtensions to handle extensions to treat as javascript - Command line now takes --jsExtension multiple times or comma separated list of extensions - tsconfig accepts array of extension strings --- src/compiler/commandLineParser.ts | 217 ++++++++++++------ src/compiler/core.ts | 10 +- .../diagnosticInformationMap.generated.ts | 3 + src/compiler/diagnosticMessages.json | 12 + src/compiler/parser.ts | 2 +- src/compiler/program.ts | 79 +++---- src/compiler/tsc.ts | 12 +- src/compiler/types.ts | 8 +- src/compiler/utilities.ts | 15 +- src/harness/compilerRunner.ts | 2 +- src/harness/harness.ts | 28 +-- src/harness/projectsRunner.ts | 38 +-- src/services/services.ts | 2 +- ...eCompilationWithoutJsExtensions.errors.txt | 6 + .../amd/invalidRootFile.errors.txt | 4 +- .../node/invalidRootFile.errors.txt | 4 +- ...entNamesNotSpecifiedWithJsExtensions.json} | 8 +- .../amd/test.d.ts | 0 .../amd/test.js | 0 ...entNamesNotSpecifiedWithJsExtensions.json} | 8 +- .../node/test.d.ts | 0 .../node/test.js | 0 ...pilationDifferentNamesSpecified.errors.txt | 6 + ...ileCompilationDifferentNamesSpecified.json | 3 +- ...pilationDifferentNamesSpecified.errors.txt | 6 + ...ileCompilationDifferentNamesSpecified.json | 3 +- ...fferentNamesSpecifiedWithJsExtensions.json | 16 ++ .../amd/test.d.ts} | 0 .../amd/test.js} | 0 ...fferentNamesSpecifiedWithJsExtensions.json | 16 ++ .../node/test.d.ts} | 0 .../node/test.js} | 0 ...SameNameDTsSpecifiedWithJsExtensions.json} | 6 +- ...SameNameDTsSpecifiedWithJsExtensions.json} | 6 +- ...meNameDtsNotSpecifiedWithJsExtensions.json | 12 + ...meNameDtsNotSpecifiedWithJsExtensions.json | 12 + ...meFilesNotSpecifiedWithConsumeJsFiles.json | 15 -- ...meFilesNotSpecifiedWithConsumeJsFiles.json | 15 -- .../a.d.ts | 1 + .../a.js | 1 + ...NameFilesNotSpecifiedWithJsExtensions.json | 15 ++ .../a.d.ts | 1 + .../a.js | 1 + ...NameFilesNotSpecifiedWithJsExtensions.json | 15 ++ .../a.d.ts | 1 + .../SameNameTsSpecifiedWithJsExtensions/a.js | 1 + ...ameNameFilesSpecifiedWithJsExtensions.json | 15 ++ .../a.d.ts | 1 + .../SameNameTsSpecifiedWithJsExtensions/a.js | 1 + ...ameNameFilesSpecifiedWithJsExtensions.json | 15 ++ ...eCompilationAmbientVarDeclarationSyntax.ts | 1 + .../jsFileCompilationDecoratorSyntax.ts | 1 + .../jsFileCompilationEmitDeclarations.ts | 1 + ...ileCompilationEmitTrippleSlashReference.ts | 1 + .../compiler/jsFileCompilationEnumSyntax.ts | 1 + ...eclarationsWithJsFileReferenceWithNoOut.ts | 1 + ...nDeclarationsWithJsFileReferenceWithOut.ts | 1 + ...jsFileCompilationExportAssignmentSyntax.ts | 1 + ...eCompilationHeritageClauseSyntaxOfClass.ts | 1 + .../jsFileCompilationImportEqualsSyntax.ts | 1 + .../jsFileCompilationInterfaceSyntax.ts | 1 + .../compiler/jsFileCompilationModuleSyntax.ts | 1 + ...eclarationsWithJsFileReferenceWithNoOut.ts | 1 + ...tDeclarationsWithJsFileReferenceWithOut.ts | 1 + .../jsFileCompilationOptionalParameter.ts | 1 + .../jsFileCompilationPropertySyntaxOfClass.ts | 1 + ...ileCompilationPublicMethodSyntaxOfClass.ts | 1 + ...sFileCompilationPublicParameterModifier.ts | 1 + .../jsFileCompilationRestParameter.ts | 1 + ...leCompilationReturnTypeSyntaxOfFunction.ts | 1 + .../compiler/jsFileCompilationSyntaxError.ts | 1 + .../jsFileCompilationTypeAliasSyntax.ts | 1 + ...FileCompilationTypeArgumentSyntaxOfCall.ts | 1 + .../jsFileCompilationTypeAssertions.ts | 1 + .../jsFileCompilationTypeOfParameter.ts | 1 + ...leCompilationTypeParameterSyntaxOfClass.ts | 1 + ...ompilationTypeParameterSyntaxOfFunction.ts | 1 + .../jsFileCompilationTypeSyntaxOfVar.ts | 1 + .../compiler/jsFileCompilationWithOut.ts | 1 + ...ilationWithOutFileNameSameAsInputJsFile.ts | 1 + .../jsFileCompilationWithoutJsExtensions.ts | 2 + .../compiler/jsFileCompilationWithoutOut.ts | 1 + ...entNamesNotSpecifiedWithJsExtensions.json} | 4 +- ...fferentNamesSpecifiedWithJsExtensions.json | 7 + ...SameNameDTsSpecifiedWithJsExtensions.json} | 4 +- ...meNameDtsNotSpecifiedWithJsExtensions.json | 7 + ...ameFilesNotSpecifiedWithJsExtensions.json} | 4 +- ...ameNameFilesSpecifiedWithJsExtensions.json | 7 + .../a.ts | 0 .../b.js | 0 .../tsconfig.json | 2 +- .../a.ts | 0 .../b.js | 1 + .../tsconfig.json | 7 + .../a.d.ts | 1 + .../a.js | 0 .../tsconfig.json | 4 + .../tsconfig.json | 1 - .../a.d.ts | 0 .../a.js | 0 .../tsconfig.json | 1 + .../tsconfig.json | 1 - .../a.js | 1 + .../a.ts | 1 + .../tsconfig.json | 1 + .../SameNameTsSpecifiedWithJsExtensions/a.js | 1 + .../SameNameTsSpecifiedWithJsExtensions/a.ts | 1 + .../tsconfig.json | 4 + tests/cases/unittests/moduleResolution.ts | 23 +- 109 files changed, 511 insertions(+), 247 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json} (63%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions}/amd/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions}/amd/test.js (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json} (63%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions}/node/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions}/node/test.js (100%) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts => jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts} (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js => jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js} (100%) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts => jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts} (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js => jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js} (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json} (55%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json} (55%) create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json create mode 100644 tests/cases/compiler/jsFileCompilationWithoutJsExtensions.ts rename tests/cases/project/{jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json} (73%) create mode 100644 tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename tests/cases/project/{jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json} (55%) create mode 100644 tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json rename tests/cases/project/{jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json => jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json} (55%) create mode 100644 tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithConsumeJsFiles => DifferentNamesNotSpecifiedWithJsExtensions}/a.ts (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithConsumeJsFiles => DifferentNamesNotSpecifiedWithJsExtensions}/b.js (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithConsumeJsFiles => DifferentNamesNotSpecifiedWithJsExtensions}/tsconfig.json (60%) rename tests/cases/projects/jsFileCompilation/{SameNameFilesNotSpecifiedWithConsumeJsFiles => DifferentNamesSpecifiedWithJsExtensions}/a.ts (100%) create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js create mode 100644 tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts rename tests/cases/projects/jsFileCompilation/{SameNameDtsNotSpecifiedWithConsumeJsFiles => SameNameDTsSpecifiedWithJsExtensions}/a.js (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json rename tests/cases/projects/jsFileCompilation/{SameNameDtsNotSpecifiedWithConsumeJsFiles => SameNameDtsNotSpecifiedWithJsExtensions}/a.d.ts (100%) rename tests/cases/projects/jsFileCompilation/{SameNameFilesNotSpecifiedWithConsumeJsFiles => SameNameDtsNotSpecifiedWithJsExtensions}/a.js (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 09dea3cc844d4..2ee0f67382be6 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -247,8 +247,11 @@ namespace ts { error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic, }, { - name: "consumeJsFiles", - type: "boolean", + name: "jsExtensions", + type: "string[]", + description: Diagnostics.Specifies_extensions_to_treat_as_javascript_file_To_specify_multiple_extensions_either_use_this_option_multiple_times_or_provide_comma_separated_list, + paramType: Diagnostics.EXTENSION_S, + error: Diagnostics.Argument_for_jsExtensions_option_must_be_either_extension_or_comma_separated_list_of_extensions, } ]; @@ -309,31 +312,23 @@ namespace ts { if (hasProperty(optionNameMap, s)) { let opt = optionNameMap[s]; - // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). - if (!args[i] && opt.type !== "boolean") { - errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); + if (opt.type === "boolean") { + // This needs to be treated specially since it doesnt accept argument + options[opt.name] = true; } + else { + // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). + if (!args[i]) { + errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); + } - switch (opt.type) { - case "number": - options[opt.name] = parseInt(args[i++]); - break; - case "boolean": - options[opt.name] = true; - break; - case "string": - options[opt.name] = args[i++] || ""; - break; - // If not a primitive, the possible types are specified in what is effectively a map of options. - default: - let map = >opt.type; - let key = (args[i++] || "").toLowerCase(); - if (hasProperty(map, key)) { - options[opt.name] = map[key]; - } - else { - errors.push(createCompilerDiagnostic((opt).error)); - } + let { hasError, value} = parseOption(opt, args[i++], options[opt.name]); + if (hasError) { + errors.push(createCompilerDiagnostic((opt).error)); + } + else { + options[opt.name] = value; + } } } else { @@ -345,7 +340,7 @@ namespace ts { } } } - + function parseResponseFile(fileName: string) { let text = readFile ? readFile(fileName) : sys.readFile(fileName); @@ -380,6 +375,63 @@ namespace ts { } } + function parseMultiValueStringArray(s: string, existingValue: string[]) { + let value: string[] = existingValue || []; + let hasError: boolean; + let currentString = ""; + if (s) { + for (let i = 0; i < s.length; i++) { + let ch = s.charCodeAt(i); + if (ch === CharacterCodes.comma) { + pushCurrentStringToResult(); + } + else { + currentString += s.charAt(i); + } + } + // push last string + pushCurrentStringToResult(); + } + return { value, hasError }; + + function pushCurrentStringToResult() { + if (currentString) { + value.push(currentString); + currentString = ""; + } + else { + hasError = true; + } + } + } + + /* @internal */ + export function parseOption(option: CommandLineOption, stringValue: string, existingValue: CompilerOptionsValueType) { + let hasError: boolean; + let value: CompilerOptionsValueType; + switch (option.type) { + case "number": + value = parseInt(stringValue); + break; + case "string": + value = stringValue || ""; + break; + case "string[]": + return parseMultiValueStringArray(stringValue, existingValue); + // If not a primitive, the possible types are specified in what is effectively a map of options. + default: + let map = >option.type; + let key = (stringValue || "").toLowerCase(); + if (hasProperty(map, key)) { + value = map[key]; + } + else { + hasError = true; + } + } + return { hasError, value }; + } + /** * Read tsconfig.json file * @param fileName The path to the config file @@ -409,23 +461,57 @@ namespace ts { } } + /* @internal */ + export function parseJsonCompilerOption(opt: CommandLineOption, jsonValue: any, errors: Diagnostic[]) { + let optType = opt.type; + let expectedType = typeof optType === "string" ? optType : "string"; + let hasValidValue = true; + if (typeof jsonValue === expectedType) { + if (typeof optType !== "string") { + let key = jsonValue.toLowerCase(); + if (hasProperty(optType, key)) { + jsonValue = optType[key]; + } + else { + errors.push(createCompilerDiagnostic((opt).error)); + jsonValue = 0; + } + } + } + // Check if the value asked was string[] and value provided was not string[] + else if (expectedType !== "string[]" || + typeof jsonValue !== "object" || + typeof jsonValue.length !== "number" || + forEach(jsonValue, individualValue => typeof individualValue !== "string")) { + // Not expectedType + errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType)); + hasValidValue = false; + } + + return { + value: jsonValue, + hasValidValue + }; + } + /** * Parse the contents of a config file (tsconfig.json). * @param json The contents of the config file to parse * @param basePath A root directory to resolve relative path entries in the config * file to. e.g. outDir + * @param existingOptions optional existing options to extend into */ - export function parseConfigFile(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine { + export function parseConfigFile(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}): ParsedCommandLine { let errors: Diagnostic[] = []; - let options = getCompilerOptions(); + let options = getCompilerOptions(existingOptions); return { options, fileNames: getFileNames(), errors }; - function getCompilerOptions(): CompilerOptions { + function getCompilerOptions(existingOptions: CompilerOptions): CompilerOptions { let options: CompilerOptions = {}; let optionNameMap: Map = {}; forEach(optionDeclarations, option => { @@ -436,27 +522,9 @@ namespace ts { for (let id in jsonOptions) { if (hasProperty(optionNameMap, id)) { let opt = optionNameMap[id]; - let optType = opt.type; - let value = jsonOptions[id]; - let expectedType = typeof optType === "string" ? optType : "string"; - if (typeof value === expectedType) { - if (typeof optType !== "string") { - let key = value.toLowerCase(); - if (hasProperty(optType, key)) { - value = optType[key]; - } - else { - errors.push(createCompilerDiagnostic((opt).error)); - value = 0; - } - } - if (opt.isFilePath) { - value = normalizePath(combinePaths(basePath, value)); - } - options[opt.name] = value; - } - else { - errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType)); + let { hasValidValue, value } = parseJsonCompilerOption(opt, jsonOptions[id], errors); + if (hasValidValue) { + options[opt.name] = opt.isFilePath ? normalizePath(combinePaths(basePath, value)) : value; } } else { @@ -464,7 +532,7 @@ namespace ts { } } } - return options; + return extend(existingOptions, options); } function getFileNames(): string[] { @@ -479,32 +547,31 @@ namespace ts { } else { let exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; - let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); - if (options.consumeJsFiles) { - sysFiles = sysFiles.concat(host.readDirectory(basePath, ".js", exclude)); - } - for (let i = 0; i < sysFiles.length; i++) { - let name = sysFiles[i]; - if (fileExtensionIs(name, ".js")) { - let baseName = name.substr(0, name.length - ".js".length); - if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts") && !contains(sysFiles, baseName + ".d.ts")) { - fileNames.push(name); - } - } - else if (fileExtensionIs(name, ".d.ts")) { - let baseName = name.substr(0, name.length - ".d.ts".length); - if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts")) { - fileNames.push(name); - } - } - else if (fileExtensionIs(name, ".ts")) { - if (!contains(sysFiles, name + "x")) { - fileNames.push(name); + let extensionsToRead = getSupportedExtensions(options); + for (let extensionsIndex = 0; extensionsIndex < extensionsToRead.length; extensionsIndex++) { + let extension = extensionsToRead[extensionsIndex]; + let sysFiles = host.readDirectory(basePath, extension, exclude); + for (let i = 0; i < sysFiles.length; i++) { + let fileName = sysFiles[i]; + // If this is not the extension of one of the lower priority extension, then only we can use this file name + // This could happen if the extension taking priority is substring of lower priority extension. eg. .ts and .d.ts + let hasLowerPriorityExtension: boolean; + for (let j = extensionsIndex + 1; !hasLowerPriorityExtension && j < extensionsToRead.length; j++) { + hasLowerPriorityExtension = fileExtensionIs(fileName, extensionsToRead[j]); + }; + if (!hasLowerPriorityExtension) { + // If the basename + higher priority extensions arent in the filenames, use this file name + let baseName = fileName.substr(0, fileName.length - extension.length - 1); + let hasSameNameHigherPriorityExtensionFile: boolean; + for (let j = 0; !hasSameNameHigherPriorityExtensionFile && j < extensionsIndex; j++) { + hasSameNameHigherPriorityExtensionFile = contains(fileNames, baseName + "." + extensionsToRead[j]); + }; + + if (!hasSameNameHigherPriorityExtensionFile) { + fileNames.push(fileName); + } } } - else { - fileNames.push(name); - } } } return fileNames; diff --git a/src/compiler/core.ts b/src/compiler/core.ts index f792c728227ad..4a337e94bc402 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -714,20 +714,20 @@ namespace ts { export function fileExtensionIs(path: string, extension: string): boolean { let pathLen = path.length; - let extLen = extension.length; - return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension; + let extLen = extension.length + 1; + return pathLen > extLen && path.substr(pathLen - extLen, extLen) === "." + extension; } /** * List of supported extensions in order of file resolution precedence. */ - export const supportedExtensions = [".ts", ".tsx", ".d.ts", ".js"]; + export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; - const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; + const extensionsToRemove = ["d.ts", "ts", "js", "tsx", "jsx"]; export function removeFileExtension(path: string): string { for (let ext of extensionsToRemove) { if (fileExtensionIs(path, ext)) { - return path.substr(0, path.length - ext.length); + return path.substr(0, path.length - ext.length - 1); } } return path; diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index 610ee7e112565..d79b7323d3e66 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -546,6 +546,7 @@ namespace ts { VERSION: { code: 6036, category: DiagnosticCategory.Message, key: "VERSION" }, LOCATION: { code: 6037, category: DiagnosticCategory.Message, key: "LOCATION" }, DIRECTORY: { code: 6038, category: DiagnosticCategory.Message, key: "DIRECTORY" }, + EXTENSION_S: { code: 6039, category: DiagnosticCategory.Message, key: "EXTENSION[S]" }, Compilation_complete_Watching_for_file_changes: { code: 6042, category: DiagnosticCategory.Message, key: "Compilation complete. Watching for file changes." }, Generates_corresponding_map_file: { code: 6043, category: DiagnosticCategory.Message, key: "Generates corresponding '.map' file." }, Compiler_option_0_expects_an_argument: { code: 6044, category: DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." }, @@ -567,6 +568,7 @@ namespace ts { NEWLINE: { code: 6061, category: DiagnosticCategory.Message, key: "NEWLINE" }, Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." }, Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: DiagnosticCategory.Error, key: "Argument for '--moduleResolution' option must be 'node' or 'classic'." }, + Argument_for_jsExtensions_option_must_be_either_extension_or_comma_separated_list_of_extensions: { code: 6064, category: DiagnosticCategory.Error, key: "Argument for '--jsExtensions' option must be either extension or comma separated list of extensions." }, Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" }, Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." }, Enables_experimental_support_for_ES7_decorators: { code: 6065, category: DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." }, @@ -577,6 +579,7 @@ namespace ts { Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." }, Successfully_created_a_tsconfig_json_file: { code: 6071, category: DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." }, Suppress_excess_property_checks_for_object_literals: { code: 6072, category: DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." }, + Specifies_extensions_to_treat_as_javascript_file_To_specify_multiple_extensions_either_use_this_option_multiple_times_or_provide_comma_separated_list: { code: 6073, category: DiagnosticCategory.Message, key: "Specifies extensions to treat as javascript file. To specify multiple extensions, either use this option multiple times or provide comma separated list." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 5d40a1e5ab294..3f5dc0134e0c1 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2174,6 +2174,10 @@ "category": "Message", "code": 6038 }, + "EXTENSION[S]": { + "category": "Message", + "code": 6039 + }, "Compilation complete. Watching for file changes.": { "category": "Message", "code": 6042 @@ -2258,6 +2262,10 @@ "category": "Error", "code": 6063 }, + "Argument for '--jsExtensions' option must be either extension or comma separated list of extensions.": { + "category": "Error", + "code": 6064 + }, "Specify JSX code generation: 'preserve' or 'react'": { "category": "Message", @@ -2299,6 +2307,10 @@ "category": "Message", "code": 6072 }, + "Specifies extensions to treat as javascript file. To specify multiple extensions, either use this option multiple times or provide comma separated list.": { + "category": "Message", + "code": 6073 + }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 330ad05518bb1..27d85a3b4a885 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -659,7 +659,7 @@ namespace ts { sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = normalizePath(fileName); - sourceFile.flags = fileExtensionIs(sourceFile.fileName, ".d.ts") ? NodeFlags.DeclarationFile : 0; + sourceFile.flags = fileExtensionIs(sourceFile.fileName, "d.ts") ? NodeFlags.DeclarationFile : 0; sourceFile.languageVariant = isTsx(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; return sourceFile; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 7c9c7e103bc65..0110e0b529ab8 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -42,24 +42,24 @@ namespace ts { : compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic; switch (moduleResolution) { - case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, host); + case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, getSupportedExtensions(compilerOptions), host); case ModuleResolutionKind.Classic: return classicNameResolver(moduleName, containingFile, compilerOptions, host); } } - export function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + export function nodeModuleNameResolver(moduleName: string, containingFile: string, supportedExtensions: string[], host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { let containingDirectory = getDirectoryPath(containingFile); if (getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { let failedLookupLocations: string[] = []; let candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - let resolvedFileName = loadNodeModuleFromFile(candidate, /* loadOnlyDts */ false, failedLookupLocations, host); + let resolvedFileName = loadNodeModuleFromFile(candidate, supportedExtensions, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName }, failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(candidate, /* loadOnlyDts */ false, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(candidate, supportedExtensions, failedLookupLocations, host); return resolvedFileName ? { resolvedModule: { resolvedFileName }, failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations }; @@ -69,16 +69,11 @@ namespace ts { } } - function loadNodeModuleFromFile(candidate: string, loadOnlyDts: boolean, failedLookupLocation: string[], host: ModuleResolutionHost): string { - if (loadOnlyDts) { - return tryLoad(".d.ts"); - } - else { - return forEach(supportedExtensions, tryLoad); - } + function loadNodeModuleFromFile(candidate: string, supportedExtensions: string[], failedLookupLocation: string[], host: ModuleResolutionHost): string { + return forEach(supportedExtensions, tryLoad); function tryLoad(ext: string): string { - let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext; + let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + "." + ext; if (host.fileExists(fileName)) { return fileName; } @@ -89,7 +84,7 @@ namespace ts { } } - function loadNodeModuleFromDirectory(candidate: string, loadOnlyDts: boolean, failedLookupLocation: string[], host: ModuleResolutionHost): string { + function loadNodeModuleFromDirectory(candidate: string, supportedExtensions: string[], failedLookupLocation: string[], host: ModuleResolutionHost): string { let packageJsonPath = combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { @@ -105,7 +100,7 @@ namespace ts { } if (jsonContent.typings) { - let result = loadNodeModuleFromFile(normalizePath(combinePaths(candidate, jsonContent.typings)), loadOnlyDts, failedLookupLocation, host); + let result = loadNodeModuleFromFile(normalizePath(combinePaths(candidate, jsonContent.typings)), supportedExtensions, failedLookupLocation, host); if (result) { return result; } @@ -116,7 +111,7 @@ namespace ts { failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(combinePaths(candidate, "index"), loadOnlyDts, failedLookupLocation, host); + return loadNodeModuleFromFile(combinePaths(candidate, "index"), supportedExtensions, failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { @@ -127,12 +122,12 @@ namespace ts { if (baseName !== "node_modules") { let nodeModulesFolder = combinePaths(directory, "node_modules"); let candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName)); - let result = loadNodeModuleFromFile(candidate, /* loadOnlyDts */ true, failedLookupLocations, host); + let result = loadNodeModuleFromFile(candidate, /* loadOnlyDts */ ["d.ts"], failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } - result = loadNodeModuleFromDirectory(candidate, /* loadOnlyDts */ true, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(candidate, /* loadOnlyDts */ ["d.ts"], failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } @@ -169,14 +164,14 @@ namespace ts { let referencedSourceFile: string; while (true) { searchName = normalizePath(combinePaths(searchPath, moduleName)); - referencedSourceFile = forEach(supportedExtensions, extension => { - if (extension === ".tsx" && !compilerOptions.jsx) { + referencedSourceFile = forEach(getSupportedExtensions(compilerOptions), extension => { + if (extension === "tsx" && !compilerOptions.jsx) { // resolve .tsx files only if jsx support is enabled // 'logical not' handles both undefined and None cases return undefined; } - let candidate = searchName + extension; + let candidate = searchName + "." + extension; if (host.fileExists(candidate)) { return candidate; } @@ -368,13 +363,14 @@ namespace ts { } if (!tryReuseStructureFromOldProgram()) { - forEach(rootNames, name => processRootFile(name, false)); + let supportedExtensions = getSupportedExtensions(options); + forEach(rootNames, name => processRootFile(name, false, supportedExtensions)); // Do not process the default library if: // - The '--noLib' flag is used. // - A 'no-default-lib' reference comment is encountered in // processing the root files. if (!skipDefaultLib) { - processRootFile(host.getDefaultLibFileName(options), true); + processRootFile(host.getDefaultLibFileName(options), true, supportedExtensions); } } @@ -833,12 +829,8 @@ namespace ts { return sortAndDeduplicateDiagnostics(allDiagnostics); } - function hasExtension(fileName: string): boolean { - return getBaseFileName(fileName).indexOf(".") >= 0; - } - - function processRootFile(fileName: string, isDefaultLib: boolean) { - processSourceFile(normalizePath(fileName), isDefaultLib); + function processRootFile(fileName: string, isDefaultLib: boolean, supportedExtensions: string[]) { + processSourceFile(normalizePath(fileName), isDefaultLib, supportedExtensions); } function fileReferenceIsEqualTo(a: FileReference, b: FileReference): boolean { @@ -897,7 +889,7 @@ namespace ts { file.imports = imports || emptyArray; } - function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) { + function processSourceFile(fileName: string, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number) { let diagnosticArgument: string[]; let diagnostic: DiagnosticMessage; if (hasExtension(fileName)) { @@ -905,7 +897,7 @@ namespace ts { diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1; diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"]; } - else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) { + else if (!findSourceFile(fileName, isDefaultLib, supportedExtensions, refFile, refPos, refEnd)) { diagnostic = Diagnostics.File_0_not_found; diagnosticArgument = [fileName]; } @@ -915,14 +907,15 @@ namespace ts { } } else { - let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd); + let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, isDefaultLib, supportedExtensions, refFile, refPos, refEnd); if (!nonTsFile) { if (options.allowNonTsExtensions) { diagnostic = Diagnostics.File_0_not_found; diagnosticArgument = [fileName]; } - else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd))) { - diagnostic = Diagnostics.File_0_not_found; + else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + "." + extension, isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) { + // (TODO: shkamat) Should this message be different given we support multiple extensions + diagnostic = Diagnostics.File_0_not_found; fileName += ".ts"; diagnosticArgument = [fileName]; } @@ -940,7 +933,7 @@ namespace ts { } // Get source file from normalized fileName - function findSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { + function findSourceFile(fileName: string, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { let canonicalName = host.getCanonicalFileName(normalizeSlashes(fileName)); if (filesByName.contains(canonicalName)) { // We've already looked for this file, use cached result @@ -972,11 +965,11 @@ namespace ts { let basePath = getDirectoryPath(fileName); if (!options.noResolve) { - processReferencedFiles(file, basePath); + processReferencedFiles(file, basePath, supportedExtensions); } // always process imported modules to record module name resolutions - processImportedModules(file, basePath); + processImportedModules(file, basePath, supportedExtensions); if (isDefaultLib) { file.isDefaultLib = true; @@ -1008,14 +1001,14 @@ namespace ts { } } - function processReferencedFiles(file: SourceFile, basePath: string) { + function processReferencedFiles(file: SourceFile, basePath: string, supportedExtensions: string[]) { forEach(file.referencedFiles, ref => { let referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end); + processSourceFile(referencedFileName, /* isDefaultLib */ false, supportedExtensions, file, ref.pos, ref.end); }); } - function processImportedModules(file: SourceFile, basePath: string) { + function processImportedModules(file: SourceFile, basePath: string, supportedExtensions: string[]) { collectExternalModuleReferences(file); if (file.imports.length) { file.resolvedModules = {}; @@ -1025,13 +1018,13 @@ namespace ts { let resolution = resolutions[i]; setResolvedModule(file, moduleNames[i], resolution); if (resolution && !options.noResolve) { - const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]); + const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i], supportedExtensions); if (importedFile && resolution.isExternalLibraryImport) { if (!isExternalModule(importedFile)) { let start = getTokenPosOfNode(file.imports[i], file) fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName)); } - else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) { + else if (!fileExtensionIs(importedFile.fileName, "d.ts")) { let start = getTokenPosOfNode(file.imports[i], file) fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition)); } @@ -1049,8 +1042,8 @@ namespace ts { } return; - function findModuleSourceFile(fileName: string, nameLiteral: Expression) { - return findSourceFile(fileName, /* isDefaultLib */ false, file, skipTrivia(file.text, nameLiteral.pos), nameLiteral.end); + function findModuleSourceFile(fileName: string, nameLiteral: Expression, supportedExtensions: string[]) { + return findSourceFile(fileName, /* isDefaultLib */ false, supportedExtensions, file, skipTrivia(file.text, nameLiteral.pos), nameLiteral.end); } } diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 805275776ad0a..8c1bf962aaefe 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -223,13 +223,13 @@ namespace ts { } let configObject = result.config; - let configParseResult = parseConfigFile(configObject, sys, getDirectoryPath(configFileName)); + let configParseResult = parseConfigFile(configObject, sys, getDirectoryPath(configFileName), commandLine.options); if (configParseResult.errors.length > 0) { reportDiagnostics(configParseResult.errors); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } rootFileNames = configParseResult.fileNames; - compilerOptions = extend(commandLine.options, configParseResult.options); + compilerOptions = configParseResult.options; } else { rootFileNames = commandLine.fileNames; @@ -519,8 +519,8 @@ namespace ts { return; - function serializeCompilerOptions(options: CompilerOptions): Map { - let result: Map = {}; + function serializeCompilerOptions(options: CompilerOptions): Map { + let result: Map = {}; let optionsNameMap = getOptionNameMap().optionNameMap; for (let name in options) { @@ -537,8 +537,8 @@ namespace ts { let optionDefinition = optionsNameMap[name.toLowerCase()]; if (optionDefinition) { if (typeof optionDefinition.type === "string") { - // string, number or boolean - result[name] = value; + // string, number, boolean or string[] + result[name] = value; } else { // Enum diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9cd0024759335..174afe51bde59 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2062,15 +2062,17 @@ namespace ts { experimentalAsyncFunctions?: boolean; emitDecoratorMetadata?: boolean; moduleResolution?: ModuleResolutionKind; - consumeJsFiles?: boolean; + jsExtensions?: string[]; /* @internal */ stripInternal?: boolean; // Skip checking lib.d.ts to help speed up tests. /* @internal */ skipDefaultLibCheck?: boolean; - [option: string]: string | number | boolean; + [option: string]: CompilerOptionsValueType; } + export type CompilerOptionsValueType = string | number | boolean | string[]; + export const enum ModuleKind { None = 0, CommonJS = 1, @@ -2134,7 +2136,7 @@ namespace ts { /* @internal */ export interface CommandLineOptionOfCustomType extends CommandLineOptionBase { - type: Map; // an object literal mapping named values to actual values + type: Map | string; // an object literal mapping named values to actual values | string if it is string[] error: DiagnosticMessage; // The error given when the argument does not fit a customized 'type' } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 696d2f481e053..fd08d864a5567 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1783,13 +1783,17 @@ namespace ts { // 1. in-browser single file compilation scenario // 2. non supported extension file return compilerOptions.isolatedModules || - forEach(supportedExtensions, extension => fileExtensionIs(sourceFile.fileName, extension)); + forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(sourceFile.fileName, extension)); } return false; } return false; } + export function getSupportedExtensions(options: CompilerOptions): string[] { + return options.jsExtensions ? supportedTypeScriptExtensions.concat(options.jsExtensions) : supportedTypeScriptExtensions; + } + export function getAllAccessorDeclarations(declarations: NodeArray, accessor: AccessorDeclaration) { let firstAccessor: AccessorDeclaration; let secondAccessor: AccessorDeclaration; @@ -2063,13 +2067,18 @@ namespace ts { export function getLocalSymbolForExportDefault(symbol: Symbol) { return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & NodeFlags.Default) ? symbol.valueDeclaration.localSymbol : undefined; } + + export function hasExtension(fileName: string): boolean { + return getBaseFileName(fileName).indexOf(".") >= 0; + } export function isJavaScript(fileName: string) { - return fileExtensionIs(fileName, ".js"); + // Treat file as typescript if the extension is not supportedTypeScript + return hasExtension(fileName) && !forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension)); } export function isTsx(fileName: string) { - return fileExtensionIs(fileName, ".tsx"); + return fileExtensionIs(fileName, "tsx"); } /** diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index a24ed30ae143a..c4532293de091 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -148,7 +148,7 @@ class CompilerBaselineRunner extends RunnerBase { }); it("Correct JS output for " + fileName, () => { - if (!ts.fileExtensionIs(lastUnit.name, ".d.ts") && this.emit) { + if (!ts.fileExtensionIs(lastUnit.name, "d.ts") && this.emit) { if (result.files.length === 0 && result.errors.length === 0) { throw new Error("Expected at least one js file to be emitted or at least one error to be created."); } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index bd7072177dfe4..a04b3af84cabe 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -996,23 +996,17 @@ module Harness { } let option = getCommandLineOption(name); if (option) { - switch (option.type) { - case "boolean": - options[option.name] = value.toLowerCase() === "true"; - break; - case "string": - options[option.name] = value; - break; - // If not a primitive, the possible types are specified in what is effectively a map of options. - default: - let map = >option.type; - let key = value.toLowerCase(); - if (ts.hasProperty(map, key)) { - options[option.name] = map[key]; - } - else { - throw new Error(`Unknown value '${value}' for compiler option '${name}'.`); - } + if (option.type === "boolean") { + options[option.name] = value.toLowerCase() === "true"; + } + else { + let { hasError, value: parsedValue } = ts.parseOption(option, value, options[option.name]); + if (hasError) { + throw new Error(`Unknown value '${value}' for compiler option '${name}'.`); + } + else { + options[option.name] = parsedValue; + } } } else { diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 32e61cb8d7b71..a250cb3daacab 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -2,7 +2,7 @@ /// // Test case is json of below type in tests/cases/project/ -interface ProjectRunnerTestCase { +interface ProjectRunnerTestCase extends ts.CompilerOptions{ scenario: string; projectRoot: string; // project where it lives - this also is the current directory when compiling inputFiles: string[]; // list of input files to be given to program @@ -50,7 +50,7 @@ class ProjectRunner extends RunnerBase { } private runProjectTestCase(testCaseFileName: string) { - let testCase: ProjectRunnerTestCase & ts.CompilerOptions; + let testCase: ProjectRunnerTestCase; let testFileText: string = null; try { @@ -61,7 +61,7 @@ class ProjectRunner extends RunnerBase { } try { - testCase = JSON.parse(testFileText); + testCase = JSON.parse(testFileText); } catch (e) { assert(false, "Testcase: " + testCaseFileName + " does not contain valid json format: " + e.message); @@ -181,8 +181,13 @@ class ProjectRunner extends RunnerBase { let nonSubfolderDiskFiles = 0; let outputFiles: BatchCompileProjectTestCaseEmittedFile[] = []; - let compilerOptions = createCompilerOptions(); let inputFiles = testCase.inputFiles; + let { errors, compilerOptions } = createCompilerOptions(); + if (errors.length) { + moduleKind, + errors + }; + let configFileName: string; if (compilerOptions.project) { // Parse project @@ -203,7 +208,7 @@ class ProjectRunner extends RunnerBase { } let configObject = result.config; - let configParseResult = ts.parseConfigFile(configObject, { fileExists, readFile: getSourceFileText, readDirectory }, ts.getDirectoryPath(configFileName)); + let configParseResult = ts.parseConfigFile(configObject, { fileExists, readFile: getSourceFileText, readDirectory }, ts.getDirectoryPath(configFileName), compilerOptions); if (configParseResult.errors.length > 0) { return { moduleKind, @@ -211,7 +216,7 @@ class ProjectRunner extends RunnerBase { }; } inputFiles = configParseResult.fileNames; - compilerOptions = ts.extend(compilerOptions, configParseResult.options); + compilerOptions = configParseResult.options; } let projectCompilerResult = compileProjectFiles(moduleKind, () => inputFiles, getSourceFileText, writeFile, compilerOptions); @@ -224,7 +229,7 @@ class ProjectRunner extends RunnerBase { errors: projectCompilerResult.errors, }; - function createCompilerOptions(): ts.CompilerOptions { + function createCompilerOptions() { // Set the special options that depend on other testcase options let compilerOptions: ts.CompilerOptions = { mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? Harness.IO.resolvePath(testCase.mapRoot) : testCase.mapRoot, @@ -232,7 +237,7 @@ class ProjectRunner extends RunnerBase { module: moduleKind, moduleResolution: ts.ModuleResolutionKind.Classic, // currently all tests use classic module resolution kind, this will change in the future }; - + let errors: ts.Diagnostic[] = []; // Set the values specified using json let optionNameMap: ts.Map = {}; ts.forEach(ts.optionDeclarations, option => { @@ -241,19 +246,14 @@ class ProjectRunner extends RunnerBase { for (let name in testCase) { if (name !== "mapRoot" && name !== "sourceRoot" && ts.hasProperty(optionNameMap, name)) { let option = optionNameMap[name]; - let optType = option.type; - let value = testCase[name]; - if (typeof optType !== "string") { - let key = value.toLowerCase(); - if (ts.hasProperty(optType, key)) { - value = optType[key]; - } + let { hasValidValue, value } = ts.parseJsonCompilerOption(option, testCase[name], errors); + if (hasValidValue) { + compilerOptions[option.name] = value; } - compilerOptions[option.name] = value; } } - return compilerOptions; + return { errors, compilerOptions }; } function getFileNameInTheProjectTest(fileName: string): string { @@ -389,11 +389,11 @@ class ProjectRunner extends RunnerBase { } function getErrorsBaseline(compilerResult: CompileProjectFilesResult) { - let inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(), + let inputFiles = compilerResult.program ? ts.map(ts.filter(compilerResult.program.getSourceFiles(), sourceFile => sourceFile.fileName !== "lib.d.ts"), sourceFile => { return { unitName: sourceFile.fileName, content: sourceFile.text }; - }); + }): []; return Harness.Compiler.getErrorBaseline(inputFiles, compilerResult.errors); } diff --git a/src/services/services.ts b/src/services/services.ts index d18fa1506abf9..6517e0c0a4a59 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1868,7 +1868,7 @@ namespace ts { let compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { - if (fileExtensionIs(name, ".map")) { + if (fileExtensionIs(name, "map")) { Debug.assert(sourceMapText === undefined, `Unexpected multiple source map outputs for the file '${name}'`); sourceMapText = text; } diff --git a/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt new file mode 100644 index 0000000000000..4276669ff768a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt @@ -0,0 +1,6 @@ +error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. + + +!!! error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +==== tests/cases/compiler/a.js (0 errors) ==== + declare var v; \ No newline at end of file diff --git a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt index de21d58456f82..76d5def7b5c48 100644 --- a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. \ No newline at end of file diff --git a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt index de21d58456f82..76d5def7b5c48 100644 --- a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json similarity index 63% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json index c2cd78e81188e..eb3813ca14200 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json @@ -1,13 +1,13 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles", + "project": "DifferentNamesNotSpecifiedWithJsExtensions", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts", - "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js" + "DifferentNamesNotSpecifiedWithJsExtensions/a.ts", + "DifferentNamesNotSpecifiedWithJsExtensions/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json similarity index 63% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json index c2cd78e81188e..eb3813ca14200 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json @@ -1,13 +1,13 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles", + "project": "DifferentNamesNotSpecifiedWithJsExtensions", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts", - "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js" + "DifferentNamesNotSpecifiedWithJsExtensions/a.ts", + "DifferentNamesNotSpecifiedWithJsExtensions/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt new file mode 100644 index 0000000000000..a7fd60e03d5cf --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt @@ -0,0 +1,6 @@ +error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. + + +!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +==== DifferentNamesSpecified/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json index 555acda2cd6bf..36eed6a651812 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json @@ -6,8 +6,7 @@ "project": "DifferentNamesSpecified", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesSpecified/a.ts", - "DifferentNamesSpecified/b.js" + "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt new file mode 100644 index 0000000000000..a7fd60e03d5cf --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt @@ -0,0 +1,6 @@ +error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. + + +!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +==== DifferentNamesSpecified/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json index 555acda2cd6bf..36eed6a651812 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json @@ -6,8 +6,7 @@ "project": "DifferentNamesSpecified", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesSpecified/a.ts", - "DifferentNamesSpecified/b.js" + "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..6c58345617a1a --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesSpecifiedWithJsExtensions/a.ts", + "DifferentNamesSpecifiedWithJsExtensions/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..6c58345617a1a --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json @@ -0,0 +1,16 @@ +{ + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "DifferentNamesSpecifiedWithJsExtensions/a.ts", + "DifferentNamesSpecifiedWithJsExtensions/b.js" + ], + "emittedFiles": [ + "test.js", + "test.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json similarity index 55% rename from tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json index 4a3803ead63cb..867227ec4e35a 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json @@ -1,12 +1,12 @@ { - "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles", + "project": "SameNameDTsSpecifiedWithJsExtensions", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts" + "SameNameDTsSpecifiedWithJsExtensions/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json similarity index 55% rename from tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json index 4a3803ead63cb..867227ec4e35a 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json @@ -1,12 +1,12 @@ { - "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles", + "project": "SameNameDTsSpecifiedWithJsExtensions", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts" + "SameNameDTsSpecifiedWithJsExtensions/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..ffdfdf24e3950 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..ffdfdf24e3950 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json @@ -0,0 +1,12 @@ +{ + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts" + ], + "emittedFiles": [] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json deleted file mode 100644 index 0970535d97a48..0000000000000 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", - "projectRoot": "tests/cases/projects/jsFileCompilation", - "baselineCheck": true, - "declaration": true, - "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles", - "resolvedInputFiles": [ - "lib.d.ts", - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts" - ], - "emittedFiles": [ - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js", - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts" - ] -} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json deleted file mode 100644 index 0970535d97a48..0000000000000 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", - "projectRoot": "tests/cases/projects/jsFileCompilation", - "baselineCheck": true, - "declaration": true, - "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles", - "resolvedInputFiles": [ - "lib.d.ts", - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts" - ], - "emittedFiles": [ - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js", - "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts" - ] -} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..93fee268825c5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecifiedWithJsExtensions/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecifiedWithJsExtensions/a.js", + "SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..93fee268825c5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameFilesNotSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameFilesNotSpecifiedWithJsExtensions/a.ts" + ], + "emittedFiles": [ + "SameNameFilesNotSpecifiedWithJsExtensions/a.js", + "SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..0adbe74627f82 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameTsSpecifiedWithJsExtensions/a.ts" + ], + "emittedFiles": [ + "SameNameTsSpecifiedWithJsExtensions/a.js", + "SameNameTsSpecifiedWithJsExtensions/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..e757934f20cc5 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..0adbe74627f82 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json @@ -0,0 +1,15 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecifiedWithJsExtensions", + "resolvedInputFiles": [ + "lib.d.ts", + "SameNameTsSpecifiedWithJsExtensions/a.ts" + ], + "emittedFiles": [ + "SameNameTsSpecifiedWithJsExtensions/a.js", + "SameNameTsSpecifiedWithJsExtensions/a.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts index 636866e7eeb79..6cb565e4c9fb0 100644 --- a/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js declare var v; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts index 2670e1503a915..1dd1cf453f284 100644 --- a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js @internal class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts index 53ed217c2b57c..5e670172c15e9 100644 --- a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts +++ b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts index 88931fa2eaffb..2ac1ea3ba519b 100644 --- a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts +++ b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationEnumSyntax.ts b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts index ad1126ebf27a8..5a466ef57652e 100644 --- a/tests/cases/compiler/jsFileCompilationEnumSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js enum E { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts index f02035c3f65c0..0b5545741b2de 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @declaration: true // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts index 04945af8205a6..22d9e3c269eff 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts index 42a6e36efc867..cea0dfe700dd6 100644 --- a/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js export = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts index 0a289515cb3c7..bfebbfd9966f9 100644 --- a/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js class C implements D { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts index 85e9a7efb6d19..3c10227019613 100644 --- a/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js import a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts index 014edddc34190..172bf01b803dc 100644 --- a/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js interface I { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts index 4de8f393a9389..c9762553028e5 100644 --- a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js module M { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts index fc6acef20ee17..c089979ecbc05 100644 --- a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts index 3ed1ca1039dc6..83c752f7292c3 100644 --- a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: out.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationOptionalParameter.ts b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts index 47b445e38aceb..962c73214752a 100644 --- a/tests/cases/compiler/jsFileCompilationOptionalParameter.ts +++ b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js function F(p?) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts index 209efc3e12eab..24a0f2389ddd7 100644 --- a/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js class C { v } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts index cd59f862ac841..8c678eed588ec 100644 --- a/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @filename: a.js class C { public foo() { diff --git a/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts index cb7a051016d13..8594e011d3c47 100644 --- a/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts +++ b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js class C { constructor(public x) { }} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationRestParameter.ts b/tests/cases/compiler/jsFileCompilationRestParameter.ts index 71d04eec64e42..22ccf24bae334 100644 --- a/tests/cases/compiler/jsFileCompilationRestParameter.ts +++ b/tests/cases/compiler/jsFileCompilationRestParameter.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @filename: a.js // @target: es6 // @out: b.js diff --git a/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts index 01080ef8556dc..183ace7ce10e6 100644 --- a/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts +++ b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js function F(): number { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationSyntaxError.ts b/tests/cases/compiler/jsFileCompilationSyntaxError.ts index e6d379e0e3ba9..d6f10ce47c4a7 100644 --- a/tests/cases/compiler/jsFileCompilationSyntaxError.ts +++ b/tests/cases/compiler/jsFileCompilationSyntaxError.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @filename: a.js /** * @type {number} diff --git a/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts index d4b9aeb0b812c..d77d35c011ae6 100644 --- a/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js type a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts index 2a8d892c80d2c..e2aca1007b234 100644 --- a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts +++ b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js Foo(); \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts index 29f0c18c81b90..45f76c78bfb90 100644 --- a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts +++ b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js var v = undefined; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts index f7c98808ad5d9..a989a8e2a3058 100644 --- a/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts +++ b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js function F(a: number) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts index 6b340a63dda8a..5242a2f7e7a23 100644 --- a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts index 5e2581676b8f5..a6f27b787eb9d 100644 --- a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js function F() { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts index e6289fd6eb090..1e2641dd8d192 100644 --- a/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts +++ b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts @@ -1,2 +1,3 @@ +// @jsExtensions: js // @filename: a.js var v: () => number; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithOut.ts b/tests/cases/compiler/jsFileCompilationWithOut.ts index 47ca5115cbb96..595cba8ffd3c6 100644 --- a/tests/cases/compiler/jsFileCompilationWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationWithOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: out.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts index da7d99dc5e7fb..ce97a6635c585 100644 --- a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts +++ b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @out: tests/cases/compiler/b.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationWithoutJsExtensions.ts b/tests/cases/compiler/jsFileCompilationWithoutJsExtensions.ts new file mode 100644 index 0000000000000..636866e7eeb79 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithoutJsExtensions.ts @@ -0,0 +1,2 @@ +// @filename: a.js +declare var v; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithoutOut.ts b/tests/cases/compiler/jsFileCompilationWithoutOut.ts index 2936f2eda7c7e..6cc6c7b50b1ea 100644 --- a/tests/cases/compiler/jsFileCompilationWithoutOut.ts +++ b/tests/cases/compiler/jsFileCompilationWithoutOut.ts @@ -1,3 +1,4 @@ +// @jsExtensions: js // @filename: a.ts class c { } diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json similarity index 73% rename from tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json rename to tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json index 0571c55820f2d..50cd978a7126e 100644 --- a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json +++ b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json @@ -1,7 +1,7 @@ { - "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true", + "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles" + "project": "DifferentNamesNotSpecifiedWithJsExtensions" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..a15686497c5df --- /dev/null +++ b/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when different .ts and .js file exist and their names are specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "DifferentNamesSpecifiedWithJsExtensions" +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json similarity index 55% rename from tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json rename to tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json index 41a19f64c5cf2..f0341ee905fa0 100644 --- a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json +++ b/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json @@ -1,7 +1,7 @@ { - "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .d.ts and .js file exists in the folder but .d.ts file is specified in tsconfig.json and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles" + "project": "SameNameDTsSpecifiedWithJsExtensions" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..4ce47779ea409 --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .d.ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameDTsNotSpecifiedWithJsExtensions" +} \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json similarity index 55% rename from tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json rename to tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json index d8cb3f952ba9a..d151f7d499f4d 100644 --- a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json +++ b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json @@ -1,7 +1,7 @@ { - "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true", + "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and .js files are consumed", "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles" + "project": "SameNameFilesNotSpecifiedWithJsExtensions" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json new file mode 100644 index 0000000000000..da24d83de8473 --- /dev/null +++ b/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json @@ -0,0 +1,7 @@ +{ + "scenario": "Verify when same named .ts and .js file exists in the folder but .ts file is specified in tsconfig.json and .js files are consumed", + "projectRoot": "tests/cases/projects/jsFileCompilation", + "baselineCheck": true, + "declaration": true, + "project": "SameNameTsSpecifiedWithJsExtensions" +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/a.ts diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/b.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/b.js diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json similarity index 60% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json index 9be9952dd2b7f..b3fb530a291c9 100644 --- a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { "out": "test.js", - "consumeJsFiles": true + "jsExtensions": [ "js" ] } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts rename to tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/a.ts diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js new file mode 100644 index 0000000000000..9fdf6253b8006 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js @@ -0,0 +1 @@ +var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..f52029d734ee8 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1,7 @@ +{ + "compilerOptions": { + "out": "test.js", + "jsExtensions": [ "js" ] + }, + "files": [ "a.ts", "b.js" ] +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..d9e24d329b733 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var test: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js rename to tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..de14c20c66291 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": { "jsExtensions": [ "js" ] }, + "files": [ "a.d.ts" ] +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json deleted file mode 100644 index df05c5d4d5290..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "consumeJsFiles": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts rename to tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js rename to tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..e14243307e2f2 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json deleted file mode 100644 index df05c5d4d5290..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "consumeJsFiles": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..e14243307e2f2 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts new file mode 100644 index 0000000000000..6d820a0093e01 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts @@ -0,0 +1 @@ +var test = 10; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..8f3028a8ad177 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": { "jsExtensions": [ "js" ] }, + "files": [ "a.ts" ] +} \ No newline at end of file diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 262430db86a72..46a283b5e2c83 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -36,21 +36,21 @@ module ts { describe("Node module resolution - relative paths", () => { function testLoadAsFile(containingFileName: string, moduleFileNameNoExt: string, moduleName: string): void { - for (let ext of supportedExtensions) { + for (let ext of supportedTypeScriptExtensions) { let containingFile = { name: containingFileName } - let moduleFile = { name: moduleFileNameNoExt + ext } - let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, moduleFile)); + let moduleFile = { name: moduleFileNameNoExt + "." + ext } + let resolution = nodeModuleNameResolver(moduleName, containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); let failedLookupLocations: string[] = []; let dir = getDirectoryPath(containingFileName); - for (let e of supportedExtensions) { + for (let e of supportedTypeScriptExtensions) { if (e === ext) { break; } else { - failedLookupLocations.push(normalizePath(getRootLength(moduleName) === 0 ? combinePaths(dir, moduleName) : moduleName) + e); + failedLookupLocations.push(normalizePath(getRootLength(moduleName) === 0 ? combinePaths(dir, moduleName) : moduleName) + "." + e); } } @@ -78,11 +78,11 @@ module ts { let containingFile = { name: containingFileName }; let packageJson = { name: packageJsonFileName, content: JSON.stringify({ "typings": fieldRef }) }; let moduleFile = { name: moduleFileName }; - let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, packageJson, moduleFile)); + let resolution = nodeModuleNameResolver(moduleName, containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, packageJson, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); // expect three failed lookup location - attempt to load module as file with all supported extensions - assert.equal(resolution.failedLookupLocations.length, ts.supportedExtensions.length); + assert.equal(resolution.failedLookupLocations.length, supportedTypeScriptExtensions.length); } it("module name as directory - load from typings", () => { @@ -96,14 +96,13 @@ module ts { let containingFile = {name: "/a/b/c.ts"}; let packageJson = {name: "/a/b/foo/package.json", content: JSON.stringify({main: "/c/d"})}; let indexFile = { name: "/a/b/foo/index.d.ts" }; - let resolution = nodeModuleNameResolver("./foo", containingFile.name, createModuleResolutionHost(containingFile, packageJson, indexFile)); + let resolution = nodeModuleNameResolver("./foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, packageJson, indexFile)); assert.equal(resolution.resolvedModule.resolvedFileName, indexFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); assert.deepEqual(resolution.failedLookupLocations, [ "/a/b/foo.ts", "/a/b/foo.tsx", "/a/b/foo.d.ts", - "/a/b/foo.js", "/a/b/foo/index.ts", "/a/b/foo/index.tsx", ]); @@ -114,7 +113,7 @@ module ts { it("load module as file - ts files not loaded", () => { let containingFile = { name: "/a/b/c/d/e.ts" }; let moduleFile = { name: "/a/b/node_modules/foo.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule, undefined); assert.deepEqual(resolution.failedLookupLocations, [ "/a/b/c/d/node_modules/foo.d.ts", @@ -138,7 +137,7 @@ module ts { it("load module as file", () => { let containingFile = { name: "/a/b/c/d/e.ts" }; let moduleFile = { name: "/a/b/node_modules/foo.d.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(resolution.resolvedModule.isExternalLibraryImport, true); }); @@ -146,7 +145,7 @@ module ts { it("load module as directory", () => { let containingFile = { name: "/a/node_modules/b/c/node_modules/d/e.ts" }; let moduleFile = { name: "/a/node_modules/foo/index.d.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(resolution.resolvedModule.isExternalLibraryImport, true); assert.deepEqual(resolution.failedLookupLocations, [ From 271003008edb8c68d365db95713e824e611cd85f Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 22 Sep 2015 17:53:20 +0900 Subject: [PATCH 028/353] format/existence check --- src/compiler/diagnosticMessages.json | 18 +++++++++++++----- src/compiler/tsc.ts | 8 ++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index c1657a81babb5..1f1874946397e 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1623,7 +1623,7 @@ }, "Cannot assign an abstract constructor type to a non-abstract constructor type.": { "category": "Error", - "code":2517 + "code": 2517 }, "Only an ambient class can be merged with an interface.": { "category": "Error", @@ -1700,11 +1700,11 @@ "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead.": { "category": "Error", "code": 2652 - }, + }, "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'.": { "category": "Error", "code": 2653 - }, + }, "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.": { "category": "Error", "code": 2654 @@ -1712,11 +1712,11 @@ "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition.": { "category": "Error", "code": 2655 - }, + }, "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition.": { "category": "Error", "code": 2656 - }, + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", "code": 4000 @@ -2057,6 +2057,14 @@ "category": "Error", "code": 5053 }, + "The project file name is not in 'tsconfig-*.json' format: '{0}'": { + "category": "Error", + "code": 5055 + }, + "Cannot find any project file in specified path: '{0}'": { + "category": "Error", + "code": 5056 + }, "Concatenate and emit output to single file.": { "category": "Message", diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 25e149cf6ca27..3aedd5efd11c8 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -190,8 +190,16 @@ namespace ts { configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); } else { + if (!/^tsconfig.*\.json$/.test(getBaseFileName(fileOrDirectory))) { + reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project)); + return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); + } configFileName = fileOrDirectory; } + if (!sys.fileExists(configFileName)) { + reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project)); + return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); + } } else if (commandLine.fileNames.length === 0 && isJSONSupported()) { let searchPath = normalizePath(sys.getCurrentDirectory()); From 00a373a5ef29904e84c7c4ae026bf551393eac20 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 22 Sep 2015 18:09:54 +0900 Subject: [PATCH 029/353] update regex for filename --- src/compiler/diagnosticMessages.json | 2 +- src/compiler/tsc.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 8fbea626eea09..6c180921d4f76 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2056,7 +2056,7 @@ "category": "Error", "code": 5054 }, - "The project file name is not in 'tsconfig-*.json' format: '{0}'": { + "The project file name is not in 'tsconfig(-*).json' format: '{0}'": { "category": "Error", "code": 5055 }, diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 3aedd5efd11c8..67f7ee2aaada0 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -186,11 +186,11 @@ namespace ts { } let fileOrDirectory = normalizePath(commandLine.options.project); - if (!fileOrDirectory || sys.directoryExists(fileOrDirectory)) { + if (!fileOrDirectory /* current directory */ || sys.directoryExists(fileOrDirectory)) { configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); } else { - if (!/^tsconfig.*\.json$/.test(getBaseFileName(fileOrDirectory))) { + if (!/^tsconfig(?:-.*)?.json$/.test(getBaseFileName(fileOrDirectory))) { reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project)); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } From c8509196141c9bc307836e59ac5c8058d212ac9f Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 22 Sep 2015 18:17:03 +0900 Subject: [PATCH 030/353] \. instead of . --- src/compiler/tsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 67f7ee2aaada0..b133f9e986e9c 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -190,7 +190,7 @@ namespace ts { configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); } else { - if (!/^tsconfig(?:-.*)?.json$/.test(getBaseFileName(fileOrDirectory))) { + if (!/^tsconfig(?:-.*)?\.json$/.test(getBaseFileName(fileOrDirectory))) { reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project)); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } From 7f09c8125141b897e0676807ea727199e79896f6 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 22 Sep 2015 12:33:20 -0700 Subject: [PATCH 031/353] Syntax changes if the extensions to treat as javascript change --- src/compiler/program.ts | 3 ++- src/services/services.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 0110e0b529ab8..f6daf4880b686 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -357,7 +357,8 @@ namespace ts { (oldOptions.noResolve !== options.noResolve) || (oldOptions.target !== options.target) || (oldOptions.noLib !== options.noLib) || - (oldOptions.jsx !== options.jsx)) { + (oldOptions.jsx !== options.jsx) || + (oldOptions.jsExtensions !== options.jsExtensions)) { oldProgram = undefined; } } diff --git a/src/services/services.ts b/src/services/services.ts index 6517e0c0a4a59..421f46b3bc68c 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1995,7 +1995,7 @@ namespace ts { let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { - return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx; + return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.jsExtensions; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { @@ -2625,7 +2625,8 @@ namespace ts { (oldSettings.target !== newSettings.target || oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || - oldSettings.jsx !== newSettings.jsx); + oldSettings.jsx !== newSettings.jsx || + oldSettings.jsExtensions !== newSettings.jsExtensions); // Now create a new compiler let compilerHost: CompilerHost = { From 607564f2e2845c14546e32393c7a5c3091111240 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 22 Sep 2015 12:09:23 -0700 Subject: [PATCH 032/353] Parse all the javascript files with JSX grammer --- src/compiler/parser.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 27d85a3b4a885..89ef8b1485c27 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -530,6 +530,10 @@ namespace ts { return result; } + function getLanguageVariant(fileName: string) { + return isTsx(fileName) || isJavaScript(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; + } + function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor) { sourceText = _sourceText; syntaxCursor = _syntaxCursor; @@ -547,7 +551,7 @@ namespace ts { scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(isTsx(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard); + scanner.setLanguageVariant(getLanguageVariant(fileName)); } function clearState() { @@ -660,7 +664,7 @@ namespace ts { sourceFile.languageVersion = languageVersion; sourceFile.fileName = normalizePath(fileName); sourceFile.flags = fileExtensionIs(sourceFile.fileName, "d.ts") ? NodeFlags.DeclarationFile : 0; - sourceFile.languageVariant = isTsx(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; + sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName); return sourceFile; } From 0fe282e71994ac950e32b8040e714f563609a32f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 22 Sep 2015 12:50:25 -0700 Subject: [PATCH 033/353] Update the type assertion errors to jsx syntax error as we are treating js files as jsx files --- .../jsFileCompilationTypeAssertions.errors.txt | 6 +++--- .../fourslash/getJavaScriptSemanticDiagnostics20.ts | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index de1e1038db641..6d4ef23dcc683 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. +tests/cases/compiler/a.js(1,27): error TS17002: Expected corresponding JSX closing tag for 'string'. ==== tests/cases/compiler/a.js (1 errors) ==== var v = undefined; - ~~~~~~ -!!! error TS8016: 'type assertion expressions' can only be used in a .ts file. \ No newline at end of file + +!!! error TS17002: Expected corresponding JSX closing tag for 'string'. \ No newline at end of file diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts index 790f02bac92d0..5172ee7701cc4 100644 --- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts +++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts @@ -4,12 +4,13 @@ // @Filename: a.js //// var v = undefined; -verify.getSemanticDiagnostics(`[ +verify.getSyntacticDiagnostics(`[ { - "message": "'type assertion expressions' can only be used in a .ts file.", - "start": 9, - "length": 6, + "message": "Expected corresponding JSX closing tag for 'string'.", + "start": 26, + "length": 0, "category": "error", - "code": 8016 + "code": 17002 } -]`); \ No newline at end of file +]`); +verify.getSemanticDiagnostics(`[]`); \ No newline at end of file From 311a0cff55e5837f9972fb43d65e06768babccc5 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 10 Sep 2015 17:58:54 -0700 Subject: [PATCH 034/353] Added tests. --- .../stringLiteralTypesAsTags01.ts | 43 +++++++++++++++ .../stringLiteralTypesInUnionTypes01.ts | 21 ++++++++ .../stringLiteralTypesInUnionTypes02.ts | 21 ++++++++ .../stringLiteralTypesInUnionTypes03.ts | 21 ++++++++ .../stringLiteralTypesInUnionTypes04.ts | 38 +++++++++++++ ...ingLiteralTypesInVariableDeclarations01.ts | 19 +++++++ .../stringLiteralTypesOverloads01.ts | 53 +++++++++++++++++++ .../stringLiteralTypesOverloads02.ts | 51 ++++++++++++++++++ .../stringLiteralTypesTypePredicates01.ts | 25 +++++++++ 9 files changed, 292 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts new file mode 100644 index 0000000000000..cea04f0818e75 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts @@ -0,0 +1,43 @@ +// @declaration: true + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +function hasKind(entity: Entity, kind: "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is Entity; +function hasKind(entity: Entity, kind: Kind): boolean { + return kind === is; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts new file mode 100644 index 0000000000000..b8ed1b47dd404 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts @@ -0,0 +1,21 @@ +// @declaration: true + +type T = "foo" | "bar" | "baz"; + +var x: "foo" | "bar" | "baz" = "foo"; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts new file mode 100644 index 0000000000000..2cc63ab44605d --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts @@ -0,0 +1,21 @@ +// @declaration: true + +type T = string | "foo" | "bar" | "baz"; + +var x: "foo" | "bar" | "baz" | string = "foo"; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts new file mode 100644 index 0000000000000..d5c6a38af799c --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts @@ -0,0 +1,21 @@ +// @declaration: true + +type T = number | "foo" | "bar"; + +var x: "foo" | "bar" | number; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts new file mode 100644 index 0000000000000..e9d062b0e5c20 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts @@ -0,0 +1,38 @@ +// @declaration: true + +type T = "" | "foo"; + +let x: T = ""; +let y: T = "foo"; + +if (x === "") { + let a = x; +} + +if (x !== "") { + let b = x; +} + +if (x == "") { + let c = x; +} + +if (x != "") { + let d = x; +} + +if (x) { + let e = x; +} + +if (!x) { + let f = x; +} + +if (!!x) { + let g = x; +} + +if (!!!x) { + let h = x; +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts new file mode 100644 index 0000000000000..4f0063876876a --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts @@ -0,0 +1,19 @@ +// @declaration: true + +let a: ""; +var b: "foo"; +let c: "bar"; +const d: "baz"; + +a = ""; +b = "foo"; +c = "bar"; + +let e: "" = ""; +var f: "foo" = "foo"; +let g: "bar" = "bar"; +const h: "baz" = "baz"; + +e = ""; +f = "foo"; +g = "bar"; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts new file mode 100644 index 0000000000000..d88167eaeffe7 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts @@ -0,0 +1,53 @@ +// @declaration: true + +type PrimitiveName = 'string' | 'number' | 'boolean'; + +function getFalsyPrimitive(x: "string"): string; +function getFalsyPrimitive(x: "number"): number; +function getFalsyPrimitive(x: "boolean"): boolean; +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +function getFalsyPrimitive(x: "number" | "string"): number | string; +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +function getFalsyPrimitive(x: PrimitiveName) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; +} + +namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); +} + +const string: "string" = "string" +const number: "number" = "number" +const boolean: "boolean" = "boolean" + +const stringOrNumber = string || number; +const stringOrBoolean = string || boolean; +const booleanOrNumber = number || boolean; +const stringOrBooleanOrNumber = stringOrBoolean || number; + +namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +} + + diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts new file mode 100644 index 0000000000000..5801aa50076b2 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts @@ -0,0 +1,51 @@ +// @declaration: true + +function getFalsyPrimitive(x: "string"): string; +function getFalsyPrimitive(x: "number"): number; +function getFalsyPrimitive(x: "boolean"): boolean; +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +function getFalsyPrimitive(x: "number" | "string"): number | string; +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +function getFalsyPrimitive(x: string) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; +} + +namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); +} + +const string: "string" = "string" +const number: "number" = "number" +const boolean: "boolean" = "boolean" + +const stringOrNumber = string || number; +const stringOrBoolean = string || boolean; +const booleanOrNumber = number || boolean; +const stringOrBooleanOrNumber = stringOrBoolean || number; + +namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +} + + diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts new file mode 100644 index 0000000000000..a78918c8122be --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts @@ -0,0 +1,25 @@ +// @declaration: true + +type Kind = "A" | "B" + +function kindIs(kind: Kind, is: "A"): kind is "A"; +function kindIs(kind: Kind, is: "B"): kind is "B"; +function kindIs(kind: Kind, is: Kind): boolean { + return kind === is; +} + +var x: Kind = "A"; + +if (kindIs(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!kindIs(x, "B")) { + let c = x; +} +else { + let d = x; +} \ No newline at end of file From 911e90730601f35a24dcd16d2e6d5f4fc6b12529 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 15:26:48 -0700 Subject: [PATCH 035/353] Added test for string literal types in type arguments. --- .../typeArgumentsWithStringLiteralTypes01.ts | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts diff --git a/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts b/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts new file mode 100644 index 0000000000000..08c971458e354 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts @@ -0,0 +1,113 @@ +// @declaration: true + +declare function randBool(): boolean; +declare function takeReturnString(str: string): string; +declare function takeReturnHello(str: "Hello"): "Hello"; +declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; + +function fun1(x: T, y: T) { + return randBool() ? x : y; +} + +function fun2(x: T, y: U) { + return randBool() ? x : y; +} + +function fun3(...args: T[]): T { + return args[+randBool()]; +} + +namespace n1 { + // The following should all come back as strings. + // They should be assignable to/from something of a type 'string'. + // They should not be assignable to either "Hello" or "World". + export let a = fun1("Hello", "World"); + export let b = fun1("Hello", "Hello"); + export let c = fun2("Hello", "World"); + export let d = fun2("Hello", "Hello"); + export let e = fun3("Hello", "Hello", "World", "Foo"); + + // Should be valid + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Passing these as arguments should cause an error. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} + +namespace n2 { + // The following (regardless of errors) should come back typed + // as "Hello" (or "Hello" | "Hello"). + export let a = fun1<"Hello">("Hello", "Hello"); + export let b = fun1<"Hello">("Hello", "World"); + export let c = fun2<"Hello", "Hello">("Hello", "Hello"); + export let d = fun2<"Hello", "Hello">("Hello", "World"); + export let e = fun3<"Hello">("Hello", "World"); + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Should be valid + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Assignment from the returned value should cause an error. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} + + +namespace n3 { + // The following (regardless of errors) should come back typed + // as "Hello" | "World" (or "World" | "Hello"). + export let a = fun2<"Hello", "World">("Hello", "World"); + export let b = fun2<"Hello", "World">("World", "Hello"); + export let c = fun2<"World", "Hello">("Hello", "Hello"); + export let d = fun2<"World", "Hello">("World", "World"); + export let e = fun3<"Hello" | "World">("Hello", "World"); + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Both should be valid. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} \ No newline at end of file From f04cc39a68a7a576ca9e6b7149b076cd9eb95fd9 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 15:54:16 -0700 Subject: [PATCH 036/353] Accepted baselines. --- .../stringLiteralTypesAsTags01.errors.txt | 86 +++++ .../reference/stringLiteralTypesAsTags01.js | 65 ++++ ...tringLiteralTypesInUnionTypes01.errors.txt | 59 ++++ .../stringLiteralTypesInUnionTypes01.js | 40 +++ ...tringLiteralTypesInUnionTypes02.errors.txt | 62 ++++ .../stringLiteralTypesInUnionTypes02.js | 40 +++ ...tringLiteralTypesInUnionTypes03.errors.txt | 50 +++ .../stringLiteralTypesInUnionTypes03.js | 39 +++ ...tringLiteralTypesInUnionTypes04.errors.txt | 52 +++ .../stringLiteralTypesInUnionTypes04.js | 67 ++++ ...alTypesInVariableDeclarations01.errors.txt | 81 +++++ ...ingLiteralTypesInVariableDeclarations01.js | 35 ++ .../stringLiteralTypesOverloads01.errors.txt | 146 ++++++++ .../stringLiteralTypesOverloads01.js | 93 +++++ .../stringLiteralTypesOverloads02.errors.txt | 129 +++++++ .../stringLiteralTypesOverloads02.js | 90 +++++ ...ingLiteralTypesTypePredicates01.errors.txt | 57 +++ .../stringLiteralTypesTypePredicates01.js | 46 +++ ...gumentsWithStringLiteralTypes01.errors.txt | 325 ++++++++++++++++++ .../typeArgumentsWithStringLiteralTypes01.js | 221 ++++++++++++ 20 files changed, 1783 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags01.js create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes01.js create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes02.js create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes03.js create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes04.js create mode 100644 tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads01.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads02.js create mode 100644 tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesTypePredicates01.js create mode 100644 tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt create mode 100644 tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt new file mode 100644 index 0000000000000..292cc8ea5b7d2 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt @@ -0,0 +1,86 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,12): error TS4081: Exported type alias 'Kind' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,10): error TS4033: Property 'kind' of exported interface has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,11): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,10): error TS4033: Property 'kind' of exported interface has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,11): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. + Property '"A"' is missing in type '{ kind: string; a: number; }'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (13 errors) ==== + + type Kind = "A" | "B" + +!!! error TS4081: Exported type alias 'Kind' has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + ~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + interface Entity { + kind: Kind; + } + + interface A extends Entity { + kind: "A"; + +!!! error TS4033: Property 'kind' of exported interface has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + a: number; + } + + interface B extends Entity { + kind: "B"; + +!!! error TS4033: Property 'kind' of exported interface has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + b: string; + } + + function hasKind(entity: Entity, kind: "A"): entity is A; + ~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function hasKind(entity: Entity, kind: "B"): entity is B; + ~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function hasKind(entity: Entity, kind: Kind): entity is Entity; + ~~~~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function hasKind(entity: Entity, kind: Kind): boolean { + return kind === is; + ~~ +!!! error TS2304: Cannot find name 'is'. + } + + let x: A = { + ~ +!!! error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. +!!! error TS2322: Property '"A"' is missing in type '{ kind: string; a: number; }'. + kind: "A", + a: 100, + } + + if (hasKind(x, "A")) { + let a = x; + } + else { + let b = x; + } + + if (!hasKind(x, "B")) { + let c = x; + } + else { + let d = x; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js new file mode 100644 index 0000000000000..2ce20607790a8 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.js @@ -0,0 +1,65 @@ +//// [stringLiteralTypesAsTags01.ts] + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +function hasKind(entity: Entity, kind: "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is Entity; +function hasKind(entity: Entity, kind: Kind): boolean { + return kind === is; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} + +//// [stringLiteralTypesAsTags01.js] +"A" | "B"; +function hasKind(entity, kind) { + return kind === is; +} +var x = { + kind: "A", + a: 100 +}; +if (hasKind(x, "A")) { + var a = x; +} +else { + var b = x; +} +if (!hasKind(x, "B")) { + var c = x; +} +else { + var d = x; +} diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt new file mode 100644 index 0000000000000..fcc13629ceb62 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt @@ -0,0 +1,59 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,9): error TS4081: Exported type alias 'T' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,10): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,18): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,26): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,24): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,30): error TS1005: ',' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,32): error TS1134: Variable declaration expected. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts (12 errors) ==== + + type T = "foo" | "bar" | "baz"; + +!!! error TS4081: Exported type alias 'T' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + var x: "foo" | "bar" | "baz" = "foo"; + +!!! error TS4025: Exported variable 'x' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~ +!!! error TS1005: ',' expected. + ~~~~~ +!!! error TS1134: Variable declaration expected. + var y: T = "bar"; + + if (x === "foo") { + let a = x; + } + else if (x !== "bar") { + let b = x || y; + } + else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; + } + + x = y; + y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js new file mode 100644 index 0000000000000..4eaaec42ceb75 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js @@ -0,0 +1,40 @@ +//// [stringLiteralTypesInUnionTypes01.ts] + +type T = "foo" | "bar" | "baz"; + +var x: "foo" | "bar" | "baz" = "foo"; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; + +//// [stringLiteralTypesInUnionTypes01.js] +"foo" | "bar" | "baz"; +var x = "foo" | "bar" | "baz"; +"foo"; +var y = "bar"; +if (x === "foo") { + var a = x; +} +else if (x !== "bar") { + var b = x || y; +} +else { + var c = x; + var d = y; + var e = c || d; +} +x = y; +y = x; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt new file mode 100644 index 0000000000000..dc8523051aac4 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt @@ -0,0 +1,62 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,18): error TS4081: Exported type alias 'T' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,19): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,19): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,27): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,35): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,24): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,32): error TS2304: Cannot find name 'string'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,39): error TS1005: ',' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,41): error TS1134: Variable declaration expected. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts (13 errors) ==== + + type T = string | "foo" | "bar" | "baz"; + +!!! error TS4081: Exported type alias 'T' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + var x: "foo" | "bar" | "baz" | string = "foo"; + +!!! error TS4025: Exported variable 'x' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~~ +!!! error TS2304: Cannot find name 'string'. + ~ +!!! error TS1005: ',' expected. + ~~~~~ +!!! error TS1134: Variable declaration expected. + var y: T = "bar"; + + if (x === "foo") { + let a = x; + } + else if (x !== "bar") { + let b = x || y; + } + else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; + } + + x = y; + y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js new file mode 100644 index 0000000000000..19b309980f87c --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js @@ -0,0 +1,40 @@ +//// [stringLiteralTypesInUnionTypes02.ts] + +type T = string | "foo" | "bar" | "baz"; + +var x: "foo" | "bar" | "baz" | string = "foo"; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; + +//// [stringLiteralTypesInUnionTypes02.js] +"foo" | "bar" | "baz"; +var x = "foo" | "bar" | "baz" | string; +"foo"; +var y = "bar"; +if (x === "foo") { + var a = x; +} +else if (x !== "bar") { + var b = x || y; +} +else { + var c = x; + var d = y; + var e = c || d; +} +x = y; +y = x; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt new file mode 100644 index 0000000000000..1595c62532272 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt @@ -0,0 +1,50 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,18): error TS4081: Exported type alias 'T' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,19): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,19): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,27): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,24): error TS2304: Cannot find name 'number'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (9 errors) ==== + + type T = number | "foo" | "bar"; + +!!! error TS4081: Exported type alias 'T' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + var x: "foo" | "bar" | number; + +!!! error TS4025: Exported variable 'x' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~~ +!!! error TS2304: Cannot find name 'number'. + var y: T = "bar"; + + if (x === "foo") { + let a = x; + } + else if (x !== "bar") { + let b = x || y; + } + else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; + } + + x = y; + y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js new file mode 100644 index 0000000000000..7705848be2bee --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js @@ -0,0 +1,39 @@ +//// [stringLiteralTypesInUnionTypes03.ts] + +type T = number | "foo" | "bar"; + +var x: "foo" | "bar" | number; +var y: T = "bar"; + +if (x === "foo") { + let a = x; +} +else if (x !== "bar") { + let b = x || y; +} +else { + let c = x; + let d = y; + let e: (typeof x) | (typeof y) = c || d; +} + +x = y; +y = x; + +//// [stringLiteralTypesInUnionTypes03.js] +"foo" | "bar"; +var x = "foo" | "bar" | number; +var y = "bar"; +if (x === "foo") { + var a = x; +} +else if (x !== "bar") { + var b = x || y; +} +else { + var c = x; + var d = y; + var e = c || d; +} +x = y; +y = x; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt new file mode 100644 index 0000000000000..66d3e21523786 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt @@ -0,0 +1,52 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,9): error TS4081: Exported type alias 'T' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,10): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,15): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts (4 errors) ==== + + type T = "" | "foo"; + +!!! error TS4081: Exported type alias 'T' has or is using private name ''. + ~~ +!!! error TS1110: Type expected. + ~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + let x: T = ""; + let y: T = "foo"; + + if (x === "") { + let a = x; + } + + if (x !== "") { + let b = x; + } + + if (x == "") { + let c = x; + } + + if (x != "") { + let d = x; + } + + if (x) { + let e = x; + } + + if (!x) { + let f = x; + } + + if (!!x) { + let g = x; + } + + if (!!!x) { + let h = x; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js new file mode 100644 index 0000000000000..5817d16ec8fe9 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js @@ -0,0 +1,67 @@ +//// [stringLiteralTypesInUnionTypes04.ts] + +type T = "" | "foo"; + +let x: T = ""; +let y: T = "foo"; + +if (x === "") { + let a = x; +} + +if (x !== "") { + let b = x; +} + +if (x == "") { + let c = x; +} + +if (x != "") { + let d = x; +} + +if (x) { + let e = x; +} + +if (!x) { + let f = x; +} + +if (!!x) { + let g = x; +} + +if (!!!x) { + let h = x; +} + +//// [stringLiteralTypesInUnionTypes04.js] +"" | "foo"; +var x = ""; +var y = "foo"; +if (x === "") { + var a = x; +} +if (x !== "") { + var b = x; +} +if (x == "") { + var c = x; +} +if (x != "") { + var d = x; +} +if (x) { + var e = x; +} +if (!x) { + var f = x; +} +if (!!x) { + var g = x; +} +if (!!!x) { + var h = x; +} diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt new file mode 100644 index 0000000000000..14233db44cd4b --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt @@ -0,0 +1,81 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(2,7): error TS4025: Exported variable 'a' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(2,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(3,7): error TS4025: Exported variable 'b' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(3,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(4,7): error TS4025: Exported variable 'c' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(4,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,9): error TS4025: Exported variable 'd' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,10): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,7): error TS4025: Exported variable 'e' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,8): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,7): error TS4025: Exported variable 'f' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,8): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,7): error TS4025: Exported variable 'g' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,8): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,8): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,9): error TS4025: Exported variable 'h' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,10): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,10): error TS2364: Invalid left-hand side of assignment expression. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (20 errors) ==== + + let a: ""; + +!!! error TS4025: Exported variable 'a' has or is using private name ''. + ~~ +!!! error TS1110: Type expected. + var b: "foo"; + +!!! error TS4025: Exported variable 'b' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + let c: "bar"; + +!!! error TS4025: Exported variable 'c' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + const d: "baz"; + +!!! error TS4025: Exported variable 'd' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + + a = ""; + b = "foo"; + c = "bar"; + + let e: "" = ""; + +!!! error TS4025: Exported variable 'e' has or is using private name ''. + ~~ +!!! error TS1110: Type expected. + ~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + var f: "foo" = "foo"; + +!!! error TS4025: Exported variable 'f' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + let g: "bar" = "bar"; + +!!! error TS4025: Exported variable 'g' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + const h: "baz" = "baz"; + +!!! error TS4025: Exported variable 'h' has or is using private name ''. + ~~~~~ +!!! error TS1110: Type expected. + ~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + + e = ""; + f = "foo"; + g = "bar"; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js new file mode 100644 index 0000000000000..4aae2a2438a1c --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js @@ -0,0 +1,35 @@ +//// [stringLiteralTypesInVariableDeclarations01.ts] + +let a: ""; +var b: "foo"; +let c: "bar"; +const d: "baz"; + +a = ""; +b = "foo"; +c = "bar"; + +let e: "" = ""; +var f: "foo" = "foo"; +let g: "bar" = "bar"; +const h: "baz" = "baz"; + +e = ""; +f = "foo"; +g = "bar"; + +//// [stringLiteralTypesInVariableDeclarations01.js] +var a = ""; +var b = "foo"; +var c = "bar"; +var d = "baz"; +a = ""; +b = "foo"; +c = "bar"; +var e = "" = ""; +var f = "foo" = "foo"; +var g = "bar" = "bar"; +var h = "baz" = "baz"; +e = ""; +f = "foo"; +g = "bar"; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt new file mode 100644 index 0000000000000..e41de718dfaff --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt @@ -0,0 +1,146 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,21): error TS4081: Exported type alias 'PrimitiveName' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,22): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,33): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,44): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,41): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,41): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,40): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,40): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,14): error TS4025: Exported variable 'string' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,15): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,15): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,14): error TS4025: Exported variable 'number' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,15): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,15): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,15): error TS4025: Exported variable 'boolean' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,16): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,16): error TS2364: Invalid left-hand side of assignment expression. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (30 errors) ==== + + type PrimitiveName = 'string' | 'number' | 'boolean'; + +!!! error TS4081: Exported type alias 'PrimitiveName' has or is using private name ''. + ~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + function getFalsyPrimitive(x: "string"): string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "number"): number; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "boolean"): boolean; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "number" | "string"): number | string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: PrimitiveName) { + ~~~~~~~~~~~~~~~~~ +!!! error TS2354: No best common type exists among return expressions. + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; + } + + namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); + } + + const string: "string" = "string" + +!!! error TS4025: Exported variable 'string' has or is using private name ''. + ~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + const number: "number" = "number" + +!!! error TS4025: Exported variable 'number' has or is using private name ''. + ~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + const boolean: "boolean" = "boolean" + +!!! error TS4025: Exported variable 'boolean' has or is using private name ''. + ~~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + + const stringOrNumber = string || number; + const stringOrBoolean = string || boolean; + const booleanOrNumber = number || boolean; + const stringOrBooleanOrNumber = stringOrBoolean || number; + + namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); + } + + + \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js new file mode 100644 index 0000000000000..a001f02c9c9ff --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js @@ -0,0 +1,93 @@ +//// [stringLiteralTypesOverloads01.ts] + +type PrimitiveName = 'string' | 'number' | 'boolean'; + +function getFalsyPrimitive(x: "string"): string; +function getFalsyPrimitive(x: "number"): number; +function getFalsyPrimitive(x: "boolean"): boolean; +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +function getFalsyPrimitive(x: "number" | "string"): number | string; +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +function getFalsyPrimitive(x: PrimitiveName) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; +} + +namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); +} + +const string: "string" = "string" +const number: "number" = "number" +const boolean: "boolean" = "boolean" + +const stringOrNumber = string || number; +const stringOrBoolean = string || boolean; +const booleanOrNumber = number || boolean; +const stringOrBooleanOrNumber = stringOrBoolean || number; + +namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +} + + + + +//// [stringLiteralTypesOverloads01.js] +'string' | 'number' | 'boolean'; +function getFalsyPrimitive(x) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + // Should be unreachable. + throw "Invalid value"; +} +var Consts1; +(function (Consts1) { + var EMPTY_STRING = getFalsyPrimitive("string"); + var ZERO = getFalsyPrimitive('number'); + var FALSE = getFalsyPrimitive("boolean"); +})(Consts1 || (Consts1 = {})); +var string = "string" = "string"; +var number = "number" = "number"; +var boolean = "boolean" = "boolean"; +var stringOrNumber = string || number; +var stringOrBoolean = string || boolean; +var booleanOrNumber = number || boolean; +var stringOrBooleanOrNumber = stringOrBoolean || number; +var Consts2; +(function (Consts2) { + var EMPTY_STRING = getFalsyPrimitive(string); + var ZERO = getFalsyPrimitive(number); + var FALSE = getFalsyPrimitive(boolean); + var a = getFalsyPrimitive(stringOrNumber); + var b = getFalsyPrimitive(stringOrBoolean); + var c = getFalsyPrimitive(booleanOrNumber); + var d = getFalsyPrimitive(stringOrBooleanOrNumber); +})(Consts2 || (Consts2 = {})); diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt new file mode 100644 index 0000000000000..ff1e212c07176 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt @@ -0,0 +1,129 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(3,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,41): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,41): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,40): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,40): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(9,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,14): error TS4025: Exported variable 'string' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,15): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,15): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,14): error TS4025: Exported variable 'number' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,15): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,15): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,15): error TS4025: Exported variable 'boolean' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,16): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,16): error TS2364: Invalid left-hand side of assignment expression. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (25 errors) ==== + + function getFalsyPrimitive(x: "string"): string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "number"): number; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "boolean"): boolean; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "number" | "string"): number | string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; + ~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + function getFalsyPrimitive(x: string) { + ~~~~~~~~~~~~~~~~~ +!!! error TS2354: No best common type exists among return expressions. + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; + } + + namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); + } + + const string: "string" = "string" + +!!! error TS4025: Exported variable 'string' has or is using private name ''. + ~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + const number: "number" = "number" + +!!! error TS4025: Exported variable 'number' has or is using private name ''. + ~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + const boolean: "boolean" = "boolean" + +!!! error TS4025: Exported variable 'boolean' has or is using private name ''. + ~~~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. + + const stringOrNumber = string || number; + const stringOrBoolean = string || boolean; + const booleanOrNumber = number || boolean; + const stringOrBooleanOrNumber = stringOrBoolean || number; + + namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); + } + + + \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.js b/tests/baselines/reference/stringLiteralTypesOverloads02.js new file mode 100644 index 0000000000000..ae38acebb9513 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.js @@ -0,0 +1,90 @@ +//// [stringLiteralTypesOverloads02.ts] + +function getFalsyPrimitive(x: "string"): string; +function getFalsyPrimitive(x: "number"): number; +function getFalsyPrimitive(x: "boolean"): boolean; +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +function getFalsyPrimitive(x: "number" | "string"): number | string; +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +function getFalsyPrimitive(x: string) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + + // Should be unreachable. + throw "Invalid value"; +} + +namespace Consts1 { + const EMPTY_STRING = getFalsyPrimitive("string"); + const ZERO = getFalsyPrimitive('number'); + const FALSE = getFalsyPrimitive("boolean"); +} + +const string: "string" = "string" +const number: "number" = "number" +const boolean: "boolean" = "boolean" + +const stringOrNumber = string || number; +const stringOrBoolean = string || boolean; +const booleanOrNumber = number || boolean; +const stringOrBooleanOrNumber = stringOrBoolean || number; + +namespace Consts2 { + const EMPTY_STRING = getFalsyPrimitive(string); + const ZERO = getFalsyPrimitive(number); + const FALSE = getFalsyPrimitive(boolean); + + const a = getFalsyPrimitive(stringOrNumber); + const b = getFalsyPrimitive(stringOrBoolean); + const c = getFalsyPrimitive(booleanOrNumber); + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +} + + + + +//// [stringLiteralTypesOverloads02.js] +function getFalsyPrimitive(x) { + if (x === "string") { + return ""; + } + if (x === "number") { + return 0; + } + if (x === "boolean") { + return false; + } + // Should be unreachable. + throw "Invalid value"; +} +var Consts1; +(function (Consts1) { + var EMPTY_STRING = getFalsyPrimitive("string"); + var ZERO = getFalsyPrimitive('number'); + var FALSE = getFalsyPrimitive("boolean"); +})(Consts1 || (Consts1 = {})); +var string = "string" = "string"; +var number = "number" = "number"; +var boolean = "boolean" = "boolean"; +var stringOrNumber = string || number; +var stringOrBoolean = string || boolean; +var booleanOrNumber = number || boolean; +var stringOrBooleanOrNumber = stringOrBoolean || number; +var Consts2; +(function (Consts2) { + var EMPTY_STRING = getFalsyPrimitive(string); + var ZERO = getFalsyPrimitive(number); + var FALSE = getFalsyPrimitive(boolean); + var a = getFalsyPrimitive(stringOrNumber); + var b = getFalsyPrimitive(stringOrBoolean); + var c = getFalsyPrimitive(booleanOrNumber); + var d = getFalsyPrimitive(stringOrBooleanOrNumber); +})(Consts2 || (Consts2 = {})); diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt new file mode 100644 index 0000000000000..a4cc525cdd2b4 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt @@ -0,0 +1,57 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,12): error TS4081: Exported type alias 'Kind' has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,13): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,46): error TS4060: Return type of exported function has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,47): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,46): error TS4060: Return type of exported function has or is using private name ''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,47): error TS1110: Type expected. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (10 errors) ==== + + type Kind = "A" | "B" + +!!! error TS4081: Exported type alias 'Kind' has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + ~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + function kindIs(kind: Kind, is: "A"): kind is "A"; + ~~~~~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + +!!! error TS4060: Return type of exported function has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + function kindIs(kind: Kind, is: "B"): kind is "B"; + ~~~~~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + +!!! error TS4060: Return type of exported function has or is using private name ''. + ~~~ +!!! error TS1110: Type expected. + function kindIs(kind: Kind, is: Kind): boolean { + return kind === is; + } + + var x: Kind = "A"; + + if (kindIs(x, "A")) { + let a = x; + } + else { + let b = x; + } + + if (!kindIs(x, "B")) { + let c = x; + } + else { + let d = x; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js new file mode 100644 index 0000000000000..791caed9b31c2 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js @@ -0,0 +1,46 @@ +//// [stringLiteralTypesTypePredicates01.ts] + +type Kind = "A" | "B" + +function kindIs(kind: Kind, is: "A"): kind is "A"; +function kindIs(kind: Kind, is: "B"): kind is "B"; +function kindIs(kind: Kind, is: Kind): boolean { + return kind === is; +} + +var x: Kind = "A"; + +if (kindIs(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!kindIs(x, "B")) { + let c = x; +} +else { + let d = x; +} + +//// [stringLiteralTypesTypePredicates01.js] +"A" | "B"; +"A"; +"B"; +function kindIs(kind, is) { + return kind === is; +} +var x = "A"; +if (kindIs(x, "A")) { + var a = x; +} +else { + var b = x; +} +if (!kindIs(x, "B")) { + var c = x; +} +else { + var d = x; +} diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt new file mode 100644 index 0000000000000..626d0e3d6f488 --- /dev/null +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -0,0 +1,325 @@ +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,48): error TS4060: Return type of exported function has or is using private name ''. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,49): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,39): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,52): error TS1005: '=' expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,63): error TS4060: Return type of exported function has or is using private name ''. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,64): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,64): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,74): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(37,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(38,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(39,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(40,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(41,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(44,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(45,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(46,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(47,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(56,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(56,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,20): error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(62,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(64,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(65,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(68,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(69,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(70,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(71,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(72,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(76,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(78,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(79,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,34): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(90,20): error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(90,20): error TS2447: The '|' operator is not allowed for boolean types. Consider using '||' instead. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(94,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(95,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(96,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,26): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(100,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(101,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(102,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(103,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(107,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(108,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(109,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(110,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(111,30): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. + + +==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (70 errors) ==== + + declare function randBool(): boolean; + declare function takeReturnString(str: string): string; + declare function takeReturnHello(str: "Hello"): "Hello"; + ~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + +!!! error TS4060: Return type of exported function has or is using private name ''. + ~~~~~~~ +!!! error TS1110: Type expected. + declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. + ~ +!!! error TS1005: '=' expected. + +!!! error TS4060: Return type of exported function has or is using private name ''. + ~~~~~~~ +!!! error TS1110: Type expected. + ~~~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + ~~~~~~~ +!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + + function fun1(x: T, y: T) { + return randBool() ? x : y; + } + + function fun2(x: T, y: U) { + return randBool() ? x : y; + } + + function fun3(...args: T[]): T { + return args[+randBool()]; + } + + namespace n1 { + // The following should all come back as strings. + // They should be assignable to/from something of a type 'string'. + // They should not be assignable to either "Hello" or "World". + export let a = fun1("Hello", "World"); + export let b = fun1("Hello", "Hello"); + export let c = fun2("Hello", "World"); + export let d = fun2("Hello", "Hello"); + export let e = fun3("Hello", "Hello", "World", "Foo"); + + // Should be valid + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + b = takeReturnHello(b); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + c = takeReturnHello(c); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + d = takeReturnHello(d); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + e = takeReturnHello(e); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + + // Passing these as arguments should cause an error. + a = takeReturnHelloWorld(a); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + b = takeReturnHelloWorld(b); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + c = takeReturnHelloWorld(c); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + d = takeReturnHelloWorld(d); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + e = takeReturnHelloWorld(e); + ~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + } + + namespace n2 { + // The following (regardless of errors) should come back typed + // as "Hello" (or "Hello" | "Hello"). + export let a = fun1<"Hello">("Hello", "Hello"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. + export let b = fun1<"Hello">("Hello", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. + export let c = fun2<"Hello", "Hello">("Hello", "Hello"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let d = fun2<"Hello", "Hello">("Hello", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let e = fun3<"Hello">("Hello", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + b = takeReturnString(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + c = takeReturnString(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + d = takeReturnString(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + e = takeReturnString(e); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + + // Should be valid + a = takeReturnHello(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + b = takeReturnHello(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + c = takeReturnHello(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + d = takeReturnHello(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + e = takeReturnHello(e); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + + // Assignment from the returned value should cause an error. + a = takeReturnHelloWorld(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + b = takeReturnHelloWorld(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + c = takeReturnHelloWorld(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + d = takeReturnHelloWorld(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + e = takeReturnHelloWorld(e); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + } + + + namespace n3 { + // The following (regardless of errors) should come back typed + // as "Hello" | "World" (or "World" | "Hello"). + export let a = fun2<"Hello", "World">("Hello", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let b = fun2<"Hello", "World">("World", "Hello"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let c = fun2<"World", "Hello">("Hello", "Hello"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let d = fun2<"World", "Hello">("World", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. + ~~~~~~~ +!!! error TS1134: Variable declaration expected. + export let e = fun3<"Hello" | "World">("Hello", "World"); + ~~~~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2447: The '|' operator is not allowed for boolean types. Consider using '||' instead. + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + b = takeReturnString(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + c = takeReturnString(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + d = takeReturnString(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + e = takeReturnString(e); + ~ +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + b = takeReturnHello(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + c = takeReturnHello(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + d = takeReturnHello(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + e = takeReturnHello(e); + ~ +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. + + // Both should be valid. + a = takeReturnHelloWorld(a); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + b = takeReturnHelloWorld(b); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + c = takeReturnHelloWorld(c); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + d = takeReturnHelloWorld(d); + ~ +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. + e = takeReturnHelloWorld(e); + ~ +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. + } \ No newline at end of file diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js new file mode 100644 index 0000000000000..15c7cf5ef2d00 --- /dev/null +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js @@ -0,0 +1,221 @@ +//// [typeArgumentsWithStringLiteralTypes01.ts] + +declare function randBool(): boolean; +declare function takeReturnString(str: string): string; +declare function takeReturnHello(str: "Hello"): "Hello"; +declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; + +function fun1(x: T, y: T) { + return randBool() ? x : y; +} + +function fun2(x: T, y: U) { + return randBool() ? x : y; +} + +function fun3(...args: T[]): T { + return args[+randBool()]; +} + +namespace n1 { + // The following should all come back as strings. + // They should be assignable to/from something of a type 'string'. + // They should not be assignable to either "Hello" or "World". + export let a = fun1("Hello", "World"); + export let b = fun1("Hello", "Hello"); + export let c = fun2("Hello", "World"); + export let d = fun2("Hello", "Hello"); + export let e = fun3("Hello", "Hello", "World", "Foo"); + + // Should be valid + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Passing these as arguments should cause an error. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} + +namespace n2 { + // The following (regardless of errors) should come back typed + // as "Hello" (or "Hello" | "Hello"). + export let a = fun1<"Hello">("Hello", "Hello"); + export let b = fun1<"Hello">("Hello", "World"); + export let c = fun2<"Hello", "Hello">("Hello", "Hello"); + export let d = fun2<"Hello", "Hello">("Hello", "World"); + export let e = fun3<"Hello">("Hello", "World"); + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Should be valid + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Assignment from the returned value should cause an error. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} + + +namespace n3 { + // The following (regardless of errors) should come back typed + // as "Hello" | "World" (or "World" | "Hello"). + export let a = fun2<"Hello", "World">("Hello", "World"); + export let b = fun2<"Hello", "World">("World", "Hello"); + export let c = fun2<"World", "Hello">("Hello", "Hello"); + export let d = fun2<"World", "Hello">("World", "World"); + export let e = fun3<"Hello" | "World">("Hello", "World"); + + // Assignment from the returned value should cause an error. + a = takeReturnString(a); + b = takeReturnString(b); + c = takeReturnString(c); + d = takeReturnString(d); + e = takeReturnString(e); + + // Passing these as arguments should cause an error. + a = takeReturnHello(a); + b = takeReturnHello(b); + c = takeReturnHello(c); + d = takeReturnHello(d); + e = takeReturnHello(e); + + // Both should be valid. + a = takeReturnHelloWorld(a); + b = takeReturnHelloWorld(b); + c = takeReturnHelloWorld(c); + d = takeReturnHelloWorld(d); + e = takeReturnHelloWorld(e); +} + +//// [typeArgumentsWithStringLiteralTypes01.js] +"Hello"; +"Hello" | "World"; +function fun1(x, y) { + return randBool() ? x : y; +} +function fun2(x, y) { + return randBool() ? x : y; +} +function fun3() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i - 0] = arguments[_i]; + } + return args[+randBool()]; +} +var n1; +(function (n1) { + // The following should all come back as strings. + // They should be assignable to/from something of a type 'string'. + // They should not be assignable to either "Hello" or "World". + n1.a = fun1("Hello", "World"); + n1.b = fun1("Hello", "Hello"); + n1.c = fun2("Hello", "World"); + n1.d = fun2("Hello", "Hello"); + n1.e = fun3("Hello", "Hello", "World", "Foo"); + // Should be valid + n1.a = takeReturnString(n1.a); + n1.b = takeReturnString(n1.b); + n1.c = takeReturnString(n1.c); + n1.d = takeReturnString(n1.d); + n1.e = takeReturnString(n1.e); + // Passing these as arguments should cause an error. + n1.a = takeReturnHello(n1.a); + n1.b = takeReturnHello(n1.b); + n1.c = takeReturnHello(n1.c); + n1.d = takeReturnHello(n1.d); + n1.e = takeReturnHello(n1.e); + // Passing these as arguments should cause an error. + n1.a = takeReturnHelloWorld(n1.a); + n1.b = takeReturnHelloWorld(n1.b); + n1.c = takeReturnHelloWorld(n1.c); + n1.d = takeReturnHelloWorld(n1.d); + n1.e = takeReturnHelloWorld(n1.e); +})(n1 || (n1 = {})); +var n2; +(function (n2) { + // The following (regardless of errors) should come back typed + // as "Hello" (or "Hello" | "Hello"). + n2.a = fun1 < "Hello" > ("Hello", "Hello"); + n2.b = fun1 < "Hello" > ("Hello", "World"); + n2.c = fun2 < "Hello"; + "Hello" > ("Hello", "Hello"); + n2.d = fun2 < "Hello"; + "Hello" > ("Hello", "World"); + n2.e = fun3 < "Hello" > ("Hello", "World"); + // Assignment from the returned value should cause an error. + n2.a = takeReturnString(n2.a); + n2.b = takeReturnString(n2.b); + n2.c = takeReturnString(n2.c); + n2.d = takeReturnString(n2.d); + n2.e = takeReturnString(n2.e); + // Should be valid + n2.a = takeReturnHello(n2.a); + n2.b = takeReturnHello(n2.b); + n2.c = takeReturnHello(n2.c); + n2.d = takeReturnHello(n2.d); + n2.e = takeReturnHello(n2.e); + // Assignment from the returned value should cause an error. + n2.a = takeReturnHelloWorld(n2.a); + n2.b = takeReturnHelloWorld(n2.b); + n2.c = takeReturnHelloWorld(n2.c); + n2.d = takeReturnHelloWorld(n2.d); + n2.e = takeReturnHelloWorld(n2.e); +})(n2 || (n2 = {})); +var n3; +(function (n3) { + // The following (regardless of errors) should come back typed + // as "Hello" | "World" (or "World" | "Hello"). + n3.a = fun2 < "Hello"; + "World" > ("Hello", "World"); + n3.b = fun2 < "Hello"; + "World" > ("World", "Hello"); + n3.c = fun2 < "World"; + "Hello" > ("Hello", "Hello"); + n3.d = fun2 < "World"; + "Hello" > ("World", "World"); + n3.e = fun3 < "Hello" | "World" > ("Hello", "World"); + // Assignment from the returned value should cause an error. + n3.a = takeReturnString(n3.a); + n3.b = takeReturnString(n3.b); + n3.c = takeReturnString(n3.c); + n3.d = takeReturnString(n3.d); + n3.e = takeReturnString(n3.e); + // Passing these as arguments should cause an error. + n3.a = takeReturnHello(n3.a); + n3.b = takeReturnHello(n3.b); + n3.c = takeReturnHello(n3.c); + n3.d = takeReturnHello(n3.d); + n3.e = takeReturnHello(n3.e); + // Both should be valid. + n3.a = takeReturnHelloWorld(n3.a); + n3.b = takeReturnHelloWorld(n3.b); + n3.c = takeReturnHelloWorld(n3.c); + n3.d = takeReturnHelloWorld(n3.d); + n3.e = takeReturnHelloWorld(n3.e); +})(n3 || (n3 = {})); From 191be4f8fea8f176c7abffeeb1346f2bfe436fc8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 15:55:36 -0700 Subject: [PATCH 037/353] Make string literals valid constituent types nodes in the parser. --- src/compiler/parser.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 23fb846c0b43c..769415dd94b5a 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1969,9 +1969,7 @@ namespace ts { function parseParameterType(): TypeNode { if (parseOptional(SyntaxKind.ColonToken)) { - return token === SyntaxKind.StringLiteral - ? parseLiteralNode(/*internName*/ true) - : parseType(); + return parseType(); } return undefined; @@ -2359,6 +2357,8 @@ namespace ts { // If these are followed by a dot, then parse these out as a dotted type reference instead. let node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); + case SyntaxKind.StringLiteral: + return parseLiteralNode(/*internName*/ true) case SyntaxKind.VoidKeyword: return parseTokenNode(); case SyntaxKind.TypeOfKeyword: From 84786d82c14e3fae0f86d22e6fc635ecbac9dab8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 16:33:08 -0700 Subject: [PATCH 038/353] Accepted baselines. --- ...overy_IncompleteMemberVariable1.errors.txt | 34 ----- ...ErrorRecovery_IncompleteMemberVariable1.js | 1 - ...Recovery_IncompleteMemberVariable1.symbols | 67 ++++++++++ ...orRecovery_IncompleteMemberVariable1.types | 78 ++++++++++++ .../reference/stringLiteralType.errors.txt | 12 -- .../baselines/reference/stringLiteralType.js | 2 +- .../reference/stringLiteralType.symbols | 16 +++ .../reference/stringLiteralType.types | 16 +++ .../stringLiteralTypesAsTags01.errors.txt | 32 +---- .../reference/stringLiteralTypesAsTags01.js | 20 ++- ...tringLiteralTypesInUnionTypes01.errors.txt | 48 ++----- .../stringLiteralTypesInUnionTypes01.js | 10 +- ...tringLiteralTypesInUnionTypes02.errors.txt | 62 --------- .../stringLiteralTypesInUnionTypes02.js | 10 +- .../stringLiteralTypesInUnionTypes02.symbols | 52 ++++++++ .../stringLiteralTypesInUnionTypes02.types | 62 +++++++++ ...tringLiteralTypesInUnionTypes03.errors.txt | 40 ++---- .../stringLiteralTypesInUnionTypes03.js | 9 +- ...tringLiteralTypesInUnionTypes04.errors.txt | 24 ++-- .../stringLiteralTypesInUnionTypes04.js | 7 +- ...alTypesInVariableDeclarations01.errors.txt | 97 ++++++-------- ...ingLiteralTypesInVariableDeclarations01.js | 27 ++-- .../stringLiteralTypesOverloads01.errors.txt | 98 ++------------- .../stringLiteralTypesOverloads01.js | 29 ++++- .../stringLiteralTypesOverloads02.errors.txt | 83 ++---------- .../stringLiteralTypesOverloads02.js | 27 +++- ...ingLiteralTypesTypePredicates01.errors.txt | 39 ++---- .../stringLiteralTypesTypePredicates01.js | 10 +- ...gumentsWithStringLiteralTypes01.errors.txt | 119 +++++++++--------- .../typeArgumentsWithStringLiteralTypes01.js | 33 ++++- 30 files changed, 609 insertions(+), 555 deletions(-) delete mode 100644 tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt create mode 100644 tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols create mode 100644 tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types delete mode 100644 tests/baselines/reference/stringLiteralType.errors.txt create mode 100644 tests/baselines/reference/stringLiteralType.symbols create mode 100644 tests/baselines/reference/stringLiteralType.types delete mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes02.types diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt deleted file mode 100644 index 707e68c2c4542..0000000000000 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts(12,21): error TS1110: Type expected. - - -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts (1 errors) ==== - // Interface - interface IPoint { - getDist(): number; - } - - // Module - module Shapes { - - // Class - export class Point implements IPoint { - - public con: "hello"; - ~~~~~~~ -!!! error TS1110: Type expected. - // Constructor - constructor (public x: number, public y: number) { } - - // Instance member - getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } - - // Static member - static origin = new Point(0, 0); - } - - } - - // Local variables - var p: IPoint = new Shapes.Point(3, 4); - var dist = p.getDist(); - \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js index ae2509c3f4929..8055cd9d4947b 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js @@ -38,7 +38,6 @@ var Shapes; function Point(x, y) { this.x = x; this.y = y; - this.con = "hello"; } // Instance member Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols new file mode 100644 index 0000000000000..db9cefbf64291 --- /dev/null +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols @@ -0,0 +1,67 @@ +=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts === +// Interface +interface IPoint { +>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0)) + + getDist(): number; +>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18)) +} + +// Module +module Shapes { +>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1)) + + // Class + export class Point implements IPoint { +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0)) + + public con: "hello"; +>con : Symbol(con, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 9, 42)) + + // Constructor + constructor (public x: number, public y: number) { } +>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) +>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) + + // Instance member + getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } +>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60)) +>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27)) +>Math : Symbol(Math, Decl(lib.d.ts, 522, 1), Decl(lib.d.ts, 633, 11)) +>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27)) +>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) +>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) +>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) +>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) + + // Static member + static origin = new Point(0, 0); +>origin : Symbol(Point.origin, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 16, 74)) +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) + } + +} + +// Local variables +var p: IPoint = new Shapes.Point(3, 4); +>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3)) +>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0)) +>Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1)) +>Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) + +var dist = p.getDist(); +>dist : Symbol(dist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 26, 3)) +>p.getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18)) +>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3)) +>getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18)) + diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types new file mode 100644 index 0000000000000..bb51151cfd71b --- /dev/null +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types @@ -0,0 +1,78 @@ +=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts === +// Interface +interface IPoint { +>IPoint : IPoint + + getDist(): number; +>getDist : () => number +} + +// Module +module Shapes { +>Shapes : typeof Shapes + + // Class + export class Point implements IPoint { +>Point : Point +>IPoint : IPoint + + public con: "hello"; +>con : "hello" + + // Constructor + constructor (public x: number, public y: number) { } +>x : number +>y : number + + // Instance member + getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } +>getDist : () => number +>Math.sqrt(this.x * this.x + this.y * this.y) : number +>Math.sqrt : (x: number) => number +>Math : Math +>sqrt : (x: number) => number +>this.x * this.x + this.y * this.y : number +>this.x * this.x : number +>this.x : number +>this : Point +>x : number +>this.x : number +>this : Point +>x : number +>this.y * this.y : number +>this.y : number +>this : Point +>y : number +>this.y : number +>this : Point +>y : number + + // Static member + static origin = new Point(0, 0); +>origin : Point +>new Point(0, 0) : Point +>Point : typeof Point +>0 : number +>0 : number + } + +} + +// Local variables +var p: IPoint = new Shapes.Point(3, 4); +>p : IPoint +>IPoint : IPoint +>new Shapes.Point(3, 4) : Shapes.Point +>Shapes.Point : typeof Shapes.Point +>Shapes : typeof Shapes +>Point : typeof Shapes.Point +>3 : number +>4 : number + +var dist = p.getDist(); +>dist : number +>p.getDist() : number +>p.getDist : () => number +>p : IPoint +>getDist : () => number + diff --git a/tests/baselines/reference/stringLiteralType.errors.txt b/tests/baselines/reference/stringLiteralType.errors.txt deleted file mode 100644 index 275db139cf7b3..0000000000000 --- a/tests/baselines/reference/stringLiteralType.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts(1,8): error TS1110: Type expected. - - -==== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts (1 errors) ==== - var x: 'hi'; - ~~~~ -!!! error TS1110: Type expected. - - function f(x: 'hi'); - function f(x: string); - function f(x: any) { - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralType.js b/tests/baselines/reference/stringLiteralType.js index 35f35f1cbef78..a6926453c47b0 100644 --- a/tests/baselines/reference/stringLiteralType.js +++ b/tests/baselines/reference/stringLiteralType.js @@ -7,6 +7,6 @@ function f(x: any) { } //// [stringLiteralType.js] -var x = 'hi'; +var x; function f(x) { } diff --git a/tests/baselines/reference/stringLiteralType.symbols b/tests/baselines/reference/stringLiteralType.symbols new file mode 100644 index 0000000000000..687d305244218 --- /dev/null +++ b/tests/baselines/reference/stringLiteralType.symbols @@ -0,0 +1,16 @@ +=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts === +var x: 'hi'; +>x : Symbol(x, Decl(stringLiteralType.ts, 0, 3)) + +function f(x: 'hi'); +>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22)) +>x : Symbol(x, Decl(stringLiteralType.ts, 2, 11)) + +function f(x: string); +>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22)) +>x : Symbol(x, Decl(stringLiteralType.ts, 3, 11)) + +function f(x: any) { +>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22)) +>x : Symbol(x, Decl(stringLiteralType.ts, 4, 11)) +} diff --git a/tests/baselines/reference/stringLiteralType.types b/tests/baselines/reference/stringLiteralType.types new file mode 100644 index 0000000000000..5d2e13c4ba5fa --- /dev/null +++ b/tests/baselines/reference/stringLiteralType.types @@ -0,0 +1,16 @@ +=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts === +var x: 'hi'; +>x : 'hi' + +function f(x: 'hi'); +>f : { (x: 'hi'): any; (x: string): any; } +>x : 'hi' + +function f(x: string); +>f : { (x: 'hi'): any; (x: string): any; } +>x : string + +function f(x: any) { +>f : { (x: 'hi'): any; (x: string): any; } +>x : any +} diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt index 292cc8ea5b7d2..df05e25304fcb 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt @@ -1,30 +1,15 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,12): error TS4081: Exported type alias 'Kind' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,10): error TS4033: Property 'kind' of exported interface has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,11): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,10): error TS4033: Property 'kind' of exported interface has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,11): error TS1110: Type expected. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. - Property '"A"' is missing in type '{ kind: string; a: number; }'. + Types of property 'kind' are incompatible. + Type 'string' is not assignable to type '"A"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (13 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (5 errors) ==== type Kind = "A" | "B" - -!!! error TS4081: Exported type alias 'Kind' has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. - ~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. interface Entity { kind: Kind; @@ -32,19 +17,11 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): interface A extends Entity { kind: "A"; - -!!! error TS4033: Property 'kind' of exported interface has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. a: number; } interface B extends Entity { kind: "B"; - -!!! error TS4033: Property 'kind' of exported interface has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. b: string; } @@ -66,7 +43,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): let x: A = { ~ !!! error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. -!!! error TS2322: Property '"A"' is missing in type '{ kind: string; a: number; }'. +!!! error TS2322: Types of property 'kind' are incompatible. +!!! error TS2322: Type 'string' is not assignable to type '"A"'. kind: "A", a: 100, } diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js index 2ce20607790a8..3fe33ace4870a 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.js +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.js @@ -43,7 +43,6 @@ else { } //// [stringLiteralTypesAsTags01.js] -"A" | "B"; function hasKind(entity, kind) { return kind === is; } @@ -63,3 +62,22 @@ if (!hasKind(x, "B")) { else { var d = x; } + + +//// [stringLiteralTypesAsTags01.d.ts] +declare type Kind = "A" | "B"; +interface Entity { + kind: Kind; +} +interface A extends Entity { + kind: "A"; + a: number; +} +interface B extends Entity { + kind: "B"; + b: string; +} +declare function hasKind(entity: Entity, kind: "A"): entity is A; +declare function hasKind(entity: Entity, kind: "B"): entity is B; +declare function hasKind(entity: Entity, kind: Kind): entity is Entity; +declare let x: A; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt index fcc13629ceb62..14d0a892f55d0 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt @@ -1,47 +1,21 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,9): error TS4081: Exported type alias 'T' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,10): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,18): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(2,26): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,24): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,30): error TS1005: ',' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,32): error TS1134: Variable declaration expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,5): error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. + Type 'string' is not assignable to type '"baz"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(5,5): error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. + Type 'string' is not assignable to type '"baz"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts (12 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts (2 errors) ==== type T = "foo" | "bar" | "baz"; - -!!! error TS4081: Exported type alias 'T' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. var x: "foo" | "bar" | "baz" = "foo"; - -!!! error TS4025: Exported variable 'x' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~ -!!! error TS1005: ',' expected. - ~~~~~ -!!! error TS1134: Variable declaration expected. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. +!!! error TS2322: Type 'string' is not assignable to type '"baz"'. var y: T = "bar"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. +!!! error TS2322: Type 'string' is not assignable to type '"baz"'. if (x === "foo") { let a = x; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js index 4eaaec42ceb75..d970310d68e32 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.js @@ -21,9 +21,7 @@ x = y; y = x; //// [stringLiteralTypesInUnionTypes01.js] -"foo" | "bar" | "baz"; -var x = "foo" | "bar" | "baz"; -"foo"; +var x = "foo"; var y = "bar"; if (x === "foo") { var a = x; @@ -38,3 +36,9 @@ else { } x = y; y = x; + + +//// [stringLiteralTypesInUnionTypes01.d.ts] +declare type T = "foo" | "bar" | "baz"; +declare var x: "foo" | "bar" | "baz"; +declare var y: T; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt deleted file mode 100644 index dc8523051aac4..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.errors.txt +++ /dev/null @@ -1,62 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,18): error TS4081: Exported type alias 'T' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,19): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,19): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,27): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(2,35): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,24): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,32): error TS2304: Cannot find name 'string'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,39): error TS1005: ',' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts(4,41): error TS1134: Variable declaration expected. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts (13 errors) ==== - - type T = string | "foo" | "bar" | "baz"; - -!!! error TS4081: Exported type alias 'T' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - - var x: "foo" | "bar" | "baz" | string = "foo"; - -!!! error TS4025: Exported variable 'x' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~~ -!!! error TS2304: Cannot find name 'string'. - ~ -!!! error TS1005: ',' expected. - ~~~~~ -!!! error TS1134: Variable declaration expected. - var y: T = "bar"; - - if (x === "foo") { - let a = x; - } - else if (x !== "bar") { - let b = x || y; - } - else { - let c = x; - let d = y; - let e: (typeof x) | (typeof y) = c || d; - } - - x = y; - y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js index 19b309980f87c..19b9c837c9da8 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.js @@ -21,9 +21,7 @@ x = y; y = x; //// [stringLiteralTypesInUnionTypes02.js] -"foo" | "bar" | "baz"; -var x = "foo" | "bar" | "baz" | string; -"foo"; +var x = "foo"; var y = "bar"; if (x === "foo") { var a = x; @@ -38,3 +36,9 @@ else { } x = y; y = x; + + +//// [stringLiteralTypesInUnionTypes02.d.ts] +declare type T = string | "foo" | "bar" | "baz"; +declare var x: "foo" | "bar" | "baz" | string; +declare var y: T; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols new file mode 100644 index 0000000000000..c9b31dc710a02 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.symbols @@ -0,0 +1,52 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts === + +type T = string | "foo" | "bar" | "baz"; +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes02.ts, 0, 0)) + +var x: "foo" | "bar" | "baz" | string = "foo"; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) + +var y: T = "bar"; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes02.ts, 0, 0)) + +if (x === "foo") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes02.ts, 7, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) +} +else if (x !== "bar") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) + + let b = x || y; +>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes02.ts, 10, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) +} +else { + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes02.ts, 13, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) + + let d = y; +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes02.ts, 14, 7)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) + + let e: (typeof x) | (typeof y) = c || d; +>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes02.ts, 15, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes02.ts, 13, 7)) +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes02.ts, 14, 7)) +} + +x = y; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) + +y = x; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes02.ts, 4, 3)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes02.ts, 3, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types new file mode 100644 index 0000000000000..569edc7781593 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types @@ -0,0 +1,62 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes02.ts === + +type T = string | "foo" | "bar" | "baz"; +>T : string | "foo" | "bar" | "baz" + +var x: "foo" | "bar" | "baz" | string = "foo"; +>x : "foo" | "bar" | "baz" | string +>"foo" : string + +var y: T = "bar"; +>y : string | "foo" | "bar" | "baz" +>T : string | "foo" | "bar" | "baz" +>"bar" : string + +if (x === "foo") { +>x === "foo" : boolean +>x : "foo" | "bar" | "baz" | string +>"foo" : string + + let a = x; +>a : "foo" | "bar" | "baz" | string +>x : "foo" | "bar" | "baz" | string +} +else if (x !== "bar") { +>x !== "bar" : boolean +>x : "foo" | "bar" | "baz" | string +>"bar" : string + + let b = x || y; +>b : string +>x || y : string +>x : "foo" | "bar" | "baz" | string +>y : string | "foo" | "bar" | "baz" +} +else { + let c = x; +>c : "foo" | "bar" | "baz" | string +>x : "foo" | "bar" | "baz" | string + + let d = y; +>d : string | "foo" | "bar" | "baz" +>y : string | "foo" | "bar" | "baz" + + let e: (typeof x) | (typeof y) = c || d; +>e : "foo" | "bar" | "baz" | string +>x : "foo" | "bar" | "baz" | string +>y : string | "foo" | "bar" | "baz" +>c || d : string +>c : "foo" | "bar" | "baz" | string +>d : string | "foo" | "bar" | "baz" +} + +x = y; +>x = y : string | "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" | string +>y : string | "foo" | "bar" | "baz" + +y = x; +>y = x : "foo" | "bar" | "baz" | string +>y : string | "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" | string + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt index 1595c62532272..8ff377b2e728e 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt @@ -1,43 +1,27 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,18): error TS4081: Exported type alias 'T' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,19): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,19): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(2,27): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,7): error TS4025: Exported variable 'x' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,8): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,16): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(4,24): error TS2304: Cannot find name 'number'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(5,5): error TS2322: Type 'string' is not assignable to type 'number | "foo" | "bar"'. + Type 'string' is not assignable to type '"bar"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(7,5): error TS2365: Operator '===' cannot be applied to types '"foo" | "bar" | number' and 'string'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(10,10): error TS2365: Operator '!==' cannot be applied to types '"foo" | "bar" | number' and 'string'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (9 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (3 errors) ==== type T = number | "foo" | "bar"; - -!!! error TS4081: Exported type alias 'T' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. var x: "foo" | "bar" | number; - -!!! error TS4025: Exported variable 'x' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~~ -!!! error TS2304: Cannot find name 'number'. var y: T = "bar"; + ~ +!!! error TS2322: Type 'string' is not assignable to type 'number | "foo" | "bar"'. +!!! error TS2322: Type 'string' is not assignable to type '"bar"'. if (x === "foo") { + ~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"foo" | "bar" | number' and 'string'. let a = x; } else if (x !== "bar") { + ~~~~~~~~~~~ +!!! error TS2365: Operator '!==' cannot be applied to types '"foo" | "bar" | number' and 'string'. let b = x || y; } else { diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js index 7705848be2bee..f6728e0b2fb2f 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.js @@ -21,8 +21,7 @@ x = y; y = x; //// [stringLiteralTypesInUnionTypes03.js] -"foo" | "bar"; -var x = "foo" | "bar" | number; +var x; var y = "bar"; if (x === "foo") { var a = x; @@ -37,3 +36,9 @@ else { } x = y; y = x; + + +//// [stringLiteralTypesInUnionTypes03.d.ts] +declare type T = number | "foo" | "bar"; +declare var x: "foo" | "bar" | number; +declare var y: T; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt index 66d3e21523786..77cb9c09531a7 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt @@ -1,23 +1,21 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,9): error TS4081: Exported type alias 'T' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,10): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(2,15): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(4,5): error TS2322: Type 'string' is not assignable to type '"" | "foo"'. + Type 'string' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(5,5): error TS2322: Type 'string' is not assignable to type '"" | "foo"'. + Type 'string' is not assignable to type '"foo"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts (4 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts (2 errors) ==== type T = "" | "foo"; - -!!! error TS4081: Exported type alias 'T' has or is using private name ''. - ~~ -!!! error TS1110: Type expected. - ~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. let x: T = ""; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"" | "foo"'. +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. let y: T = "foo"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"" | "foo"'. +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. if (x === "") { let a = x; diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js index 5817d16ec8fe9..dc6cf51ad1e1c 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.js @@ -38,7 +38,6 @@ if (!!!x) { } //// [stringLiteralTypesInUnionTypes04.js] -"" | "foo"; var x = ""; var y = "foo"; if (x === "") { @@ -65,3 +64,9 @@ if (!!x) { if (!!!x) { var h = x; } + + +//// [stringLiteralTypesInUnionTypes04.d.ts] +declare type T = "" | "foo"; +declare let x: T; +declare let y: T; diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt index 14233db44cd4b..3dd2adbbce08b 100644 --- a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt @@ -1,81 +1,54 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(2,7): error TS4025: Exported variable 'a' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(2,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(3,7): error TS4025: Exported variable 'b' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(3,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(4,7): error TS4025: Exported variable 'c' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(4,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,9): error TS4025: Exported variable 'd' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,10): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,7): error TS4025: Exported variable 'e' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,8): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,7): error TS4025: Exported variable 'f' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,8): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,7): error TS4025: Exported variable 'g' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,8): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,8): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,9): error TS4025: Exported variable 'h' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,10): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,10): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,7): error TS1155: 'const' declarations must be initialized +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(7,1): error TS2322: Type 'string' is not assignable to type '""'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(8,1): error TS2322: Type 'string' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(9,1): error TS2322: Type 'string' is not assignable to type '"bar"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,5): error TS2322: Type 'string' is not assignable to type '""'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,5): error TS2322: Type 'string' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,5): error TS2322: Type 'string' is not assignable to type '"bar"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,7): error TS2322: Type 'string' is not assignable to type '"baz"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(16,1): error TS2322: Type 'string' is not assignable to type '""'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(17,1): error TS2322: Type 'string' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(18,1): error TS2322: Type 'string' is not assignable to type '"bar"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (20 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (11 errors) ==== let a: ""; - -!!! error TS4025: Exported variable 'a' has or is using private name ''. - ~~ -!!! error TS1110: Type expected. var b: "foo"; - -!!! error TS4025: Exported variable 'b' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. let c: "bar"; - -!!! error TS4025: Exported variable 'c' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. const d: "baz"; - -!!! error TS4025: Exported variable 'd' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. + ~ +!!! error TS1155: 'const' declarations must be initialized a = ""; + ~ +!!! error TS2322: Type 'string' is not assignable to type '""'. b = "foo"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. c = "bar"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"bar"'. let e: "" = ""; - -!!! error TS4025: Exported variable 'e' has or is using private name ''. - ~~ -!!! error TS1110: Type expected. - ~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~ +!!! error TS2322: Type 'string' is not assignable to type '""'. var f: "foo" = "foo"; - -!!! error TS4025: Exported variable 'f' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. let g: "bar" = "bar"; - -!!! error TS4025: Exported variable 'g' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"bar"'. const h: "baz" = "baz"; - -!!! error TS4025: Exported variable 'h' has or is using private name ''. - ~~~~~ -!!! error TS1110: Type expected. - ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"baz"'. e = ""; + ~ +!!! error TS2322: Type 'string' is not assignable to type '""'. f = "foo"; - g = "bar"; \ No newline at end of file + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. + g = "bar"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"bar"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js index 4aae2a2438a1c..15a4ca5d580db 100644 --- a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js +++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.js @@ -19,17 +19,28 @@ f = "foo"; g = "bar"; //// [stringLiteralTypesInVariableDeclarations01.js] -var a = ""; -var b = "foo"; -var c = "bar"; -var d = "baz"; +var a; +var b; +var c; +var d; a = ""; b = "foo"; c = "bar"; -var e = "" = ""; -var f = "foo" = "foo"; -var g = "bar" = "bar"; -var h = "baz" = "baz"; +var e = ""; +var f = "foo"; +var g = "bar"; +var h = "baz"; e = ""; f = "foo"; g = "bar"; + + +//// [stringLiteralTypesInVariableDeclarations01.d.ts] +declare let a: ""; +declare var b: "foo"; +declare let c: "bar"; +declare const d: "baz"; +declare let e: ""; +declare var f: "foo"; +declare let g: "bar"; +declare const h: "baz"; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt index e41de718dfaff..378857dc2771f 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt @@ -1,86 +1,20 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,21): error TS4081: Exported type alias 'PrimitiveName' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,22): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,33): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(2,44): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,41): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(8,41): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(9,40): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(10,40): error TS1005: '=' expected. tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,14): error TS4025: Exported variable 'string' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,15): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,15): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,14): error TS4025: Exported variable 'number' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,15): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,15): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,15): error TS4025: Exported variable 'boolean' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,16): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,16): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,7): error TS2322: Type 'string' is not assignable to type '"string"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,7): error TS2322: Type 'string' is not assignable to type ''number''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,7): error TS2322: Type 'string' is not assignable to type '"boolean"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (30 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (4 errors) ==== type PrimitiveName = 'string' | 'number' | 'boolean'; - -!!! error TS4081: Exported type alias 'PrimitiveName' has or is using private name ''. - ~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. function getFalsyPrimitive(x: "string"): string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "number"): number; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "boolean"): boolean; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "number" | "string"): number | string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: PrimitiveName) { ~~~~~~~~~~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. @@ -105,26 +39,14 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34, } const string: "string" = "string" - -!!! error TS4025: Exported variable 'string' has or is using private name ''. - ~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"string"'. const number: "number" = "number" - -!!! error TS4025: Exported variable 'number' has or is using private name ''. - ~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type ''number''. const boolean: "boolean" = "boolean" - -!!! error TS4025: Exported variable 'boolean' has or is using private name ''. - ~~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"boolean"'. const stringOrNumber = string || number; const stringOrBoolean = string || boolean; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js index a001f02c9c9ff..23483776a9b88 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js @@ -54,7 +54,6 @@ namespace Consts2 { //// [stringLiteralTypesOverloads01.js] -'string' | 'number' | 'boolean'; function getFalsyPrimitive(x) { if (x === "string") { return ""; @@ -74,9 +73,9 @@ var Consts1; var ZERO = getFalsyPrimitive('number'); var FALSE = getFalsyPrimitive("boolean"); })(Consts1 || (Consts1 = {})); -var string = "string" = "string"; -var number = "number" = "number"; -var boolean = "boolean" = "boolean"; +var string = "string"; +var number = "number"; +var boolean = "boolean"; var stringOrNumber = string || number; var stringOrBoolean = string || boolean; var booleanOrNumber = number || boolean; @@ -91,3 +90,25 @@ var Consts2; var c = getFalsyPrimitive(booleanOrNumber); var d = getFalsyPrimitive(stringOrBooleanOrNumber); })(Consts2 || (Consts2 = {})); + + +//// [stringLiteralTypesOverloads01.d.ts] +declare type PrimitiveName = 'string' | 'number' | 'boolean'; +declare function getFalsyPrimitive(x: "string"): string; +declare function getFalsyPrimitive(x: "number"): number; +declare function getFalsyPrimitive(x: "boolean"): boolean; +declare function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +declare function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +declare function getFalsyPrimitive(x: "number" | "string"): number | string; +declare function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +declare namespace Consts1 { +} +declare const string: "string"; +declare const number: "number"; +declare const boolean: "boolean"; +declare const stringOrNumber: "string" | 'number'; +declare const stringOrBoolean: "string" | "boolean"; +declare const booleanOrNumber: 'number' | "boolean"; +declare const stringOrBooleanOrNumber: "string" | "boolean" | 'number'; +declare namespace Consts2 { +} diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt index ff1e212c07176..ae9fb9ce4f67f 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt @@ -1,69 +1,18 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(3,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(5,41): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(6,41): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(7,40): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,28): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(8,40): error TS1005: '=' expected. tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(9,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,14): error TS4025: Exported variable 'string' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,15): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,15): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,14): error TS4025: Exported variable 'number' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,15): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,15): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,15): error TS4025: Exported variable 'boolean' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,16): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,16): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,7): error TS2322: Type 'string' is not assignable to type '"string"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,7): error TS2322: Type 'string' is not assignable to type '"number"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,7): error TS2322: Type 'string' is not assignable to type '"boolean"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (25 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (4 errors) ==== function getFalsyPrimitive(x: "string"): string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "number"): number; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "boolean"): boolean; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "number" | "string"): number | string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; - ~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. function getFalsyPrimitive(x: string) { ~~~~~~~~~~~~~~~~~ !!! error TS2354: No best common type exists among return expressions. @@ -88,26 +37,14 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32, } const string: "string" = "string" - -!!! error TS4025: Exported variable 'string' has or is using private name ''. - ~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"string"'. const number: "number" = "number" - -!!! error TS4025: Exported variable 'number' has or is using private name ''. - ~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"number"'. const boolean: "boolean" = "boolean" - -!!! error TS4025: Exported variable 'boolean' has or is using private name ''. - ~~~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. + ~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"boolean"'. const stringOrNumber = string || number; const stringOrBoolean = string || boolean; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.js b/tests/baselines/reference/stringLiteralTypesOverloads02.js index ae38acebb9513..3c53f9380a88b 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads02.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.js @@ -71,9 +71,9 @@ var Consts1; var ZERO = getFalsyPrimitive('number'); var FALSE = getFalsyPrimitive("boolean"); })(Consts1 || (Consts1 = {})); -var string = "string" = "string"; -var number = "number" = "number"; -var boolean = "boolean" = "boolean"; +var string = "string"; +var number = "number"; +var boolean = "boolean"; var stringOrNumber = string || number; var stringOrBoolean = string || boolean; var booleanOrNumber = number || boolean; @@ -88,3 +88,24 @@ var Consts2; var c = getFalsyPrimitive(booleanOrNumber); var d = getFalsyPrimitive(stringOrBooleanOrNumber); })(Consts2 || (Consts2 = {})); + + +//// [stringLiteralTypesOverloads02.d.ts] +declare function getFalsyPrimitive(x: "string"): string; +declare function getFalsyPrimitive(x: "number"): number; +declare function getFalsyPrimitive(x: "boolean"): boolean; +declare function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +declare function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +declare function getFalsyPrimitive(x: "number" | "string"): number | string; +declare function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +declare namespace Consts1 { +} +declare const string: "string"; +declare const number: "number"; +declare const boolean: "boolean"; +declare const stringOrNumber: "string" | "number"; +declare const stringOrBoolean: "string" | "boolean"; +declare const booleanOrNumber: "number" | "boolean"; +declare const stringOrBooleanOrNumber: "string" | "boolean" | "number"; +declare namespace Consts2 { +} diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt index a4cc525cdd2b4..3e412a6c770f0 100644 --- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt @@ -1,46 +1,27 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,12): error TS4081: Exported type alias 'Kind' has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,13): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(2,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2391: Function implementation is missing or not immediately following the declaration. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,46): error TS4060: Return type of exported function has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,47): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2391: Function implementation is missing or not immediately following the declaration. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,46): error TS4060: Return type of exported function has or is using private name ''. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,47): error TS1110: Type expected. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(10,5): error TS2322: Type 'string' is not assignable to type '"A" | "B"'. + Type 'string' is not assignable to type '"B"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (10 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (3 errors) ==== type Kind = "A" | "B" - -!!! error TS4081: Exported type alias 'Kind' has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. - ~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. function kindIs(kind: Kind, is: "A"): kind is "A"; ~~~~~~ -!!! error TS2391: Function implementation is missing or not immediately following the declaration. - -!!! error TS4060: Return type of exported function has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function kindIs(kind: Kind, is: "B"): kind is "B"; ~~~~~~ -!!! error TS2391: Function implementation is missing or not immediately following the declaration. - -!!! error TS4060: Return type of exported function has or is using private name ''. - ~~~ -!!! error TS1110: Type expected. +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function kindIs(kind: Kind, is: Kind): boolean { return kind === is; } var x: Kind = "A"; + ~ +!!! error TS2322: Type 'string' is not assignable to type '"A" | "B"'. +!!! error TS2322: Type 'string' is not assignable to type '"B"'. if (kindIs(x, "A")) { let a = x; diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js index 791caed9b31c2..fd4129d272d05 100644 --- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.js +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.js @@ -25,9 +25,6 @@ else { } //// [stringLiteralTypesTypePredicates01.js] -"A" | "B"; -"A"; -"B"; function kindIs(kind, is) { return kind === is; } @@ -44,3 +41,10 @@ if (!kindIs(x, "B")) { else { var d = x; } + + +//// [stringLiteralTypesTypePredicates01.d.ts] +declare type Kind = "A" | "B"; +declare function kindIs(kind: Kind, is: "A"): kind is "A"; +declare function kindIs(kind: Kind, is: "B"): kind is "B"; +declare var x: Kind; diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt index 626d0e3d6f488..f6421445ae11f 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -1,23 +1,19 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,48): error TS4060: Return type of exported function has or is using private name ''. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,49): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,39): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,52): error TS1005: '=' expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,63): error TS4060: Return type of exported function has or is using private name ''. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,64): error TS1110: Type expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,64): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(5,74): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(37,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(38,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(39,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(40,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(41,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(44,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(45,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(46,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(47,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(44,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(45,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(46,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(47,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. @@ -38,11 +34,16 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(70,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(71,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(72,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(76,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(78,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(79,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(76,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(78,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(79,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,34): error TS1134: Variable declaration expected. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. @@ -63,39 +64,26 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(102,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(103,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(107,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(108,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(109,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(110,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(111,30): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(107,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(108,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(109,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(110,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. + Type 'boolean' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(111,30): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello" | "World"'. + Type 'number' is not assignable to type '"World"'. -==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (70 errors) ==== +==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (61 errors) ==== declare function randBool(): boolean; declare function takeReturnString(str: string): string; declare function takeReturnHello(str: "Hello"): "Hello"; ~~~~~~~~~~~~~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - -!!! error TS4060: Return type of exported function has or is using private name ''. - ~~~~~~~ -!!! error TS1110: Type expected. declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. - ~ -!!! error TS1005: '=' expected. - -!!! error TS4060: Return type of exported function has or is using private name ''. - ~~~~~~~ -!!! error TS1110: Type expected. - ~~~~~~~ -!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. - ~~~~~~~ -!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. function fun1(x: T, y: T) { return randBool() ? x : y; @@ -146,19 +134,24 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // Passing these as arguments should cause an error. a = takeReturnHelloWorld(a); ~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'string' is not assignable to type '"World"'. b = takeReturnHelloWorld(b); ~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'string' is not assignable to type '"World"'. c = takeReturnHelloWorld(c); ~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'string' is not assignable to type '"World"'. d = takeReturnHelloWorld(d); ~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'string' is not assignable to type '"World"'. e = takeReturnHelloWorld(e); ~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'string' is not assignable to type '"World"'. } namespace n2 { @@ -227,19 +220,24 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // Assignment from the returned value should cause an error. a = takeReturnHelloWorld(a); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. b = takeReturnHelloWorld(b); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. c = takeReturnHelloWorld(c); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. d = takeReturnHelloWorld(d); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. e = takeReturnHelloWorld(e); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. } @@ -309,17 +307,22 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // Both should be valid. a = takeReturnHelloWorld(a); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. b = takeReturnHelloWorld(b); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. c = takeReturnHelloWorld(c); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. d = takeReturnHelloWorld(d); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. e = takeReturnHelloWorld(e); ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello" | "World"'. +!!! error TS2345: Type 'number' is not assignable to type '"World"'. } \ No newline at end of file diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js index 15c7cf5ef2d00..e6e2b695a3bae 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js @@ -113,8 +113,6 @@ namespace n3 { } //// [typeArgumentsWithStringLiteralTypes01.js] -"Hello"; -"Hello" | "World"; function fun1(x, y) { return randBool() ? x : y; } @@ -219,3 +217,34 @@ var n3; n3.d = takeReturnHelloWorld(n3.d); n3.e = takeReturnHelloWorld(n3.e); })(n3 || (n3 = {})); + + +//// [typeArgumentsWithStringLiteralTypes01.d.ts] +declare function randBool(): boolean; +declare function takeReturnString(str: string): string; +declare function takeReturnHello(str: "Hello"): "Hello"; +declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; +declare function fun1(x: T, y: T): T; +declare function fun2(x: T, y: U): T | U; +declare function fun3(...args: T[]): T; +declare namespace n1 { + let a: string; + let b: string; + let c: string; + let d: string; + let e: string; +} +declare namespace n2 { + let a: boolean; + let b: boolean; + let c: boolean; + let d: boolean; + let e: boolean; +} +declare namespace n3 { + let a: boolean; + let b: boolean; + let c: boolean; + let d: boolean; + let e: number; +} From dc0e368f824001d16bc7b22c7d0b8ac44305d924 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 16:45:48 -0700 Subject: [PATCH 039/353] Make string literals valid types in type lists. --- src/compiler/parser.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 769415dd94b5a..a9d7f94715b08 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2387,6 +2387,7 @@ namespace ts { case SyntaxKind.OpenBracketToken: case SyntaxKind.LessThanToken: case SyntaxKind.NewKeyword: + case SyntaxKind.StringLiteral: return true; case SyntaxKind.OpenParenToken: // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier, @@ -5446,6 +5447,7 @@ namespace ts { return parseTokenNode(); } + // TODO (drosen): Parse string literal types in JSDoc as well. return parseJSDocTypeReference(); } From 8891fba1498df42360b22faf5ac71753dcd4e0d2 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 16:47:31 -0700 Subject: [PATCH 040/353] Accepted baselines. --- ...gumentsWithStringLiteralTypes01.errors.txt | 222 +++++------------- .../typeArgumentsWithStringLiteralTypes01.js | 46 ++-- .../typeParameterConstraints1.errors.txt | 5 +- 3 files changed, 74 insertions(+), 199 deletions(-) diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt index f6421445ae11f..413d21270039a 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -14,69 +14,29 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. Type 'string' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(54,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(56,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(56,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,20): error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,20): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(62,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(64,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(65,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(68,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(69,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(70,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(71,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(72,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(76,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(78,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(79,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(86,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,20): error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,34): error TS1134: Variable declaration expected. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(90,20): error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(90,20): error TS2447: The '|' operator is not allowed for boolean types. Consider using '||' instead. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(94,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(95,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(96,26): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,26): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(100,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(101,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(102,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(103,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(107,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(108,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(109,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(110,30): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. - Type 'boolean' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(111,30): error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello" | "World"'. - Type 'number' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. + Type '"World"' is not assignable to type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. + Type '"World"' is not assignable to type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. + Type 'string' is not assignable to type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(100,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'. + Type '"World"' is not assignable to type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'. + Type '"World"' is not assignable to type '"Hello"'. -==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (61 errors) ==== +==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (25 errors) ==== declare function randBool(): boolean; declare function takeReturnString(str: string): string; @@ -158,86 +118,47 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // The following (regardless of errors) should come back typed // as "Hello" (or "Hello" | "Hello"). export let a = fun1<"Hello">("Hello", "Hello"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. export let b = fun1<"Hello">("Hello", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: T) => T' and 'string'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. - export let c = fun2<"Hello", "Hello">("Hello", "Hello"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. ~~~~~~~ -!!! error TS1134: Variable declaration expected. +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. + export let c = fun2<"Hello", "Hello">("Hello", "Hello"); export let d = fun2<"Hello", "Hello">("Hello", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. - ~~~~~~~ -!!! error TS1134: Variable declaration expected. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. export let e = fun3<"Hello">("Hello", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'string'. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. // Assignment from the returned value should cause an error. a = takeReturnString(a); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"Hello"'. b = takeReturnString(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. c = takeReturnString(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"Hello"'. d = takeReturnString(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. e = takeReturnString(e); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. // Should be valid a = takeReturnHello(a); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. b = takeReturnHello(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. c = takeReturnHello(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. d = takeReturnHello(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. e = takeReturnHello(e); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. // Assignment from the returned value should cause an error. a = takeReturnHelloWorld(a); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. + ~ +!!! error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. +!!! error TS2322: Type '"World"' is not assignable to type '"Hello"'. b = takeReturnHelloWorld(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. c = takeReturnHelloWorld(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. + ~ +!!! error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. +!!! error TS2322: Type '"World"' is not assignable to type '"Hello"'. d = takeReturnHelloWorld(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. e = takeReturnHelloWorld(e); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. } @@ -245,84 +166,47 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // The following (regardless of errors) should come back typed // as "Hello" | "World" (or "World" | "Hello"). export let a = fun2<"Hello", "World">("Hello", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. - ~~~~~~~ -!!! error TS1134: Variable declaration expected. export let b = fun2<"Hello", "World">("World", "Hello"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. - ~~~~~~~ -!!! error TS1134: Variable declaration expected. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. export let c = fun2<"World", "Hello">("Hello", "Hello"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. - ~~~~~~~ -!!! error TS1134: Variable declaration expected. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. export let d = fun2<"World", "Hello">("World", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(x: T, y: U) => T | U' and 'string'. - ~~~~~~~ -!!! error TS1134: Variable declaration expected. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. export let e = fun3<"Hello" | "World">("Hello", "World"); - ~~~~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '(...args: T[]) => T' and 'string'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2447: The '|' operator is not allowed for boolean types. Consider using '||' instead. // Assignment from the returned value should cause an error. a = takeReturnString(a); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. +!!! error TS2322: Type 'string' is not assignable to type '"World"'. b = takeReturnString(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. c = takeReturnString(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. d = takeReturnString(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'. e = takeReturnString(e); - ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. + ~ +!!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. +!!! error TS2322: Type 'string' is not assignable to type '"World"'. // Passing these as arguments should cause an error. a = takeReturnHello(a); ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Type '"World"' is not assignable to type '"Hello"'. b = takeReturnHello(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. c = takeReturnHello(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. d = takeReturnHello(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello"'. e = takeReturnHello(e); ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Type '"World"' is not assignable to type '"Hello"'. // Both should be valid. a = takeReturnHelloWorld(a); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. b = takeReturnHelloWorld(b); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. c = takeReturnHelloWorld(c); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. d = takeReturnHelloWorld(d); - ~ -!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'boolean' is not assignable to type '"World"'. e = takeReturnHelloWorld(e); - ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type '"Hello" | "World"'. -!!! error TS2345: Type 'number' is not assignable to type '"World"'. } \ No newline at end of file diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js index e6e2b695a3bae..c07dd22539648 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js @@ -159,13 +159,11 @@ var n2; (function (n2) { // The following (regardless of errors) should come back typed // as "Hello" (or "Hello" | "Hello"). - n2.a = fun1 < "Hello" > ("Hello", "Hello"); - n2.b = fun1 < "Hello" > ("Hello", "World"); - n2.c = fun2 < "Hello"; - "Hello" > ("Hello", "Hello"); - n2.d = fun2 < "Hello"; - "Hello" > ("Hello", "World"); - n2.e = fun3 < "Hello" > ("Hello", "World"); + n2.a = fun1("Hello", "Hello"); + n2.b = fun1("Hello", "World"); + n2.c = fun2("Hello", "Hello"); + n2.d = fun2("Hello", "World"); + n2.e = fun3("Hello", "World"); // Assignment from the returned value should cause an error. n2.a = takeReturnString(n2.a); n2.b = takeReturnString(n2.b); @@ -189,15 +187,11 @@ var n3; (function (n3) { // The following (regardless of errors) should come back typed // as "Hello" | "World" (or "World" | "Hello"). - n3.a = fun2 < "Hello"; - "World" > ("Hello", "World"); - n3.b = fun2 < "Hello"; - "World" > ("World", "Hello"); - n3.c = fun2 < "World"; - "Hello" > ("Hello", "Hello"); - n3.d = fun2 < "World"; - "Hello" > ("World", "World"); - n3.e = fun3 < "Hello" | "World" > ("Hello", "World"); + n3.a = fun2("Hello", "World"); + n3.b = fun2("World", "Hello"); + n3.c = fun2("Hello", "Hello"); + n3.d = fun2("World", "World"); + n3.e = fun3("Hello", "World"); // Assignment from the returned value should cause an error. n3.a = takeReturnString(n3.a); n3.b = takeReturnString(n3.b); @@ -235,16 +229,16 @@ declare namespace n1 { let e: string; } declare namespace n2 { - let a: boolean; - let b: boolean; - let c: boolean; - let d: boolean; - let e: boolean; + let a: "Hello"; + let b: any; + let c: "Hello"; + let d: any; + let e: any; } declare namespace n3 { - let a: boolean; - let b: boolean; - let c: boolean; - let d: boolean; - let e: number; + let a: "Hello" | "World"; + let b: any; + let c: any; + let d: any; + let e: "Hello" | "World"; } diff --git a/tests/baselines/reference/typeParameterConstraints1.errors.txt b/tests/baselines/reference/typeParameterConstraints1.errors.txt index f30fd4f6700b4..e837e19317deb 100644 --- a/tests/baselines/reference/typeParameterConstraints1.errors.txt +++ b/tests/baselines/reference/typeParameterConstraints1.errors.txt @@ -1,12 +1,11 @@ tests/cases/compiler/typeParameterConstraints1.ts(6,25): error TS2304: Cannot find name 'hm'. -tests/cases/compiler/typeParameterConstraints1.ts(8,25): error TS1110: Type expected. tests/cases/compiler/typeParameterConstraints1.ts(9,25): error TS1110: Type expected. tests/cases/compiler/typeParameterConstraints1.ts(10,26): error TS1110: Type expected. tests/cases/compiler/typeParameterConstraints1.ts(11,26): error TS1110: Type expected. tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot find name 'undefined'. -==== tests/cases/compiler/typeParameterConstraints1.ts (6 errors) ==== +==== tests/cases/compiler/typeParameterConstraints1.ts (5 errors) ==== function foo1(test: T) { } function foo2(test: T) { } function foo3(test: T) { } @@ -17,8 +16,6 @@ tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot f !!! error TS2304: Cannot find name 'hm'. function foo7(test: T) { } // valid function foo8(test: T) { } - ~~ -!!! error TS1110: Type expected. function foo9 (test: T) { } ~ !!! error TS1110: Type expected. From 82545ce8544cf0e24b278fa11c8afc8116de1c3c Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 16:58:03 -0700 Subject: [PATCH 041/353] Added test for string types in tuples. --- .../stringLiteralTypesAndTuples01.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts new file mode 100644 index 0000000000000..7ac9aa3b42742 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts @@ -0,0 +1,20 @@ +// @declaration: true + +// Should all be strings. +let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; + +type RexOrRaptor = "t-rex" | "raptor" +let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; + +rawr(dinosaur); + +function rawr(dino: RexOrRaptor) { + if (dino === "t-rex") { + return "ROAAAAR!"; + } + if (dino === "raptor") { + return "yip yip!"; + } + + throw "Unexpected " + dino; +} \ No newline at end of file From ed927d8cf642065806f28bdc715f44cfc704872e Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Oct 2015 16:58:17 -0700 Subject: [PATCH 042/353] Accepted baselines. --- .../stringLiteralTypesAndTuples01.errors.txt | 32 ++++++++++++++ .../stringLiteralTypesAndTuples01.js | 42 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAndTuples01.js diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt b/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt new file mode 100644 index 0000000000000..849f4922e45fc --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt @@ -0,0 +1,32 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts(6,5): error TS2322: Type '[string, string, string]' is not assignable to type '["I'm", "a", any]'. + Types of property '0' are incompatible. + Type 'string' is not assignable to type '"I'm"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts(6,37): error TS2304: Cannot find name 'Dinosaur'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts (2 errors) ==== + + // Should all be strings. + let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; + + type RexOrRaptor = "t-rex" | "raptor" + let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; + ~~~~~~~~~~~~~~~~~ +!!! error TS2322: Type '[string, string, string]' is not assignable to type '["I'm", "a", any]'. +!!! error TS2322: Types of property '0' are incompatible. +!!! error TS2322: Type 'string' is not assignable to type '"I'm"'. + ~~~~~~~~ +!!! error TS2304: Cannot find name 'Dinosaur'. + + rawr(dinosaur); + + function rawr(dino: RexOrRaptor) { + if (dino === "t-rex") { + return "ROAAAAR!"; + } + if (dino === "raptor") { + return "yip yip!"; + } + + throw "Unexpected " + dino; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.js b/tests/baselines/reference/stringLiteralTypesAndTuples01.js new file mode 100644 index 0000000000000..66e57b1eea5ac --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.js @@ -0,0 +1,42 @@ +//// [stringLiteralTypesAndTuples01.ts] + +// Should all be strings. +let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; + +type RexOrRaptor = "t-rex" | "raptor" +let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; + +rawr(dinosaur); + +function rawr(dino: RexOrRaptor) { + if (dino === "t-rex") { + return "ROAAAAR!"; + } + if (dino === "raptor") { + return "yip yip!"; + } + + throw "Unexpected " + dino; +} + +//// [stringLiteralTypesAndTuples01.js] +// Should all be strings. +var _a = ["Hello", "Brave", "New", "World"], hello = _a[0], brave = _a[1], newish = _a[2], world = _a[3]; +var _b = ['I\'m', 'a', 't-rex'], im = _b[0], a = _b[1], dinosaur = _b[2]; +rawr(dinosaur); +function rawr(dino) { + if (dino === "t-rex") { + return "ROAAAAR!"; + } + if (dino === "raptor") { + return "yip yip!"; + } + throw "Unexpected " + dino; +} + + +//// [stringLiteralTypesAndTuples01.d.ts] +declare let hello: string, brave: string, newish: string, world: string; +declare type RexOrRaptor = "t-rex" | "raptor"; +declare let im: "I'm", a: "a", dinosaur: any; +declare function rawr(dino: RexOrRaptor): string; From a3e7ccb108b8897f969499941403e5803cef4e75 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 15:00:46 -0700 Subject: [PATCH 043/353] Use normalized text for text on string literal types. --- src/compiler/checker.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9f1bf504a0e92..c062398c1a95a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1620,7 +1620,7 @@ namespace ts { writeAnonymousType(type, flags); } else if (type.flags & TypeFlags.StringLiteral) { - writer.writeStringLiteral((type).text); + writer.writeStringLiteral(`"${escapeString((type).text)}"`); } else { // Should never get here @@ -4213,12 +4213,13 @@ namespace ts { } function getStringLiteralType(node: StringLiteral): StringLiteralType { - if (hasProperty(stringLiteralTypes, node.text)) { - return stringLiteralTypes[node.text]; + const text = node.text; + if (hasProperty(stringLiteralTypes, text)) { + return stringLiteralTypes[text]; } - let type = stringLiteralTypes[node.text] = createType(TypeFlags.StringLiteral); - type.text = getTextOfNode(node); + let type = stringLiteralTypes[text] = createType(TypeFlags.StringLiteral); + type.text = text; return type; } From 20c2c4e5e53ce5c19667caf087d303530df1e432 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 15:22:35 -0700 Subject: [PATCH 044/353] Amended fourslash tests to expect double quotes. --- .../fourslash/overloadOnConstCallSignature.ts | 2 +- .../fourslash/quickInfoForOverloadOnConst1.ts | 16 ++++++++-------- .../fourslash/signatureHelpOnOverloadOnConst.ts | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/cases/fourslash/overloadOnConstCallSignature.ts b/tests/cases/fourslash/overloadOnConstCallSignature.ts index d729fd4da6f8d..101d7750e0424 100644 --- a/tests/cases/fourslash/overloadOnConstCallSignature.ts +++ b/tests/cases/fourslash/overloadOnConstCallSignature.ts @@ -11,7 +11,7 @@ goTo.marker('1'); verify.signatureHelpCountIs(4); -verify.currentSignatureHelpIs('foo(name: \'order\'): string'); +verify.currentSignatureHelpIs('foo(name: "order"): string'); edit.insert('"hi"'); goTo.marker('2'); diff --git a/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts b/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts index f2ee37aa675db..948c2fde99911 100644 --- a/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts +++ b/tests/cases/fourslash/quickInfoForOverloadOnConst1.ts @@ -20,22 +20,22 @@ ////c.x1(1, (x/*10*/x) => { return 1; } ); goTo.marker('1'); -verify.quickInfoIs("(method) I.x1(a: number, callback: (x: 'hi') => number): any"); +verify.quickInfoIs("(method) I.x1(a: number, callback: (x: \"hi\") => number): any"); goTo.marker('2'); -verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any"); +verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any"); goTo.marker('3'); -verify.quickInfoIs("(parameter) callback: (x: 'hi') => number"); +verify.quickInfoIs("(parameter) callback: (x: \"hi\") => number"); goTo.marker('4'); -verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any"); +verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any"); goTo.marker('5'); verify.quickInfoIs('(parameter) callback: (x: string) => number'); goTo.marker('6'); verify.quickInfoIs('(parameter) callback: (x: string) => number'); goTo.marker('7'); -verify.quickInfoIs("(method) C.x1(a: number, callback: (x: 'hi') => number): any"); +verify.quickInfoIs("(method) C.x1(a: number, callback: (x: \"hi\") => number): any"); goTo.marker('8'); -verify.quickInfoIs("(parameter) xx: 'hi'"); +verify.quickInfoIs("(parameter) xx: \"hi\""); goTo.marker('9'); -verify.quickInfoIs("(parameter) xx: 'bye'"); +verify.quickInfoIs("(parameter) xx: \"bye\""); goTo.marker('10'); -verify.quickInfoIs("(parameter) xx: 'hi'"); \ No newline at end of file +verify.quickInfoIs("(parameter) xx: \"hi\""); \ No newline at end of file diff --git a/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts b/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts index 8edd0617d70ab..e312b71aebe58 100644 --- a/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts +++ b/tests/cases/fourslash/signatureHelpOnOverloadOnConst.ts @@ -18,9 +18,9 @@ verify.currentParameterSpanIs("z: string"); goTo.marker('2'); verify.signatureHelpCountIs(3); verify.currentParameterHelpArgumentNameIs("x"); -verify.currentParameterSpanIs("x: 'hi'"); +verify.currentParameterSpanIs("x: \"hi\""); goTo.marker('3'); verify.signatureHelpCountIs(3); verify.currentParameterHelpArgumentNameIs("y"); -verify.currentParameterSpanIs("y: 'bye'"); +verify.currentParameterSpanIs("y: \"bye\""); From 87f2957e4d510637f5fcab4151561a60548944d0 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 15:23:53 -0700 Subject: [PATCH 045/353] Accepted baselines. --- .../callSignatureFunctionOverload.types | 16 +-- .../reference/constantOverloadFunction.types | 16 +-- ...ritedOverloadedSpecializedSignatures.types | 16 +-- ...pecializedCallAndConstructSignatures.types | 4 +- .../memberFunctionsWithPublicOverloads.types | 40 +++---- .../overloadOnConstConstraintChecks1.types | 30 +++--- .../overloadOnConstConstraintChecks2.types | 12 +-- .../overloadOnConstConstraintChecks3.types | 12 +-- .../overloadOnConstInheritance1.types | 12 +-- .../overloadOnConstInheritance2.errors.txt | 4 +- .../overloadOnConstInheritance3.errors.txt | 4 +- .../reference/primtiveTypesAreIdentical.types | 12 +-- .../specializedSignatureInInterface.types | 4 +- ...reIsSubtypeOfNonSpecializedSignature.types | 102 +++++++++--------- .../reference/stringLiteralType.types | 10 +- .../stringLiteralTypesOverloads01.errors.txt | 4 +- .../stringLiteralTypesOverloads01.js | 6 +- ...aturesWithSpecializedSignatures.errors.txt | 4 +- ...aturesWithSpecializedSignatures.errors.txt | 4 +- .../typesWithSpecializedCallSignatures.types | 58 +++++----- ...esWithSpecializedConstructSignatures.types | 26 ++--- 21 files changed, 198 insertions(+), 198 deletions(-) diff --git a/tests/baselines/reference/callSignatureFunctionOverload.types b/tests/baselines/reference/callSignatureFunctionOverload.types index b9788e5b143a9..d5897c01494ca 100644 --- a/tests/baselines/reference/callSignatureFunctionOverload.types +++ b/tests/baselines/reference/callSignatureFunctionOverload.types @@ -1,33 +1,33 @@ === tests/cases/compiler/callSignatureFunctionOverload.ts === var foo: { ->foo : { (name: string): string; (name: 'order'): string; (name: 'content'): string; (name: 'done'): string; } +>foo : { (name: string): string; (name: "order"): string; (name: "content"): string; (name: "done"): string; } (name: string): string; >name : string (name: 'order'): string; ->name : 'order' +>name : "order" (name: 'content'): string; ->name : 'content' +>name : "content" (name: 'done'): string; ->name : 'done' +>name : "done" } var foo2: { ->foo2 : { (name: string): string; (name: 'order'): string; (name: 'order'): string; (name: 'done'): string; } +>foo2 : { (name: string): string; (name: "order"): string; (name: "order"): string; (name: "done"): string; } (name: string): string; >name : string (name: 'order'): string; ->name : 'order' +>name : "order" (name: 'order'): string; ->name : 'order' +>name : "order" (name: 'done'): string; ->name : 'done' +>name : "done" } diff --git a/tests/baselines/reference/constantOverloadFunction.types b/tests/baselines/reference/constantOverloadFunction.types index d643d3a726d9a..d7deaaae46d79 100644 --- a/tests/baselines/reference/constantOverloadFunction.types +++ b/tests/baselines/reference/constantOverloadFunction.types @@ -19,27 +19,27 @@ class Derived3 extends Base { biz() { } } >biz : () => void function foo(tagName: 'canvas'): Derived1; ->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; } ->tagName : 'canvas' +>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; } +>tagName : "canvas" >Derived1 : Derived1 function foo(tagName: 'div'): Derived2; ->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; } ->tagName : 'div' +>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; } +>tagName : "div" >Derived2 : Derived2 function foo(tagName: 'span'): Derived3; ->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; } ->tagName : 'span' +>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; } +>tagName : "span" >Derived3 : Derived3 function foo(tagName: string): Base; ->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; } +>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; } >tagName : string >Base : Base function foo(tagName: any): Base { ->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; } +>foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; } >tagName : any >Base : Base diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types index dc8b9b465d81f..0ec428bb159fc 100644 --- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types +++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types @@ -11,7 +11,7 @@ interface B extends A { >A : A (key:'foo'):string; ->key : 'foo' +>key : "foo" } var b:B; @@ -32,7 +32,7 @@ interface A { >A : A (x: 'A1'): string; ->x : 'A1' +>x : "A1" (x: string): void; >x : string @@ -43,21 +43,21 @@ interface B extends A { >A : A (x: 'B1'): number; ->x : 'B1' +>x : "B1" } interface A { >A : A (x: 'A2'): boolean; ->x : 'A2' +>x : "A2" } interface B { >B : B (x: 'B2'): string[]; ->x : 'B2' +>x : "B2" } interface C1 extends B { @@ -65,7 +65,7 @@ interface C1 extends B { >B : B (x: 'C1'): number[]; ->x : 'C1' +>x : "C1" } interface C2 extends B { @@ -73,7 +73,7 @@ interface C2 extends B { >B : B (x: 'C2'): boolean[]; ->x : 'C2' +>x : "C2" } interface C extends C1, C2 { @@ -82,7 +82,7 @@ interface C extends C1, C2 { >C2 : C2 (x: 'C'): string; ->x : 'C' +>x : "C" } var c: C; diff --git a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types index 971b5e56907fa..7b19fd5889b31 100644 --- a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types +++ b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types @@ -3,13 +3,13 @@ interface Foo { >Foo : Foo (x: 'a'): number; ->x : 'a' +>x : "a" (x: string): any; >x : string new (x: 'a'): any; ->x : 'a' +>x : "a" new (x: string): Object; >x : string diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types index 7cbc2aca1ffb8..bcd937e9cfc2b 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types +++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types @@ -17,20 +17,20 @@ class C { >y : any public bar(x: 'hi'); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } ->x : 'hi' +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } +>x : "hi" public bar(x: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : string public bar(x: number, y: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : number >y : string public bar(x: any, y?: any) { } ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : any >y : any @@ -49,20 +49,20 @@ class C { >y : any public static bar(x: 'hi'); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } ->x : 'hi' +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } +>x : "hi" public static bar(x: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : string public static bar(x: number, y: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : number >y : string public static bar(x: any, y?: any) { } ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : any >y : any } @@ -88,22 +88,22 @@ class D { >y : any public bar(x: 'hi'); ->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; } ->x : 'hi' +>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; } +>x : "hi" public bar(x: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; } >x : string public bar(x: T, y: T); ->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; } >x : T >T : T >y : T >T : T public bar(x: any, y?: any) { } ->bar : { (x: 'hi'): any; (x: string): any; (x: T, y: T): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; } >x : any >y : any @@ -122,20 +122,20 @@ class D { >y : any public static bar(x: 'hi'); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } ->x : 'hi' +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } +>x : "hi" public static bar(x: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : string public static bar(x: number, y: string); ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : number >y : string public static bar(x: any, y?: any) { } ->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; } +>bar : { (x: "hi"): any; (x: string): any; (x: number, y: string): any; } >x : any >y : any diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.types b/tests/baselines/reference/overloadOnConstConstraintChecks1.types index cc561eb6e21c6..012774b3cc9eb 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks1.types +++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.types @@ -22,23 +22,23 @@ interface MyDoc { // Document >MyDoc : MyDoc createElement(tagName: string): Base; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } >tagName : string >Base : Base createElement(tagName: 'canvas'): Derived1; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'canvas' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "canvas" >Derived1 : Derived1 createElement(tagName: 'div'): Derived2; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'div' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "div" >Derived2 : Derived2 createElement(tagName: 'span'): Derived3; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'span' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "span" >Derived3 : Derived3 // + 100 more @@ -49,27 +49,27 @@ class D implements MyDoc { >MyDoc : MyDoc createElement(tagName:string): Base; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } >tagName : string >Base : Base createElement(tagName: 'canvas'): Derived1; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'canvas' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "canvas" >Derived1 : Derived1 createElement(tagName: 'div'): Derived2; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'div' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "div" >Derived2 : Derived2 createElement(tagName: 'span'): Derived3; ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } ->tagName : 'span' +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } +>tagName : "span" >Derived3 : Derived3 createElement(tagName:any): Base { ->createElement : { (tagName: string): Base; (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; } +>createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; } >tagName : any >Base : Base diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.types b/tests/baselines/reference/overloadOnConstConstraintChecks2.types index 36fa89dec4a5a..6102c282a60a3 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks2.types +++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.types @@ -14,22 +14,22 @@ class C extends A { >foo : () => void } function foo(name: 'hi'): B; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } ->name : 'hi' +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "hi" >B : B function foo(name: 'bye'): C; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } ->name : 'bye' +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "bye" >C : C function foo(name: string): A; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } >name : string >A : A function foo(name: any): A { ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } >name : any >A : A diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.types b/tests/baselines/reference/overloadOnConstConstraintChecks3.types index 94a03bb768070..0348d3d4b79b8 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks3.types +++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.types @@ -16,22 +16,22 @@ class C extends A { >foo : () => void } function foo(name: 'hi'): B; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } ->name : 'hi' +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "hi" >B : B function foo(name: 'bye'): C; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } ->name : 'bye' +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "bye" >C : C function foo(name: string): A; ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } >name : string >A : A function foo(name: any): A { ->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; } +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } >name : any >A : A diff --git a/tests/baselines/reference/overloadOnConstInheritance1.types b/tests/baselines/reference/overloadOnConstInheritance1.types index 96f8df3dffdf9..4721c18e55c8a 100644 --- a/tests/baselines/reference/overloadOnConstInheritance1.types +++ b/tests/baselines/reference/overloadOnConstInheritance1.types @@ -3,23 +3,23 @@ interface Base { >Base : Base addEventListener(x: string): any; ->addEventListener : { (x: string): any; (x: 'foo'): string; } +>addEventListener : { (x: string): any; (x: "foo"): string; } >x : string addEventListener(x: 'foo'): string; ->addEventListener : { (x: string): any; (x: 'foo'): string; } ->x : 'foo' +>addEventListener : { (x: string): any; (x: "foo"): string; } +>x : "foo" } interface Deriver extends Base { >Deriver : Deriver >Base : Base addEventListener(x: string): any; ->addEventListener : { (x: string): any; (x: 'bar'): string; } +>addEventListener : { (x: string): any; (x: "bar"): string; } >x : string addEventListener(x: 'bar'): string; ->addEventListener : { (x: string): any; (x: 'bar'): string; } ->x : 'bar' +>addEventListener : { (x: string): any; (x: "bar"): string; } +>x : "bar" } diff --git a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt index 159af64a13ae2..4870106f4745b 100644 --- a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt +++ b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. Types of property 'addEventListener' are incompatible. - Type '(x: 'bar') => string' is not assignable to type '{ (x: string): any; (x: 'foo'): string; }'. + Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -13,7 +13,7 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Speciali ~~~~~~~ !!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. !!! error TS2430: Types of property 'addEventListener' are incompatible. -!!! error TS2430: Type '(x: 'bar') => string' is not assignable to type '{ (x: string): any; (x: 'foo'): string; }'. +!!! error TS2430: Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. diff --git a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt index e0fff7b1ec73c..b338f9795d79c 100644 --- a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt +++ b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/overloadOnConstInheritance3.ts(4,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. Types of property 'addEventListener' are incompatible. - Type '{ (x: 'bar'): string; (x: 'foo'): string; }' is not assignable to type '(x: string) => any'. + Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'. tests/cases/compiler/overloadOnConstInheritance3.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -13,7 +13,7 @@ tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Speciali ~~~~~~~ !!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. !!! error TS2430: Types of property 'addEventListener' are incompatible. -!!! error TS2430: Type '{ (x: 'bar'): string; (x: 'foo'): string; }' is not assignable to type '(x: string) => any'. +!!! error TS2430: Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'. // shouldn't need to redeclare the string overload addEventListener(x: 'bar'): string; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.types b/tests/baselines/reference/primtiveTypesAreIdentical.types index bbff4623f0b88..0b8e7dadf7dc3 100644 --- a/tests/baselines/reference/primtiveTypesAreIdentical.types +++ b/tests/baselines/reference/primtiveTypesAreIdentical.types @@ -50,19 +50,19 @@ function foo4(x: any) { } >x : any function foo5(x: 'a'); ->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; } ->x : 'a' +>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; } +>x : "a" function foo5(x: 'a'); ->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; } ->x : 'a' +>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; } +>x : "a" function foo5(x: string); ->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; } +>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; } >x : string function foo5(x: any) { } ->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; } +>foo5 : { (x: "a"): any; (x: "a"): any; (x: string): any; } >x : any enum E { A } diff --git a/tests/baselines/reference/specializedSignatureInInterface.types b/tests/baselines/reference/specializedSignatureInInterface.types index c8f76f4cb9b09..b9621af7b8be0 100644 --- a/tests/baselines/reference/specializedSignatureInInterface.types +++ b/tests/baselines/reference/specializedSignatureInInterface.types @@ -11,8 +11,8 @@ interface B extends A { >A : A (key:'foo'):string; ->key : 'foo' +>key : "foo" (key:'bar'):string; ->key : 'bar' +>key : "bar" } diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types index cb86966d65a0b..b27a935ced687 100644 --- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types +++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types @@ -3,30 +3,30 @@ // All the below should not be errors function foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; } +>x : "a" function foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; } +>foo : { (x: "a"): any; (x: string): any; } >x : string function foo(x: any) { } ->foo : { (x: 'a'): any; (x: string): any; } +>foo : { (x: "a"): any; (x: string): any; } >x : any class C { >C : C foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; } +>foo : { (x: "a"): any; (x: string): any; } >x : string foo(x: any) { } ->foo : { (x: 'a'): any; (x: string): any; } +>foo : { (x: "a"): any; (x: string): any; } >x : any } @@ -35,20 +35,20 @@ class C2 { >T : T foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : string foo(x: T); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : T >T : T foo(x: any) { } ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : any } @@ -58,20 +58,20 @@ class C3 { >String : String foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : string foo(x: T); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : T >T : T foo(x: any) { } ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : any } @@ -79,7 +79,7 @@ interface I { >I : I (x: 'a'); ->x : 'a' +>x : "a" (x: number); >x : number @@ -88,15 +88,15 @@ interface I { >x : string foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; (x: number): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; (x: number): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; (x: number): any; } +>foo : { (x: "a"): any; (x: string): any; (x: number): any; } >x : string foo(x: number); ->foo : { (x: 'a'): any; (x: string): any; (x: number): any; } +>foo : { (x: "a"): any; (x: string): any; (x: number): any; } >x : number } @@ -105,7 +105,7 @@ interface I2 { >T : T (x: 'a'); ->x : 'a' +>x : "a" (x: T); >x : T @@ -115,15 +115,15 @@ interface I2 { >x : string foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : string foo(x: T); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : T >T : T } @@ -134,7 +134,7 @@ interface I3 { >String : String (x: 'a'); ->x : 'a' +>x : "a" (x: string); >x : string @@ -144,49 +144,49 @@ interface I3 { >T : T foo(x: 'a'); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } ->x : 'a' +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } +>x : "a" foo(x: string); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : string foo(x: T); ->foo : { (x: 'a'): any; (x: string): any; (x: T): any; } +>foo : { (x: "a"): any; (x: string): any; (x: T): any; } >x : T >T : T } var a: { ->a : { (x: string): any; (x: 'a'): any; (x: number): any; foo(x: string): any; foo(x: 'a'): any; foo(x: number): any; } +>a : { (x: string): any; (x: "a"): any; (x: number): any; foo(x: string): any; foo(x: "a"): any; foo(x: number): any; } (x: string); >x : string (x: 'a'); ->x : 'a' +>x : "a" (x: number); >x : number foo(x: string); ->foo : { (x: string): any; (x: 'a'): any; (x: number): any; } +>foo : { (x: string): any; (x: "a"): any; (x: number): any; } >x : string foo(x: 'a'); ->foo : { (x: string): any; (x: 'a'): any; (x: number): any; } ->x : 'a' +>foo : { (x: string): any; (x: "a"): any; (x: number): any; } +>x : "a" foo(x: number); ->foo : { (x: string): any; (x: 'a'): any; (x: number): any; } +>foo : { (x: string): any; (x: "a"): any; (x: number): any; } >x : number } var a2: { ->a2 : { (x: 'a'): any; (x: string): any; (x: T): any; foo(x: string): any; foo(x: 'a'): any; foo(x: T): any; } +>a2 : { (x: "a"): any; (x: string): any; (x: T): any; foo(x: string): any; foo(x: "a"): any; foo(x: T): any; } (x: 'a'); ->x : 'a' +>x : "a" (x: string); >x : string @@ -197,25 +197,25 @@ var a2: { >T : T foo(x: string); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } >x : string foo(x: 'a'); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } ->x : 'a' +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } +>x : "a" foo(x: T); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } >T : T >x : T >T : T } var a3: { ->a3 : { (x: 'a'): any; (x: T): any; (x: string): any; foo(x: string): any; foo(x: 'a'): any; foo(x: T): any; } +>a3 : { (x: "a"): any; (x: T): any; (x: string): any; foo(x: string): any; foo(x: "a"): any; foo(x: T): any; } (x: 'a'); ->x : 'a' +>x : "a" (x: T); >T : T @@ -226,15 +226,15 @@ var a3: { >x : string foo(x: string); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } >x : string foo(x: 'a'); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } ->x : 'a' +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } +>x : "a" foo(x: T); ->foo : { (x: string): any; (x: 'a'): any; (x: T): any; } +>foo : { (x: string): any; (x: "a"): any; (x: T): any; } >T : T >String : String >x : T diff --git a/tests/baselines/reference/stringLiteralType.types b/tests/baselines/reference/stringLiteralType.types index 5d2e13c4ba5fa..affa995c2f30f 100644 --- a/tests/baselines/reference/stringLiteralType.types +++ b/tests/baselines/reference/stringLiteralType.types @@ -1,16 +1,16 @@ === tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts === var x: 'hi'; ->x : 'hi' +>x : "hi" function f(x: 'hi'); ->f : { (x: 'hi'): any; (x: string): any; } ->x : 'hi' +>f : { (x: "hi"): any; (x: string): any; } +>x : "hi" function f(x: string); ->f : { (x: 'hi'): any; (x: string): any; } +>f : { (x: "hi"): any; (x: string): any; } >x : string function f(x: any) { ->f : { (x: 'hi'): any; (x: string): any; } +>f : { (x: "hi"): any; (x: string): any; } >x : any } diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt index 378857dc2771f..6e0fd982638fd 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,7): error TS2322: Type 'string' is not assignable to type '"string"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,7): error TS2322: Type 'string' is not assignable to type ''number''. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,7): error TS2322: Type 'string' is not assignable to type '"number"'. tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,7): error TS2322: Type 'string' is not assignable to type '"boolean"'. @@ -43,7 +43,7 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34, !!! error TS2322: Type 'string' is not assignable to type '"string"'. const number: "number" = "number" ~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type ''number''. +!!! error TS2322: Type 'string' is not assignable to type '"number"'. const boolean: "boolean" = "boolean" ~~~~~~~ !!! error TS2322: Type 'string' is not assignable to type '"boolean"'. diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js index 23483776a9b88..73dabd26fab18 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js @@ -106,9 +106,9 @@ declare namespace Consts1 { declare const string: "string"; declare const number: "number"; declare const boolean: "boolean"; -declare const stringOrNumber: "string" | 'number'; +declare const stringOrNumber: "string" | "number"; declare const stringOrBoolean: "string" | "boolean"; -declare const booleanOrNumber: 'number' | "boolean"; -declare const stringOrBooleanOrNumber: "string" | "boolean" | 'number'; +declare const booleanOrNumber: "number" | "boolean"; +declare const stringOrBooleanOrNumber: "string" | "boolean" | "number"; declare namespace Consts2 { } diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt index d3c399477d66c..da742fcd69cbd 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt +++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts(70,15): error TS2430: Interface 'I2' incorrectly extends interface 'Base2'. Types of property 'a' are incompatible. - Type '(x: string) => string' is not assignable to type '{ (x: 'a'): number; (x: string): number; }'. + Type '(x: string) => string' is not assignable to type '{ (x: "a"): number; (x: string): number; }'. Type 'string' is not assignable to type 'number'. @@ -78,7 +78,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW ~~ !!! error TS2430: Interface 'I2' incorrectly extends interface 'Base2'. !!! error TS2430: Types of property 'a' are incompatible. -!!! error TS2430: Type '(x: string) => string' is not assignable to type '{ (x: 'a'): number; (x: string): number; }'. +!!! error TS2430: Type '(x: string) => string' is not assignable to type '{ (x: "a"): number; (x: string): number; }'. !!! error TS2430: Type 'string' is not assignable to type 'number'. // N's a: (x: string) => string; // error because base returns non-void; diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt index 03cc6de0ca4b4..8a885a2455fb2 100644 --- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt +++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts(70,15): error TS2430: Interface 'I2' incorrectly extends interface 'Base2'. Types of property 'a' are incompatible. - Type 'new (x: string) => string' is not assignable to type '{ new (x: 'a'): number; new (x: string): number; }'. + Type 'new (x: string) => string' is not assignable to type '{ new (x: "a"): number; new (x: string): number; }'. Type 'string' is not assignable to type 'number'. @@ -78,7 +78,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW ~~ !!! error TS2430: Interface 'I2' incorrectly extends interface 'Base2'. !!! error TS2430: Types of property 'a' are incompatible. -!!! error TS2430: Type 'new (x: string) => string' is not assignable to type '{ new (x: 'a'): number; new (x: string): number; }'. +!!! error TS2430: Type 'new (x: string) => string' is not assignable to type '{ new (x: "a"): number; new (x: string): number; }'. !!! error TS2430: Type 'string' is not assignable to type 'number'. // N's a: new (x: string) => string; // error because base returns non-void; diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.types b/tests/baselines/reference/typesWithSpecializedCallSignatures.types index fa3ac7a4ba4d4..113e24456f984 100644 --- a/tests/baselines/reference/typesWithSpecializedCallSignatures.types +++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.types @@ -19,22 +19,22 @@ class C { >C : C foo(x: 'hi'): Derived1; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'hi' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "hi" >Derived1 : Derived1 foo(x: 'bye'): Derived2; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'bye' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "bye" >Derived2 : Derived2 foo(x: string): Base; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >x : string >Base : Base foo(x) { ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >x : any return x; @@ -50,17 +50,17 @@ interface I { >I : I foo(x: 'hi'): Derived1; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'hi' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "hi" >Derived1 : Derived1 foo(x: 'bye'): Derived2; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'bye' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "bye" >Derived2 : Derived2 foo(x: string): Base; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >x : string >Base : Base } @@ -69,20 +69,20 @@ var i: I; >I : I var a: { ->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } foo(x: 'hi'): Derived1; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'hi' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "hi" >Derived1 : Derived1 foo(x: 'bye'): Derived2; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } ->x : 'bye' +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } +>x : "bye" >Derived2 : Derived2 foo(x: string): Base; ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >x : string >Base : Base @@ -94,9 +94,9 @@ c = i; >i : I c = a; ->c = a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>c = a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } >c : C ->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } i = c; >i = c : C @@ -104,44 +104,44 @@ i = c; >c : C i = a; ->i = a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>i = a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } >i : I ->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } a = c; >a = c : C ->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } >c : C a = i; >a = i : I ->a : { foo(x: 'hi'): Derived1; foo(x: 'bye'): Derived2; foo(x: string): Base; } +>a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; } >i : I var r1: Derived1 = c.foo('hi'); >r1 : Derived1 >Derived1 : Derived1 >c.foo('hi') : Derived1 ->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >c : C ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >'hi' : string var r2: Derived2 = c.foo('bye'); >r2 : Derived2 >Derived2 : Derived2 >c.foo('bye') : Derived2 ->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >c : C ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >'bye' : string var r3: Base = c.foo('hm'); >r3 : Base >Base : Base >c.foo('hm') : Base ->c.foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >c : C ->foo : { (x: 'hi'): Derived1; (x: 'bye'): Derived2; (x: string): Base; } +>foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >'hm' : string diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types index 66e274d917adc..2698439c527af 100644 --- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types +++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types @@ -19,10 +19,10 @@ class C { >C : C constructor(x: 'hi'); ->x : 'hi' +>x : "hi" constructor(x: 'bye'); ->x : 'bye' +>x : "bye" constructor(x: string); >x : string @@ -44,11 +44,11 @@ interface I { >I : I new(x: 'hi'): Derived1; ->x : 'hi' +>x : "hi" >Derived1 : Derived1 new(x: 'bye'): Derived2; ->x : 'bye' +>x : "bye" >Derived2 : Derived2 new(x: string): Base; @@ -60,14 +60,14 @@ var i: I; >I : I var a: { ->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } new(x: 'hi'): Derived1; ->x : 'hi' +>x : "hi" >Derived1 : Derived1 new(x: 'bye'): Derived2; ->x : 'bye' +>x : "bye" >Derived2 : Derived2 new(x: string): Base; @@ -82,18 +82,18 @@ c = i; >i : I c = a; ->c = a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>c = a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } >c : C ->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } i = a; ->i = a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>i = a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } >i : I ->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } a = i; >a = i : I ->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } >i : I var r1 = new C('hi'); @@ -113,6 +113,6 @@ var r3: Base = new a('hm'); >r3 : Base >Base : Base >new a('hm') : Base ->a : { new (x: 'hi'): Derived1; new (x: 'bye'): Derived2; new (x: string): Base; } +>a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; } >'hm' : string From f721971063f210389dc3cd4c0d0a6b3e4562d4e8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 15:41:12 -0700 Subject: [PATCH 046/353] Capture compatible contextual types for unions containing string literals. --- src/compiler/checker.ts | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c062398c1a95a..dd6c3a63df9ca 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10103,6 +10103,28 @@ namespace ts { return getUnionType([type1, type2]); } + function checkStringLiteralExpression(node: LiteralExpression) { + // TODO (drosen): Do we want to apply the same approach to no-sub template literals? + + let contextualType = getContextualType(node); + if (contextualType) { + if (contextualType.flags & TypeFlags.Union) { + for (const type of (contextualType).types) { + if (type.flags & TypeFlags.StringLiteral && (type).text === node.text) { + return contextualType; + } + } + } + else if (contextualType.flags & TypeFlags.StringLiteral && (contextualType).text === node.text) { + // NOTE: This doesn't work because the contextual type of a string literal + // always gets its apparent type. + // Thus you'll always end up with 'String' instead of the literal. + return contextualType; + } + } + return stringType; + } + function checkTemplateExpression(node: TemplateExpression): Type { // We just want to check each expressions, but we are unconcerned with // the type of each expression, as any value may be coerced into a string. @@ -10233,8 +10255,9 @@ namespace ts { case SyntaxKind.TemplateExpression: return checkTemplateExpression(node); case SyntaxKind.StringLiteral: + return checkStringLiteralExpression(node); case SyntaxKind.NoSubstitutionTemplateLiteral: - return stringType; + return stringType case SyntaxKind.RegularExpressionLiteral: return globalRegExpType; case SyntaxKind.ArrayLiteralExpression: From 7b4e94dbd57aef497a6cda2d6b440d35dd6e9d19 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 15:42:16 -0700 Subject: [PATCH 047/353] Accepted baselines. --- ...tringLiteralTypesInUnionTypes01.errors.txt | 33 ------- .../stringLiteralTypesInUnionTypes01.symbols | 52 +++++++++++ .../stringLiteralTypesInUnionTypes01.types | 62 +++++++++++++ .../stringLiteralTypesInUnionTypes02.types | 4 +- ...tringLiteralTypesInUnionTypes03.errors.txt | 7 +- ...tringLiteralTypesInUnionTypes04.errors.txt | 50 ---------- .../stringLiteralTypesInUnionTypes04.symbols | 76 +++++++++++++++ .../stringLiteralTypesInUnionTypes04.types | 92 +++++++++++++++++++ ...ingLiteralTypesTypePredicates01.errors.txt | 7 +- 9 files changed, 286 insertions(+), 97 deletions(-) delete mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes01.types delete mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes04.types diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt deleted file mode 100644 index 14d0a892f55d0..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.errors.txt +++ /dev/null @@ -1,33 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(4,5): error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. - Type 'string' is not assignable to type '"baz"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts(5,5): error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. - Type 'string' is not assignable to type '"baz"'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts (2 errors) ==== - - type T = "foo" | "bar" | "baz"; - - var x: "foo" | "bar" | "baz" = "foo"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. -!!! error TS2322: Type 'string' is not assignable to type '"baz"'. - var y: T = "bar"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo" | "bar" | "baz"'. -!!! error TS2322: Type 'string' is not assignable to type '"baz"'. - - if (x === "foo") { - let a = x; - } - else if (x !== "bar") { - let b = x || y; - } - else { - let c = x; - let d = y; - let e: (typeof x) | (typeof y) = c || d; - } - - x = y; - y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols new file mode 100644 index 0000000000000..c608929383ed3 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.symbols @@ -0,0 +1,52 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts === + +type T = "foo" | "bar" | "baz"; +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes01.ts, 0, 0)) + +var x: "foo" | "bar" | "baz" = "foo"; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) + +var y: T = "bar"; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes01.ts, 0, 0)) + +if (x === "foo") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes01.ts, 7, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) +} +else if (x !== "bar") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) + + let b = x || y; +>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes01.ts, 10, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) +} +else { + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes01.ts, 13, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) + + let d = y; +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes01.ts, 14, 7)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) + + let e: (typeof x) | (typeof y) = c || d; +>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes01.ts, 15, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes01.ts, 13, 7)) +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes01.ts, 14, 7)) +} + +x = y; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) + +y = x; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes01.ts, 4, 3)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes01.ts, 3, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types new file mode 100644 index 0000000000000..b5a2d876bcc11 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types @@ -0,0 +1,62 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes01.ts === + +type T = "foo" | "bar" | "baz"; +>T : "foo" | "bar" | "baz" + +var x: "foo" | "bar" | "baz" = "foo"; +>x : "foo" | "bar" | "baz" +>"foo" : "foo" | "bar" | "baz" + +var y: T = "bar"; +>y : "foo" | "bar" | "baz" +>T : "foo" | "bar" | "baz" +>"bar" : "foo" | "bar" | "baz" + +if (x === "foo") { +>x === "foo" : boolean +>x : "foo" | "bar" | "baz" +>"foo" : string + + let a = x; +>a : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" +} +else if (x !== "bar") { +>x !== "bar" : boolean +>x : "foo" | "bar" | "baz" +>"bar" : string + + let b = x || y; +>b : "foo" | "bar" | "baz" +>x || y : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" +>y : "foo" | "bar" | "baz" +} +else { + let c = x; +>c : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" + + let d = y; +>d : "foo" | "bar" | "baz" +>y : "foo" | "bar" | "baz" + + let e: (typeof x) | (typeof y) = c || d; +>e : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" +>y : "foo" | "bar" | "baz" +>c || d : "foo" | "bar" | "baz" +>c : "foo" | "bar" | "baz" +>d : "foo" | "bar" | "baz" +} + +x = y; +>x = y : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" +>y : "foo" | "bar" | "baz" + +y = x; +>y = x : "foo" | "bar" | "baz" +>y : "foo" | "bar" | "baz" +>x : "foo" | "bar" | "baz" + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types index 569edc7781593..e3ac5ba481785 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types @@ -5,12 +5,12 @@ type T = string | "foo" | "bar" | "baz"; var x: "foo" | "bar" | "baz" | string = "foo"; >x : "foo" | "bar" | "baz" | string ->"foo" : string +>"foo" : "foo" | "bar" | "baz" | string var y: T = "bar"; >y : string | "foo" | "bar" | "baz" >T : string | "foo" | "bar" | "baz" ->"bar" : string +>"bar" : string | "foo" | "bar" | "baz" if (x === "foo") { >x === "foo" : boolean diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt index 8ff377b2e728e..74249b178d619 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt @@ -1,18 +1,13 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(5,5): error TS2322: Type 'string' is not assignable to type 'number | "foo" | "bar"'. - Type 'string' is not assignable to type '"bar"'. tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(7,5): error TS2365: Operator '===' cannot be applied to types '"foo" | "bar" | number' and 'string'. tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(10,10): error TS2365: Operator '!==' cannot be applied to types '"foo" | "bar" | number' and 'string'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (3 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (2 errors) ==== type T = number | "foo" | "bar"; var x: "foo" | "bar" | number; var y: T = "bar"; - ~ -!!! error TS2322: Type 'string' is not assignable to type 'number | "foo" | "bar"'. -!!! error TS2322: Type 'string' is not assignable to type '"bar"'. if (x === "foo") { ~~~~~~~~~~~ diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt deleted file mode 100644 index 77cb9c09531a7..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.errors.txt +++ /dev/null @@ -1,50 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(4,5): error TS2322: Type 'string' is not assignable to type '"" | "foo"'. - Type 'string' is not assignable to type '"foo"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts(5,5): error TS2322: Type 'string' is not assignable to type '"" | "foo"'. - Type 'string' is not assignable to type '"foo"'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts (2 errors) ==== - - type T = "" | "foo"; - - let x: T = ""; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"" | "foo"'. -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. - let y: T = "foo"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"" | "foo"'. -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. - - if (x === "") { - let a = x; - } - - if (x !== "") { - let b = x; - } - - if (x == "") { - let c = x; - } - - if (x != "") { - let d = x; - } - - if (x) { - let e = x; - } - - if (!x) { - let f = x; - } - - if (!!x) { - let g = x; - } - - if (!!!x) { - let h = x; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols new file mode 100644 index 0000000000000..ced93fcefc98f --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.symbols @@ -0,0 +1,76 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts === + +type T = "" | "foo"; +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0)) + +let x: T = ""; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0)) + +let y: T = "foo"; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes04.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes04.ts, 0, 0)) + +if (x === "") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes04.ts, 7, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (x !== "") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let b = x; +>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes04.ts, 11, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (x == "") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes04.ts, 15, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (x != "") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let d = x; +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes04.ts, 19, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (x) { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let e = x; +>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes04.ts, 23, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (!x) { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let f = x; +>f : Symbol(f, Decl(stringLiteralTypesInUnionTypes04.ts, 27, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (!!x) { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let g = x; +>g : Symbol(g, Decl(stringLiteralTypesInUnionTypes04.ts, 31, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} + +if (!!!x) { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) + + let h = x; +>h : Symbol(h, Decl(stringLiteralTypesInUnionTypes04.ts, 35, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes04.ts, 3, 3)) +} diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types new file mode 100644 index 0000000000000..9a010b490cca2 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types @@ -0,0 +1,92 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes04.ts === + +type T = "" | "foo"; +>T : "" | "foo" + +let x: T = ""; +>x : "" | "foo" +>T : "" | "foo" +>"" : "" | "foo" + +let y: T = "foo"; +>y : "" | "foo" +>T : "" | "foo" +>"foo" : "" | "foo" + +if (x === "") { +>x === "" : boolean +>x : "" | "foo" +>"" : string + + let a = x; +>a : "" | "foo" +>x : "" | "foo" +} + +if (x !== "") { +>x !== "" : boolean +>x : "" | "foo" +>"" : string + + let b = x; +>b : "" | "foo" +>x : "" | "foo" +} + +if (x == "") { +>x == "" : boolean +>x : "" | "foo" +>"" : string + + let c = x; +>c : "" | "foo" +>x : "" | "foo" +} + +if (x != "") { +>x != "" : boolean +>x : "" | "foo" +>"" : string + + let d = x; +>d : "" | "foo" +>x : "" | "foo" +} + +if (x) { +>x : "" | "foo" + + let e = x; +>e : "" | "foo" +>x : "" | "foo" +} + +if (!x) { +>!x : boolean +>x : "" | "foo" + + let f = x; +>f : "" | "foo" +>x : "" | "foo" +} + +if (!!x) { +>!!x : boolean +>!x : boolean +>x : "" | "foo" + + let g = x; +>g : "" | "foo" +>x : "" | "foo" +} + +if (!!!x) { +>!!!x : boolean +>!!x : boolean +>!x : boolean +>x : "" | "foo" + + let h = x; +>h : "" | "foo" +>x : "" | "foo" +} diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt index 3e412a6c770f0..b888c3ca77e40 100644 --- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt @@ -1,10 +1,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(10,5): error TS2322: Type 'string' is not assignable to type '"A" | "B"'. - Type 'string' is not assignable to type '"B"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (3 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (2 errors) ==== type Kind = "A" | "B" @@ -19,9 +17,6 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.t } var x: Kind = "A"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"A" | "B"'. -!!! error TS2322: Type 'string' is not assignable to type '"B"'. if (kindIs(x, "A")) { let a = x; From d8d72aabae439e17d18e35887981165413b71556 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 16:00:45 -0700 Subject: [PATCH 048/353] Separated the concept of apparent types from contextual types for string literal types. In most cases, expressions are interested in the apparent type of the contextual type. For instance: var x = { hasOwnProperty(prop) { /* ... */ }; In the above, 'prop' should be contextually typed as 'string' from the signature of 'hasOwnProperty' in the global 'Object' type. However, in the case of string literal types, we don't want to get the apparent type after fetching the contextual type. This is because the apparent type of the '"onload"' string literal type is the global 'String' type. This has adverse effects in simple assignments like the following: let x: "onload" = "onload"; In this example, the right-hand side of the assignment will grab the type of 'x'. After figuring out the type is "onload", we then get the apparent type which is 'String'. This is problematic because when we then check the assignment itself, 'String's are not assignable to '"onload"'s. So in this case, we grab the contextual type *without* getting its apparent type. --- src/compiler/checker.ts | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dd6c3a63df9ca..2dcded72ad466 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -80,7 +80,7 @@ namespace ts { symbolToString, getAugmentedPropertiesOfType, getRootSymbols, - getContextualType, + getContextualType: getApparentTypeOfContextualType, getFullyQualifiedName, getResolvedSignature, getConstantValue, @@ -6716,7 +6716,7 @@ namespace ts { else if (operator === SyntaxKind.BarBarToken) { // When an || expression has a contextual type, the operands are contextually typed by that type. When an || // expression has no contextual type, the right operand is contextually typed by the type of the left operand. - let type = getContextualType(binaryExpression); + let type = getApparentTypeOfContextualType(binaryExpression); if (!type && node === binaryExpression.right) { type = checkExpression(binaryExpression.left); } @@ -6788,7 +6788,7 @@ namespace ts { function getContextualTypeForObjectLiteralElement(element: ObjectLiteralElement) { let objectLiteral = element.parent; - let type = getContextualType(objectLiteral); + let type = getApparentTypeOfContextualType(objectLiteral); if (type) { if (!hasDynamicName(element)) { // For a (non-symbol) computed property, there is no reason to look up the name @@ -6814,7 +6814,7 @@ namespace ts { // type of T. function getContextualTypeForElementExpression(node: Expression): Type { let arrayLiteral = node.parent; - let type = getContextualType(arrayLiteral); + let type = getApparentTypeOfContextualType(arrayLiteral); if (type) { let index = indexOf(arrayLiteral.elements, node); return getTypeOfPropertyOfContextualType(type, "" + index) @@ -6827,7 +6827,7 @@ namespace ts { // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type. function getContextualTypeForConditionalOperand(node: Expression): Type { let conditional = node.parent; - return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined; + return node === conditional.whenTrue || node === conditional.whenFalse ? getApparentTypeOfContextualType(conditional) : undefined; } function getContextualTypeForJsxExpression(expr: JsxExpression|JsxSpreadAttribute): Type { @@ -6852,12 +6852,22 @@ namespace ts { // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily // be "pushed" onto a node using the contextualType property. - function getContextualType(node: Expression): Type { - let type = getContextualTypeWorker(node); + function getApparentTypeOfContextualType(node: Expression): Type { + let type = getContextualType(node); return type && getApparentType(type); } - function getContextualTypeWorker(node: Expression): Type { + /** + * Woah! Do you really want to use this function? + * + * Unless you're trying to get the *non-apparent* type for a value-literal type, + * you probably meant to use 'getApparentTypeOfContextualType'. + * Otherwise this is slightly less useful. + * + * @param node the expression whose contextual type will be returned. + * @returns the contextual type of an expression. + */ + function getContextualType(node: Expression): Type { if (isInsideWithStatementBody(node)) { // We cannot answer semantic questions within a with block, do not proceed any further return undefined; @@ -6896,7 +6906,7 @@ namespace ts { Debug.assert(parent.parent.kind === SyntaxKind.TemplateExpression); return getContextualTypeForSubstitutionExpression(parent.parent, node); case SyntaxKind.ParenthesizedExpression: - return getContextualType(parent); + return getApparentTypeOfContextualType(parent); case SyntaxKind.JsxExpression: case SyntaxKind.JsxSpreadAttribute: return getContextualTypeForJsxExpression(parent); @@ -6936,7 +6946,7 @@ namespace ts { Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node)); let type = isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) - : getContextualType(node); + : getApparentTypeOfContextualType(node); if (!type) { return undefined; } @@ -7066,7 +7076,7 @@ namespace ts { type.pattern = node; return type; } - let contextualType = getContextualType(node); + let contextualType = getApparentTypeOfContextualType(node); if (contextualType && contextualTypeIsTupleLikeType(contextualType)) { let pattern = contextualType.pattern; // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting @@ -7157,7 +7167,7 @@ namespace ts { let propertiesTable: SymbolTable = {}; let propertiesArray: Symbol[] = []; - let contextualType = getContextualType(node); + let contextualType = getApparentTypeOfContextualType(node); let contextualTypeHasPattern = contextualType && contextualType.pattern && (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression); let inDestructuringPattern = isAssignmentTarget(node); @@ -10116,9 +10126,6 @@ namespace ts { } } else if (contextualType.flags & TypeFlags.StringLiteral && (contextualType).text === node.text) { - // NOTE: This doesn't work because the contextual type of a string literal - // always gets its apparent type. - // Thus you'll always end up with 'String' instead of the literal. return contextualType; } } @@ -10184,7 +10191,7 @@ namespace ts { if (isInferentialContext(contextualMapper)) { let signature = getSingleCallSignature(type); if (signature && signature.typeParameters) { - let contextualType = getContextualType(node); + let contextualType = getApparentTypeOfContextualType(node); if (contextualType) { let contextualSignature = getSingleCallSignature(contextualType); if (contextualSignature && !contextualSignature.typeParameters) { From 315b06dc99b6bcf6079e31f535d9ab3171d1d9ad Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 16:09:57 -0700 Subject: [PATCH 049/353] Accepted baselines. --- ...ritedOverloadedSpecializedSignatures.types | 16 ++++----- ...pecializedCallAndConstructSignatures.types | 4 +-- .../stringLiteralTypesAndTuples01.errors.txt | 9 +---- .../stringLiteralTypesAsTags01.errors.txt | 9 +---- ...alTypesInVariableDeclarations01.errors.txt | 34 ++----------------- .../stringLiteralTypesOverloads01.errors.txt | 11 +----- .../stringLiteralTypesOverloads02.errors.txt | 11 +----- .../reference/symbolProperty41.types | 2 +- ...gumentsWithStringLiteralTypes01.errors.txt | 18 +++++----- .../typesWithSpecializedCallSignatures.types | 4 +-- ...esWithSpecializedConstructSignatures.types | 4 +-- 11 files changed, 30 insertions(+), 92 deletions(-) diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types index 0ec428bb159fc..563cb58a755e0 100644 --- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types +++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types @@ -24,7 +24,7 @@ b('foo').charAt(0); >b('foo').charAt : (pos: number) => string >b('foo') : string >b : B ->'foo' : string +>'foo' : "foo" >charAt : (pos: number) => string >0 : number @@ -94,25 +94,25 @@ var x1: string[] = c('B2'); >x1 : string[] >c('B2') : string[] >c : C ->'B2' : string +>'B2' : "B2" var x2: number = c('B1'); >x2 : number >c('B1') : number >c : C ->'B1' : string +>'B1' : "B1" var x3: boolean = c('A2'); >x3 : boolean >c('A2') : boolean >c : C ->'A2' : string +>'A2' : "A2" var x4: string = c('A1'); >x4 : string >c('A1') : string >c : C ->'A1' : string +>'A1' : "A1" var x5: void = c('A0'); >x5 : void @@ -124,19 +124,19 @@ var x6: number[] = c('C1'); >x6 : number[] >c('C1') : number[] >c : C ->'C1' : string +>'C1' : "C1" var x7: boolean[] = c('C2'); >x7 : boolean[] >c('C2') : boolean[] >c : C ->'C2' : string +>'C2' : "C2" var x8: string = c('C'); >x8 : string >c('C') : string >c : C ->'C' : string +>'C' : "C" var x9: void = c('generic'); >x9 : void diff --git a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types index 7b19fd5889b31..5288d9f15a434 100644 --- a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types +++ b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types @@ -24,7 +24,7 @@ var r = f('a'); >r : number >f('a') : number >f : Foo ->'a' : string +>'a' : "a" var r2 = f('A'); >r2 : any @@ -36,7 +36,7 @@ var r3 = new f('a'); >r3 : any >new f('a') : any >f : Foo ->'a' : string +>'a' : "a" var r4 = new f('A'); >r4 : Object diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt b/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt index 849f4922e45fc..6a8704ce5546f 100644 --- a/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt @@ -1,20 +1,13 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts(6,5): error TS2322: Type '[string, string, string]' is not assignable to type '["I'm", "a", any]'. - Types of property '0' are incompatible. - Type 'string' is not assignable to type '"I'm"'. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts(6,37): error TS2304: Cannot find name 'Dinosaur'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts (2 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts (1 errors) ==== // Should all be strings. let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; type RexOrRaptor = "t-rex" | "raptor" let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; - ~~~~~~~~~~~~~~~~~ -!!! error TS2322: Type '[string, string, string]' is not assignable to type '["I'm", "a", any]'. -!!! error TS2322: Types of property '0' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type '"I'm"'. ~~~~~~~~ !!! error TS2304: Cannot find name 'Dinosaur'. diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt index df05e25304fcb..6e4f8943fb6af 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt @@ -2,12 +2,9 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10) tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. - Types of property 'kind' are incompatible. - Type 'string' is not assignable to type '"A"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (5 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (4 errors) ==== type Kind = "A" | "B" @@ -41,10 +38,6 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): } let x: A = { - ~ -!!! error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'. -!!! error TS2322: Types of property 'kind' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type '"A"'. kind: "A", a: 100, } diff --git a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt index 3dd2adbbce08b..1a639a1c22284 100644 --- a/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInVariableDeclarations01.errors.txt @@ -1,17 +1,7 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(5,7): error TS1155: 'const' declarations must be initialized -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(7,1): error TS2322: Type 'string' is not assignable to type '""'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(8,1): error TS2322: Type 'string' is not assignable to type '"foo"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(9,1): error TS2322: Type 'string' is not assignable to type '"bar"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(11,5): error TS2322: Type 'string' is not assignable to type '""'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(12,5): error TS2322: Type 'string' is not assignable to type '"foo"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(13,5): error TS2322: Type 'string' is not assignable to type '"bar"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(14,7): error TS2322: Type 'string' is not assignable to type '"baz"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(16,1): error TS2322: Type 'string' is not assignable to type '""'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(17,1): error TS2322: Type 'string' is not assignable to type '"foo"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts(18,1): error TS2322: Type 'string' is not assignable to type '"bar"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (11 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarations01.ts (1 errors) ==== let a: ""; var b: "foo"; @@ -21,34 +11,14 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesInVariableDeclarat !!! error TS1155: 'const' declarations must be initialized a = ""; - ~ -!!! error TS2322: Type 'string' is not assignable to type '""'. b = "foo"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. c = "bar"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"bar"'. let e: "" = ""; - ~ -!!! error TS2322: Type 'string' is not assignable to type '""'. var f: "foo" = "foo"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. let g: "bar" = "bar"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"bar"'. const h: "baz" = "baz"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"baz"'. e = ""; - ~ -!!! error TS2322: Type 'string' is not assignable to type '""'. f = "foo"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. - g = "bar"; - ~ -!!! error TS2322: Type 'string' is not assignable to type '"bar"'. \ No newline at end of file + g = "bar"; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt index 6e0fd982638fd..1592427208b3d 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt @@ -1,10 +1,7 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(32,7): error TS2322: Type 'string' is not assignable to type '"string"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(33,7): error TS2322: Type 'string' is not assignable to type '"number"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34,7): error TS2322: Type 'string' is not assignable to type '"boolean"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (4 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (1 errors) ==== type PrimitiveName = 'string' | 'number' | 'boolean'; @@ -39,14 +36,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(34, } const string: "string" = "string" - ~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"string"'. const number: "number" = "number" - ~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"number"'. const boolean: "boolean" = "boolean" - ~~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"boolean"'. const stringOrNumber = string || number; const stringOrBoolean = string || boolean; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt index ae9fb9ce4f67f..995cf687b702c 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.errors.txt @@ -1,10 +1,7 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(9,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(30,7): error TS2322: Type 'string' is not assignable to type '"string"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(31,7): error TS2322: Type 'string' is not assignable to type '"number"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32,7): error TS2322: Type 'string' is not assignable to type '"boolean"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (4 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts (1 errors) ==== function getFalsyPrimitive(x: "string"): string; function getFalsyPrimitive(x: "number"): number; @@ -37,14 +34,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads02.ts(32, } const string: "string" = "string" - ~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"string"'. const number: "number" = "number" - ~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"number"'. const boolean: "boolean" = "boolean" - ~~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type '"boolean"'. const stringOrNumber = string || number; const stringOrBoolean = string || boolean; diff --git a/tests/baselines/reference/symbolProperty41.types b/tests/baselines/reference/symbolProperty41.types index 61b71dfe24689..f312481ac0403 100644 --- a/tests/baselines/reference/symbolProperty41.types +++ b/tests/baselines/reference/symbolProperty41.types @@ -49,5 +49,5 @@ c[Symbol.iterator]("hello"); >Symbol.iterator : symbol >Symbol : SymbolConstructor >iterator : symbol ->"hello" : string +>"hello" : "hello" diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt index 413d21270039a..69f8d6581a1ae 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -14,9 +14,9 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. Type 'string' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. @@ -25,7 +25,7 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 Type '"World"' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. @@ -119,14 +119,14 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 // as "Hello" (or "Hello" | "Hello"). export let a = fun1<"Hello">("Hello", "Hello"); export let b = fun1<"Hello">("Hello", "World"); - ~~~~~~~ + ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. export let c = fun2<"Hello", "Hello">("Hello", "Hello"); export let d = fun2<"Hello", "Hello">("Hello", "World"); - ~~~~~~~ + ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. export let e = fun3<"Hello">("Hello", "World"); - ~~~~~~~ + ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. // Assignment from the returned value should cause an error. @@ -173,8 +173,8 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. export let d = fun2<"World", "Hello">("World", "World"); - ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. + ~~~~~~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. export let e = fun3<"Hello" | "World">("Hello", "World"); // Assignment from the returned value should cause an error. diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.types b/tests/baselines/reference/typesWithSpecializedCallSignatures.types index 113e24456f984..b587ee7840e27 100644 --- a/tests/baselines/reference/typesWithSpecializedCallSignatures.types +++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.types @@ -125,7 +125,7 @@ var r1: Derived1 = c.foo('hi'); >c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >c : C >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } ->'hi' : string +>'hi' : "hi" var r2: Derived2 = c.foo('bye'); >r2 : Derived2 @@ -134,7 +134,7 @@ var r2: Derived2 = c.foo('bye'); >c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } >c : C >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; } ->'bye' : string +>'bye' : "bye" var r3: Base = c.foo('hm'); >r3 : Base diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types index 2698439c527af..3036c0cea714d 100644 --- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types +++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types @@ -100,14 +100,14 @@ var r1 = new C('hi'); >r1 : C >new C('hi') : C >C : typeof C ->'hi' : string +>'hi' : "hi" var r2: Derived2 = new i('bye'); >r2 : Derived2 >Derived2 : Derived2 >new i('bye') : Derived2 >i : I ->'bye' : string +>'bye' : "bye" var r3: Base = new a('hm'); >r3 : Base From 4b736da23172030a4a7970e06fa20cb094167535 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 16:30:22 -0700 Subject: [PATCH 050/353] Fixed issue in test. --- .../types/stringLiteral/stringLiteralTypesAndTuples01.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts index 7ac9aa3b42742..388f4567ed72a 100644 --- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts @@ -4,7 +4,7 @@ let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; type RexOrRaptor = "t-rex" | "raptor" -let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; +let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex']; rawr(dinosaur); From fd5dec4ff12aceb9be710624a5dc6d871e576e58 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Oct 2015 16:34:15 -0700 Subject: [PATCH 051/353] Accepted baselines. --- .../stringLiteralTypesAndTuples01.errors.txt | 25 -------- .../stringLiteralTypesAndTuples01.js | 4 +- .../stringLiteralTypesAndTuples01.symbols | 41 +++++++++++++ .../stringLiteralTypesAndTuples01.types | 59 +++++++++++++++++++ 4 files changed, 102 insertions(+), 27 deletions(-) delete mode 100644 tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAndTuples01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAndTuples01.types diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt b/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt deleted file mode 100644 index 6a8704ce5546f..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesAndTuples01.errors.txt +++ /dev/null @@ -1,25 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts(6,37): error TS2304: Cannot find name 'Dinosaur'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts (1 errors) ==== - - // Should all be strings. - let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; - - type RexOrRaptor = "t-rex" | "raptor" - let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; - ~~~~~~~~ -!!! error TS2304: Cannot find name 'Dinosaur'. - - rawr(dinosaur); - - function rawr(dino: RexOrRaptor) { - if (dino === "t-rex") { - return "ROAAAAR!"; - } - if (dino === "raptor") { - return "yip yip!"; - } - - throw "Unexpected " + dino; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.js b/tests/baselines/reference/stringLiteralTypesAndTuples01.js index 66e57b1eea5ac..ae02d12429a39 100644 --- a/tests/baselines/reference/stringLiteralTypesAndTuples01.js +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.js @@ -4,7 +4,7 @@ let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; type RexOrRaptor = "t-rex" | "raptor" -let [im, a, dinosaur]: ["I'm", "a", Dinosaur] = ['I\'m', 'a', 't-rex']; +let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex']; rawr(dinosaur); @@ -38,5 +38,5 @@ function rawr(dino) { //// [stringLiteralTypesAndTuples01.d.ts] declare let hello: string, brave: string, newish: string, world: string; declare type RexOrRaptor = "t-rex" | "raptor"; -declare let im: "I'm", a: "a", dinosaur: any; +declare let im: "I'm", a: "a", dinosaur: "t-rex" | "raptor"; declare function rawr(dino: RexOrRaptor): string; diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols b/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols new file mode 100644 index 0000000000000..b7ca53517ca15 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.symbols @@ -0,0 +1,41 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts === + +// Should all be strings. +let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; +>hello : Symbol(hello, Decl(stringLiteralTypesAndTuples01.ts, 2, 5)) +>brave : Symbol(brave, Decl(stringLiteralTypesAndTuples01.ts, 2, 11)) +>newish : Symbol(newish, Decl(stringLiteralTypesAndTuples01.ts, 2, 18)) +>world : Symbol(world, Decl(stringLiteralTypesAndTuples01.ts, 2, 26)) + +type RexOrRaptor = "t-rex" | "raptor" +>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71)) + +let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex']; +>im : Symbol(im, Decl(stringLiteralTypesAndTuples01.ts, 5, 5)) +>a : Symbol(a, Decl(stringLiteralTypesAndTuples01.ts, 5, 8)) +>dinosaur : Symbol(dinosaur, Decl(stringLiteralTypesAndTuples01.ts, 5, 11)) +>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71)) + +rawr(dinosaur); +>rawr : Symbol(rawr, Decl(stringLiteralTypesAndTuples01.ts, 7, 15)) +>dinosaur : Symbol(dinosaur, Decl(stringLiteralTypesAndTuples01.ts, 5, 11)) + +function rawr(dino: RexOrRaptor) { +>rawr : Symbol(rawr, Decl(stringLiteralTypesAndTuples01.ts, 7, 15)) +>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14)) +>RexOrRaptor : Symbol(RexOrRaptor, Decl(stringLiteralTypesAndTuples01.ts, 2, 71)) + + if (dino === "t-rex") { +>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14)) + + return "ROAAAAR!"; + } + if (dino === "raptor") { +>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14)) + + return "yip yip!"; + } + + throw "Unexpected " + dino; +>dino : Symbol(dino, Decl(stringLiteralTypesAndTuples01.ts, 9, 14)) +} diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.types b/tests/baselines/reference/stringLiteralTypesAndTuples01.types new file mode 100644 index 0000000000000..740cf237412ca --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.types @@ -0,0 +1,59 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndTuples01.ts === + +// Should all be strings. +let [hello, brave, newish, world] = ["Hello", "Brave", "New", "World"]; +>hello : string +>brave : string +>newish : string +>world : string +>["Hello", "Brave", "New", "World"] : [string, string, string, string] +>"Hello" : string +>"Brave" : string +>"New" : string +>"World" : string + +type RexOrRaptor = "t-rex" | "raptor" +>RexOrRaptor : "t-rex" | "raptor" + +let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex']; +>im : "I'm" +>a : "a" +>dinosaur : "t-rex" | "raptor" +>RexOrRaptor : "t-rex" | "raptor" +>['I\'m', 'a', 't-rex'] : ["I'm", "a", "t-rex" | "raptor"] +>'I\'m' : "I'm" +>'a' : "a" +>'t-rex' : "t-rex" | "raptor" + +rawr(dinosaur); +>rawr(dinosaur) : string +>rawr : (dino: "t-rex" | "raptor") => string +>dinosaur : "t-rex" | "raptor" + +function rawr(dino: RexOrRaptor) { +>rawr : (dino: "t-rex" | "raptor") => string +>dino : "t-rex" | "raptor" +>RexOrRaptor : "t-rex" | "raptor" + + if (dino === "t-rex") { +>dino === "t-rex" : boolean +>dino : "t-rex" | "raptor" +>"t-rex" : string + + return "ROAAAAR!"; +>"ROAAAAR!" : string + } + if (dino === "raptor") { +>dino === "raptor" : boolean +>dino : "t-rex" | "raptor" +>"raptor" : string + + return "yip yip!"; +>"yip yip!" : string + } + + throw "Unexpected " + dino; +>"Unexpected " + dino : string +>"Unexpected " : string +>dino : "t-rex" | "raptor" +} From ce652dc7fbcc34fa36c312aa599fb9904b9f43aa Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 12:27:06 -0700 Subject: [PATCH 052/353] Fixing few code review comments --- src/compiler/commandLineParser.ts | 10 +++++++--- src/compiler/program.ts | 4 ++-- src/compiler/tsc.ts | 2 +- src/harness/projectsRunner.ts | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 2ee0f67382be6..603dff9e7792d 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -375,9 +375,14 @@ namespace ts { } } + /** + * Parses non quoted strings separated by comma e.g. "a,b" would result in string array ["a", "b"] + * @param s + * @param existingValue + */ function parseMultiValueStringArray(s: string, existingValue: string[]) { let value: string[] = existingValue || []; - let hasError: boolean; + let hasError = false; let currentString = ""; if (s) { for (let i = 0; i < s.length; i++) { @@ -480,8 +485,7 @@ namespace ts { } // Check if the value asked was string[] and value provided was not string[] else if (expectedType !== "string[]" || - typeof jsonValue !== "object" || - typeof jsonValue.length !== "number" || + !(jsonValue instanceof Array) || forEach(jsonValue, individualValue => typeof individualValue !== "string")) { // Not expectedType errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType)); diff --git a/src/compiler/program.ts b/src/compiler/program.ts index f6daf4880b686..999b8bd6df14d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -14,10 +14,10 @@ namespace ts { export const version = "1.7.0"; - export function findConfigFile(searchPath: string, moduleResolutionHost: ModuleResolutionHost): string { + export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string { let fileName = "tsconfig.json"; while (true) { - if (moduleResolutionHost.fileExists(fileName)) { + if (fileExists(fileName)) { return fileName; } let parentPath = getDirectoryPath(searchPath); diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 8c1bf962aaefe..a0c3cc642e2fe 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -188,7 +188,7 @@ namespace ts { } else if (commandLine.fileNames.length === 0 && isJSONSupported()) { let searchPath = normalizePath(sys.getCurrentDirectory()); - configFileName = findConfigFile(searchPath, sys); + configFileName = findConfigFile(searchPath, sys.fileExists); } if (commandLine.fileNames.length === 0 && !configFileName) { diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index a250cb3daacab..700423a721faa 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -195,7 +195,7 @@ class ProjectRunner extends RunnerBase { assert(!inputFiles || inputFiles.length === 0, "cannot specify input files and project option together"); } else if (!inputFiles || inputFiles.length === 0) { - configFileName = ts.findConfigFile("", { fileExists, readFile: getSourceFileText }); + configFileName = ts.findConfigFile("", fileExists); } if (configFileName) { From 460c5978cd905b86ef56647b12f9db4447d7b098 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 12:28:23 -0700 Subject: [PATCH 053/353] Changes in harness to emit expected and actual to figure out baseline error thats reported only on travis run tests --- src/harness/harness.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index a04b3af84cabe..f4cde09c704ce 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1650,7 +1650,7 @@ module Harness { let encoded_actual = Utils.encodeString(actual); if (expected != encoded_actual) { // Overwrite & issue error - let errMsg = "The baseline file " + relativeFileName + " has changed"; + let errMsg = "The baseline file " + relativeFileName + " has changed.\nExpected:\n" + expected + "\nActual:\n" + encoded_actual; throw new Error(errMsg); } } From 108f8568efc391dab61535de8fe0cfef3bc58af4 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 15:17:10 -0700 Subject: [PATCH 054/353] Remove tsconfig files of failing testcases --- .../jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json | 0 .../SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json | 1 - 2 files changed, 1 deletion(-) delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index e14243307e2f2..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file From b3e4f8e1ca62013cf01b020abd5d654f86a6808e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 15:18:46 -0700 Subject: [PATCH 055/353] Create new tscconfig files for the failing testcases --- .../jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json | 0 .../SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json | 1 + 2 files changed, 1 insertion(+) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..e14243307e2f2 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file From db9faf6039310746ef4ad75f5f22fc0d7808cb15 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 15:37:13 -0700 Subject: [PATCH 056/353] Temp change to investigate test failure --- src/compiler/commandLineParser.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 603dff9e7792d..6daa1ec885733 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -458,6 +458,8 @@ namespace ts { * @param jsonText The text of the config file */ export function parseConfigFileText(fileName: string, jsonText: string): { config?: any; error?: Diagnostic } { + console.log("fileName: \"" + fileName + "\""); + console.log("jsonText: \"" + jsonText + "\""); try { return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} }; } From 938c5334eb69533821c559669e654ef8470e1587 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 16:01:33 -0700 Subject: [PATCH 057/353] Remove the failing testcases --- .../projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts | 1 - .../projects/jsFileCompilation/SameNameDtsNotSpecified/a.js | 1 - .../jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json | 0 .../SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts | 1 - .../SameNameDtsNotSpecifiedWithJsExtensions/a.js | 1 - .../SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json | 1 - 6 files changed, 5 deletions(-) delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts deleted file mode 100644 index 16cb2db6fd7cc..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js deleted file mode 100644 index bbad8b11e3dd7..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/a.js +++ /dev/null @@ -1 +0,0 @@ -var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecified/tsconfig.json deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts deleted file mode 100644 index 16cb2db6fd7cc..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js deleted file mode 100644 index bbad8b11e3dd7..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/a.js +++ /dev/null @@ -1 +0,0 @@ -var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index e14243307e2f2..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file From 567d71c848209efa4cc02f8138bc487d677b9b0f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 16:02:04 -0700 Subject: [PATCH 058/353] Add new test cases --- .../projects/jsFileCompilation/SameNameDTsNotSpecified/a.d.ts | 1 + .../projects/jsFileCompilation/SameNameDTsNotSpecified/a.js | 1 + .../jsFileCompilation/SameNameDTsNotSpecified/tsconfig.json | 0 .../SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts | 1 + .../SameNameDTsNotSpecifiedWithJsExtensions/a.js | 1 + .../SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json | 1 + 6 files changed, 5 insertions(+) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.d.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/tsconfig.json create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.d.ts new file mode 100644 index 0000000000000..16cb2db6fd7cc --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.d.ts @@ -0,0 +1 @@ +declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecified/tsconfig.json new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts new file mode 100644 index 0000000000000..16cb2db6fd7cc --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts @@ -0,0 +1 @@ +declare var a: number; \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js new file mode 100644 index 0000000000000..bbad8b11e3dd7 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js @@ -0,0 +1 @@ +var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json new file mode 100644 index 0000000000000..e14243307e2f2 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file From 756052a4e0f6285af69abce8b2861677805c53c0 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 16:06:12 -0700 Subject: [PATCH 059/353] Removing console logs that were for debugging --- src/compiler/commandLineParser.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 6daa1ec885733..603dff9e7792d 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -458,8 +458,6 @@ namespace ts { * @param jsonText The text of the config file */ export function parseConfigFileText(fileName: string, jsonText: string): { config?: any; error?: Diagnostic } { - console.log("fileName: \"" + fileName + "\""); - console.log("jsonText: \"" + jsonText + "\""); try { return { config: /\S/.test(jsonText) ? JSON.parse(jsonText) : {} }; } From 17fca985cc5ab760b24610994030265da56f4d54 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 5 Oct 2015 22:09:32 -0700 Subject: [PATCH 060/353] Fix tslint error --- src/harness/projectsRunner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index f5d89ba86c301..39c9a458e9caf 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -3,7 +3,7 @@ /* tslint:disable:no-null */ // Test case is json of below type in tests/cases/project/ -interface ProjectRunnerTestCase extends ts.CompilerOptions{ +interface ProjectRunnerTestCase extends ts.CompilerOptions { scenario: string; projectRoot: string; // project where it lives - this also is the current directory when compiling inputFiles: string[]; // list of input files to be given to program From 242eb8bc5c7fa5ded4c4f91f79a4a59f96e9dda5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 6 Oct 2015 15:49:39 -0700 Subject: [PATCH 061/353] Taken feedback into account and simplified the getFileNames logic to handle extensions by priority --- src/compiler/commandLineParser.ts | 52 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 1db54e66b6252..792a85ac52230 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -551,28 +551,40 @@ namespace ts { } } else { + let filesSeen: Map = {}; let exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; - let extensionsToRead = getSupportedExtensions(options); - for (let extensionsIndex = 0; extensionsIndex < extensionsToRead.length; extensionsIndex++) { - let extension = extensionsToRead[extensionsIndex]; - let sysFiles = host.readDirectory(basePath, extension, exclude); - for (let i = 0; i < sysFiles.length; i++) { - let fileName = sysFiles[i]; - // If this is not the extension of one of the lower priority extension, then only we can use this file name - // This could happen if the extension taking priority is substring of lower priority extension. eg. .ts and .d.ts - let hasLowerPriorityExtension: boolean; - for (let j = extensionsIndex + 1; !hasLowerPriorityExtension && j < extensionsToRead.length; j++) { - hasLowerPriorityExtension = fileExtensionIs(fileName, extensionsToRead[j]); - }; - if (!hasLowerPriorityExtension) { - // If the basename + higher priority extensions arent in the filenames, use this file name - let baseName = fileName.substr(0, fileName.length - extension.length - 1); - let hasSameNameHigherPriorityExtensionFile: boolean; - for (let j = 0; !hasSameNameHigherPriorityExtensionFile && j < extensionsIndex; j++) { - hasSameNameHigherPriorityExtensionFile = contains(fileNames, baseName + "." + extensionsToRead[j]); - }; + let extensionsByPriority = getSupportedExtensions(options); + for (let extensionsIndex = 0; extensionsIndex < extensionsByPriority.length; extensionsIndex++) { + let currentExtension = extensionsByPriority[extensionsIndex]; + let filesInDirWithExtension = host.readDirectory(basePath, currentExtension, exclude); + // Get list of conflicting extensions, conflicting extension is + // - extension that is lower priority than current extension and + // - extension also is current extension (ends with "." + currentExtension) + let conflictingExtensions: string[] = []; + for (let i = extensionsIndex + 1; i < extensionsByPriority.length; i++) { + let extension = extensionsByPriority[i]; // lower priority extension + if (fileExtensionIs(extension, currentExtension)) { // also has current extension + conflictingExtensions.push(extension); + } + } + + // Add the files to fileNames list if the file is not any of conflicting extension + for (const fileName of filesInDirWithExtension) { + let hasConflictingExtension = false; + for (const conflictingExtension of conflictingExtensions) { + // eg. 'f.d.ts' will match '.ts' extension but really should be process later with '.d.ts' files + if (fileExtensionIs(fileName, conflictingExtension)) { + hasConflictingExtension = true; + break; + } + } - if (!hasSameNameHigherPriorityExtensionFile) { + if (!hasConflictingExtension) { + // Add the file only if there is no higher priority extension file already included + // eg. when a.d.ts and a.js are present in the folder, include only a.d.ts not a.js + const baseName = fileName.substr(0, fileName.length - currentExtension.length - 1); + if (!hasProperty(filesSeen, baseName)) { + filesSeen[baseName] = true; fileNames.push(fileName); } } From f7a6ac7e0c0a03a3fd2d32a759e38b204f8cc5a5 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 7 Oct 2015 15:38:24 -0700 Subject: [PATCH 062/353] Added more tests. --- .../stringLiteralTypesOverloads03.ts | 46 +++++++++++++++++++ ...tringLiteralTypesWithVariousOperators01.ts | 29 ++++++++++++ ...tringLiteralTypesWithVariousOperators02.ts | 19 ++++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts new file mode 100644 index 0000000000000..a675c2c0eaed7 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts @@ -0,0 +1,46 @@ +// @declaration: true + +interface Base { + x: string; + y: number; +} + +interface HelloOrWorld extends Base { + p1: boolean; +} + +interface JustHello extends Base { + p2: boolean; +} + +interface JustWorld extends Base { + p3: boolean; +} + +let hello: "hello"; +let world: "world"; +let helloOrWorld: "hello" | "world"; + +function f(p: "hello"): JustHello; +function f(p: "hello" | "world"): HelloOrWorld; +function f(p: "world"): JustWorld; +function f(p: string): Base; +function f(...args: any[]): any { + return undefined; +} + +let fResult1 = f(hello); +let fResult2 = f(world); +let fResult3 = f(helloOrWorld); + +function g(p: string): Base; +function g(p: "hello"): JustHello; +function g(p: "hello" | "world"): HelloOrWorld; +function g(p: "world"): JustWorld; +function g(...args: any[]): any { + return undefined; +} + +let gResult1 = g(hello); +let gResult2 = g(world); +let gResult3 = g(helloOrWorld); \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts new file mode 100644 index 0000000000000..28c34d3c74a99 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts @@ -0,0 +1,29 @@ +// @declaration: true + +let abc: "ABC" = "ABC"; +let xyz: "XYZ" = "XYZ"; +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; + +let a = "" + abc; +let b = abc + ""; +let c = 10 + abc; +let d = abc + 10; +let e = xyz + abc; +let f = abc + xyz; +let g = true + abc; +let h = abc + true; +let i = abc + abcOrXyz + xyz; +let j = abcOrXyz + abcOrXyz; +let k = +abcOrXyz; +let l = -abcOrXyz; +let m = abcOrXyzOrNumber + ""; +let n = "" + abcOrXyzOrNumber; +let o = abcOrXyzOrNumber + abcOrXyz; +let p = abcOrXyz + abcOrXyzOrNumber; +let q = !abcOrXyzOrNumber; +let r = ~abcOrXyzOrNumber; +let s = abcOrXyzOrNumber < abcOrXyzOrNumber; +let t = abcOrXyzOrNumber >= abcOrXyz; +let u = abc === abcOrXyz; +let v = abcOrXyz === abcOrXyzOrNumber; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts new file mode 100644 index 0000000000000..cf66f66e47c30 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts @@ -0,0 +1,19 @@ +// @declaration: true + +let abc: "ABC" = "ABC"; +let xyz: "XYZ" = "XYZ"; +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; + +let a = abcOrXyzOrNumber + 100; +let b = 100 + abcOrXyzOrNumber; +let c = abcOrXyzOrNumber + abcOrXyzOrNumber; +let d = abcOrXyzOrNumber + true; +let e = false + abcOrXyzOrNumber; +let f = abcOrXyzOrNumber++; +let g = --abcOrXyzOrNumber; +let h = abcOrXyzOrNumber ^ 10; +let i = abcOrXyzOrNumber | 10; +let j = abc < xyz; +let k = abc === xyz; +let l = abc != xyz; \ No newline at end of file From a440f06cac2f5265f321cf06ea147310d759afb6 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 14:10:15 -0700 Subject: [PATCH 063/353] Accepted baselines. --- .../stringLiteralTypesOverloads03.js | 104 ++++++++++++ .../stringLiteralTypesOverloads03.symbols | 131 +++++++++++++++ .../stringLiteralTypesOverloads03.types | 137 ++++++++++++++++ ...tringLiteralTypesWithVariousOperators01.js | 86 ++++++++++ ...LiteralTypesWithVariousOperators01.symbols | 116 +++++++++++++ ...ngLiteralTypesWithVariousOperators01.types | 152 ++++++++++++++++++ ...eralTypesWithVariousOperators02.errors.txt | 57 +++++++ ...tringLiteralTypesWithVariousOperators02.js | 56 +++++++ 8 files changed, 839 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads03.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads03.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads03.types create mode 100644 tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js create mode 100644 tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types create mode 100644 tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.js b/tests/baselines/reference/stringLiteralTypesOverloads03.js new file mode 100644 index 0000000000000..c1e7916088095 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads03.js @@ -0,0 +1,104 @@ +//// [stringLiteralTypesOverloads03.ts] + +interface Base { + x: string; + y: number; +} + +interface HelloOrWorld extends Base { + p1: boolean; +} + +interface JustHello extends Base { + p2: boolean; +} + +interface JustWorld extends Base { + p3: boolean; +} + +let hello: "hello"; +let world: "world"; +let helloOrWorld: "hello" | "world"; + +function f(p: "hello"): JustHello; +function f(p: "hello" | "world"): HelloOrWorld; +function f(p: "world"): JustWorld; +function f(p: string): Base; +function f(...args: any[]): any { + return undefined; +} + +let fResult1 = f(hello); +let fResult2 = f(world); +let fResult3 = f(helloOrWorld); + +function g(p: string): Base; +function g(p: "hello"): JustHello; +function g(p: "hello" | "world"): HelloOrWorld; +function g(p: "world"): JustWorld; +function g(...args: any[]): any { + return undefined; +} + +let gResult1 = g(hello); +let gResult2 = g(world); +let gResult3 = g(helloOrWorld); + +//// [stringLiteralTypesOverloads03.js] +var hello; +var world; +var helloOrWorld; +function f() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i - 0] = arguments[_i]; + } + return undefined; +} +var fResult1 = f(hello); +var fResult2 = f(world); +var fResult3 = f(helloOrWorld); +function g() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i - 0] = arguments[_i]; + } + return undefined; +} +var gResult1 = g(hello); +var gResult2 = g(world); +var gResult3 = g(helloOrWorld); + + +//// [stringLiteralTypesOverloads03.d.ts] +interface Base { + x: string; + y: number; +} +interface HelloOrWorld extends Base { + p1: boolean; +} +interface JustHello extends Base { + p2: boolean; +} +interface JustWorld extends Base { + p3: boolean; +} +declare let hello: "hello"; +declare let world: "world"; +declare let helloOrWorld: "hello" | "world"; +declare function f(p: "hello"): JustHello; +declare function f(p: "hello" | "world"): HelloOrWorld; +declare function f(p: "world"): JustWorld; +declare function f(p: string): Base; +declare let fResult1: JustHello; +declare let fResult2: JustWorld; +declare let fResult3: HelloOrWorld; +declare function g(p: string): Base; +declare function g(p: "hello"): JustHello; +declare function g(p: "hello" | "world"): HelloOrWorld; +declare function g(p: "world"): JustWorld; +declare let gResult1: JustHello; +declare let gResult2: JustWorld; +declare let gResult3: Base; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.symbols b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols new file mode 100644 index 0000000000000..a0a48de790f93 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols @@ -0,0 +1,131 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts === + +interface Base { +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + + x: string; +>x : Symbol(x, Decl(stringLiteralTypesOverloads03.ts, 1, 16)) + + y: number; +>y : Symbol(y, Decl(stringLiteralTypesOverloads03.ts, 2, 14)) +} + +interface HelloOrWorld extends Base { +>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1)) +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + + p1: boolean; +>p1 : Symbol(p1, Decl(stringLiteralTypesOverloads03.ts, 6, 37)) +} + +interface JustHello extends Base { +>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1)) +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + + p2: boolean; +>p2 : Symbol(p2, Decl(stringLiteralTypesOverloads03.ts, 10, 34)) +} + +interface JustWorld extends Base { +>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1)) +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + + p3: boolean; +>p3 : Symbol(p3, Decl(stringLiteralTypesOverloads03.ts, 14, 34)) +} + +let hello: "hello"; +>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3)) + +let world: "world"; +>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3)) + +let helloOrWorld: "hello" | "world"; +>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3)) + +function f(p: "hello"): JustHello; +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 22, 11)) +>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1)) + +function f(p: "hello" | "world"): HelloOrWorld; +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 23, 11)) +>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1)) + +function f(p: "world"): JustWorld; +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 24, 11)) +>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1)) + +function f(p: string): Base; +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 25, 11)) +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + +function f(...args: any[]): any { +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>args : Symbol(args, Decl(stringLiteralTypesOverloads03.ts, 26, 11)) + + return undefined; +>undefined : Symbol(undefined) +} + +let fResult1 = f(hello); +>fResult1 : Symbol(fResult1, Decl(stringLiteralTypesOverloads03.ts, 30, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3)) + +let fResult2 = f(world); +>fResult2 : Symbol(fResult2, Decl(stringLiteralTypesOverloads03.ts, 31, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3)) + +let fResult3 = f(helloOrWorld); +>fResult3 : Symbol(fResult3, Decl(stringLiteralTypesOverloads03.ts, 32, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloads03.ts, 20, 36), Decl(stringLiteralTypesOverloads03.ts, 22, 34), Decl(stringLiteralTypesOverloads03.ts, 23, 47), Decl(stringLiteralTypesOverloads03.ts, 24, 34), Decl(stringLiteralTypesOverloads03.ts, 25, 28)) +>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3)) + +function g(p: string): Base; +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 34, 11)) +>Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0)) + +function g(p: "hello"): JustHello; +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 35, 11)) +>JustHello : Symbol(JustHello, Decl(stringLiteralTypesOverloads03.ts, 8, 1)) + +function g(p: "hello" | "world"): HelloOrWorld; +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 36, 11)) +>HelloOrWorld : Symbol(HelloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 4, 1)) + +function g(p: "world"): JustWorld; +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads03.ts, 37, 11)) +>JustWorld : Symbol(JustWorld, Decl(stringLiteralTypesOverloads03.ts, 12, 1)) + +function g(...args: any[]): any { +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>args : Symbol(args, Decl(stringLiteralTypesOverloads03.ts, 38, 11)) + + return undefined; +>undefined : Symbol(undefined) +} + +let gResult1 = g(hello); +>gResult1 : Symbol(gResult1, Decl(stringLiteralTypesOverloads03.ts, 42, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>hello : Symbol(hello, Decl(stringLiteralTypesOverloads03.ts, 18, 3)) + +let gResult2 = g(world); +>gResult2 : Symbol(gResult2, Decl(stringLiteralTypesOverloads03.ts, 43, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>world : Symbol(world, Decl(stringLiteralTypesOverloads03.ts, 19, 3)) + +let gResult3 = g(helloOrWorld); +>gResult3 : Symbol(gResult3, Decl(stringLiteralTypesOverloads03.ts, 44, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloads03.ts, 32, 31), Decl(stringLiteralTypesOverloads03.ts, 34, 28), Decl(stringLiteralTypesOverloads03.ts, 35, 34), Decl(stringLiteralTypesOverloads03.ts, 36, 47), Decl(stringLiteralTypesOverloads03.ts, 37, 34)) +>helloOrWorld : Symbol(helloOrWorld, Decl(stringLiteralTypesOverloads03.ts, 20, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.types b/tests/baselines/reference/stringLiteralTypesOverloads03.types new file mode 100644 index 0000000000000..643979ee987ca --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads03.types @@ -0,0 +1,137 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts === + +interface Base { +>Base : Base + + x: string; +>x : string + + y: number; +>y : number +} + +interface HelloOrWorld extends Base { +>HelloOrWorld : HelloOrWorld +>Base : Base + + p1: boolean; +>p1 : boolean +} + +interface JustHello extends Base { +>JustHello : JustHello +>Base : Base + + p2: boolean; +>p2 : boolean +} + +interface JustWorld extends Base { +>JustWorld : JustWorld +>Base : Base + + p3: boolean; +>p3 : boolean +} + +let hello: "hello"; +>hello : "hello" + +let world: "world"; +>world : "world" + +let helloOrWorld: "hello" | "world"; +>helloOrWorld : "hello" | "world" + +function f(p: "hello"): JustHello; +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>p : "hello" +>JustHello : JustHello + +function f(p: "hello" | "world"): HelloOrWorld; +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>p : "hello" | "world" +>HelloOrWorld : HelloOrWorld + +function f(p: "world"): JustWorld; +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>p : "world" +>JustWorld : JustWorld + +function f(p: string): Base; +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>p : string +>Base : Base + +function f(...args: any[]): any { +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>args : any[] + + return undefined; +>undefined : undefined +} + +let fResult1 = f(hello); +>fResult1 : JustHello +>f(hello) : JustHello +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>hello : "hello" + +let fResult2 = f(world); +>fResult2 : JustWorld +>f(world) : JustWorld +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>world : "world" + +let fResult3 = f(helloOrWorld); +>fResult3 : HelloOrWorld +>f(helloOrWorld) : HelloOrWorld +>f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; } +>helloOrWorld : "hello" | "world" + +function g(p: string): Base; +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>p : string +>Base : Base + +function g(p: "hello"): JustHello; +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>p : "hello" +>JustHello : JustHello + +function g(p: "hello" | "world"): HelloOrWorld; +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>p : "hello" | "world" +>HelloOrWorld : HelloOrWorld + +function g(p: "world"): JustWorld; +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>p : "world" +>JustWorld : JustWorld + +function g(...args: any[]): any { +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>args : any[] + + return undefined; +>undefined : undefined +} + +let gResult1 = g(hello); +>gResult1 : JustHello +>g(hello) : JustHello +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>hello : "hello" + +let gResult2 = g(world); +>gResult2 : JustWorld +>g(world) : JustWorld +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>world : "world" + +let gResult3 = g(helloOrWorld); +>gResult3 : Base +>g(helloOrWorld) : Base +>g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; } +>helloOrWorld : "hello" | "world" + diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js new file mode 100644 index 0000000000000..1576540e24446 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.js @@ -0,0 +1,86 @@ +//// [stringLiteralTypesWithVariousOperators01.ts] + +let abc: "ABC" = "ABC"; +let xyz: "XYZ" = "XYZ"; +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; + +let a = "" + abc; +let b = abc + ""; +let c = 10 + abc; +let d = abc + 10; +let e = xyz + abc; +let f = abc + xyz; +let g = true + abc; +let h = abc + true; +let i = abc + abcOrXyz + xyz; +let j = abcOrXyz + abcOrXyz; +let k = +abcOrXyz; +let l = -abcOrXyz; +let m = abcOrXyzOrNumber + ""; +let n = "" + abcOrXyzOrNumber; +let o = abcOrXyzOrNumber + abcOrXyz; +let p = abcOrXyz + abcOrXyzOrNumber; +let q = !abcOrXyzOrNumber; +let r = ~abcOrXyzOrNumber; +let s = abcOrXyzOrNumber < abcOrXyzOrNumber; +let t = abcOrXyzOrNumber >= abcOrXyz; +let u = abc === abcOrXyz; +let v = abcOrXyz === abcOrXyzOrNumber; + +//// [stringLiteralTypesWithVariousOperators01.js] +var abc = "ABC"; +var xyz = "XYZ"; +var abcOrXyz = abc || xyz; +var abcOrXyzOrNumber = abcOrXyz || 100; +var a = "" + abc; +var b = abc + ""; +var c = 10 + abc; +var d = abc + 10; +var e = xyz + abc; +var f = abc + xyz; +var g = true + abc; +var h = abc + true; +var i = abc + abcOrXyz + xyz; +var j = abcOrXyz + abcOrXyz; +var k = +abcOrXyz; +var l = -abcOrXyz; +var m = abcOrXyzOrNumber + ""; +var n = "" + abcOrXyzOrNumber; +var o = abcOrXyzOrNumber + abcOrXyz; +var p = abcOrXyz + abcOrXyzOrNumber; +var q = !abcOrXyzOrNumber; +var r = ~abcOrXyzOrNumber; +var s = abcOrXyzOrNumber < abcOrXyzOrNumber; +var t = abcOrXyzOrNumber >= abcOrXyz; +var u = abc === abcOrXyz; +var v = abcOrXyz === abcOrXyzOrNumber; + + +//// [stringLiteralTypesWithVariousOperators01.d.ts] +declare let abc: "ABC"; +declare let xyz: "XYZ"; +declare let abcOrXyz: "ABC" | "XYZ"; +declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number; +declare let a: string; +declare let b: string; +declare let c: string; +declare let d: string; +declare let e: string; +declare let f: string; +declare let g: string; +declare let h: string; +declare let i: string; +declare let j: string; +declare let k: number; +declare let l: number; +declare let m: string; +declare let n: string; +declare let o: string; +declare let p: string; +declare let q: boolean; +declare let r: number; +declare let s: boolean; +declare let t: boolean; +declare let u: boolean; +declare let v: boolean; diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols new file mode 100644 index 0000000000000..cc9c3aa842bd3 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.symbols @@ -0,0 +1,116 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts === + +let abc: "ABC" = "ABC"; +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let xyz: "XYZ" = "XYZ"; +>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3)) + +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) +>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3)) + +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let a = "" + abc; +>a : Symbol(a, Decl(stringLiteralTypesWithVariousOperators01.ts, 6, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let b = abc + ""; +>b : Symbol(b, Decl(stringLiteralTypesWithVariousOperators01.ts, 7, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let c = 10 + abc; +>c : Symbol(c, Decl(stringLiteralTypesWithVariousOperators01.ts, 8, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let d = abc + 10; +>d : Symbol(d, Decl(stringLiteralTypesWithVariousOperators01.ts, 9, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let e = xyz + abc; +>e : Symbol(e, Decl(stringLiteralTypesWithVariousOperators01.ts, 10, 3)) +>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let f = abc + xyz; +>f : Symbol(f, Decl(stringLiteralTypesWithVariousOperators01.ts, 11, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) +>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3)) + +let g = true + abc; +>g : Symbol(g, Decl(stringLiteralTypesWithVariousOperators01.ts, 12, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let h = abc + true; +>h : Symbol(h, Decl(stringLiteralTypesWithVariousOperators01.ts, 13, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) + +let i = abc + abcOrXyz + xyz; +>i : Symbol(i, Decl(stringLiteralTypesWithVariousOperators01.ts, 14, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) +>xyz : Symbol(xyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 2, 3)) + +let j = abcOrXyz + abcOrXyz; +>j : Symbol(j, Decl(stringLiteralTypesWithVariousOperators01.ts, 15, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let k = +abcOrXyz; +>k : Symbol(k, Decl(stringLiteralTypesWithVariousOperators01.ts, 16, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let l = -abcOrXyz; +>l : Symbol(l, Decl(stringLiteralTypesWithVariousOperators01.ts, 17, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let m = abcOrXyzOrNumber + ""; +>m : Symbol(m, Decl(stringLiteralTypesWithVariousOperators01.ts, 18, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let n = "" + abcOrXyzOrNumber; +>n : Symbol(n, Decl(stringLiteralTypesWithVariousOperators01.ts, 19, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let o = abcOrXyzOrNumber + abcOrXyz; +>o : Symbol(o, Decl(stringLiteralTypesWithVariousOperators01.ts, 20, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let p = abcOrXyz + abcOrXyzOrNumber; +>p : Symbol(p, Decl(stringLiteralTypesWithVariousOperators01.ts, 21, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let q = !abcOrXyzOrNumber; +>q : Symbol(q, Decl(stringLiteralTypesWithVariousOperators01.ts, 22, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let r = ~abcOrXyzOrNumber; +>r : Symbol(r, Decl(stringLiteralTypesWithVariousOperators01.ts, 23, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let s = abcOrXyzOrNumber < abcOrXyzOrNumber; +>s : Symbol(s, Decl(stringLiteralTypesWithVariousOperators01.ts, 24, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + +let t = abcOrXyzOrNumber >= abcOrXyz; +>t : Symbol(t, Decl(stringLiteralTypesWithVariousOperators01.ts, 25, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let u = abc === abcOrXyz; +>u : Symbol(u, Decl(stringLiteralTypesWithVariousOperators01.ts, 26, 3)) +>abc : Symbol(abc, Decl(stringLiteralTypesWithVariousOperators01.ts, 1, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) + +let v = abcOrXyz === abcOrXyzOrNumber; +>v : Symbol(v, Decl(stringLiteralTypesWithVariousOperators01.ts, 27, 3)) +>abcOrXyz : Symbol(abcOrXyz, Decl(stringLiteralTypesWithVariousOperators01.ts, 3, 3)) +>abcOrXyzOrNumber : Symbol(abcOrXyzOrNumber, Decl(stringLiteralTypesWithVariousOperators01.ts, 4, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types new file mode 100644 index 0000000000000..90cb538b800d1 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators01.types @@ -0,0 +1,152 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators01.ts === + +let abc: "ABC" = "ABC"; +>abc : "ABC" +>"ABC" : "ABC" + +let xyz: "XYZ" = "XYZ"; +>xyz : "XYZ" +>"XYZ" : "XYZ" + +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +>abcOrXyz : "ABC" | "XYZ" +>abc || xyz : "ABC" | "XYZ" +>abc : "ABC" +>xyz : "XYZ" + +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; +>abcOrXyzOrNumber : "ABC" | "XYZ" | number +>abcOrXyz || 100 : "ABC" | "XYZ" | number +>abcOrXyz : "ABC" | "XYZ" +>100 : number + +let a = "" + abc; +>a : string +>"" + abc : string +>"" : string +>abc : "ABC" + +let b = abc + ""; +>b : string +>abc + "" : string +>abc : "ABC" +>"" : string + +let c = 10 + abc; +>c : string +>10 + abc : string +>10 : number +>abc : "ABC" + +let d = abc + 10; +>d : string +>abc + 10 : string +>abc : "ABC" +>10 : number + +let e = xyz + abc; +>e : string +>xyz + abc : string +>xyz : "XYZ" +>abc : "ABC" + +let f = abc + xyz; +>f : string +>abc + xyz : string +>abc : "ABC" +>xyz : "XYZ" + +let g = true + abc; +>g : string +>true + abc : string +>true : boolean +>abc : "ABC" + +let h = abc + true; +>h : string +>abc + true : string +>abc : "ABC" +>true : boolean + +let i = abc + abcOrXyz + xyz; +>i : string +>abc + abcOrXyz + xyz : string +>abc + abcOrXyz : string +>abc : "ABC" +>abcOrXyz : "ABC" | "XYZ" +>xyz : "XYZ" + +let j = abcOrXyz + abcOrXyz; +>j : string +>abcOrXyz + abcOrXyz : string +>abcOrXyz : "ABC" | "XYZ" +>abcOrXyz : "ABC" | "XYZ" + +let k = +abcOrXyz; +>k : number +>+abcOrXyz : number +>abcOrXyz : "ABC" | "XYZ" + +let l = -abcOrXyz; +>l : number +>-abcOrXyz : number +>abcOrXyz : "ABC" | "XYZ" + +let m = abcOrXyzOrNumber + ""; +>m : string +>abcOrXyzOrNumber + "" : string +>abcOrXyzOrNumber : "ABC" | "XYZ" | number +>"" : string + +let n = "" + abcOrXyzOrNumber; +>n : string +>"" + abcOrXyzOrNumber : string +>"" : string +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + +let o = abcOrXyzOrNumber + abcOrXyz; +>o : string +>abcOrXyzOrNumber + abcOrXyz : string +>abcOrXyzOrNumber : "ABC" | "XYZ" | number +>abcOrXyz : "ABC" | "XYZ" + +let p = abcOrXyz + abcOrXyzOrNumber; +>p : string +>abcOrXyz + abcOrXyzOrNumber : string +>abcOrXyz : "ABC" | "XYZ" +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + +let q = !abcOrXyzOrNumber; +>q : boolean +>!abcOrXyzOrNumber : boolean +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + +let r = ~abcOrXyzOrNumber; +>r : number +>~abcOrXyzOrNumber : number +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + +let s = abcOrXyzOrNumber < abcOrXyzOrNumber; +>s : boolean +>abcOrXyzOrNumber < abcOrXyzOrNumber : boolean +>abcOrXyzOrNumber : "ABC" | "XYZ" | number +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + +let t = abcOrXyzOrNumber >= abcOrXyz; +>t : boolean +>abcOrXyzOrNumber >= abcOrXyz : boolean +>abcOrXyzOrNumber : "ABC" | "XYZ" | number +>abcOrXyz : "ABC" | "XYZ" + +let u = abc === abcOrXyz; +>u : boolean +>abc === abcOrXyz : boolean +>abc : "ABC" +>abcOrXyz : "ABC" | "XYZ" + +let v = abcOrXyz === abcOrXyzOrNumber; +>v : boolean +>abcOrXyz === abcOrXyzOrNumber : boolean +>abcOrXyz : "ABC" | "XYZ" +>abcOrXyzOrNumber : "ABC" | "XYZ" | number + diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt new file mode 100644 index 0000000000000..92afe67df0c62 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt @@ -0,0 +1,57 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(7,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'number'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(8,9): error TS2365: Operator '+' cannot be applied to types 'number' and '"ABC" | "XYZ" | number'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(9,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and '"ABC" | "XYZ" | number'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(10,9): error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'boolean'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(11,9): error TS2365: Operator '+' cannot be applied to types 'boolean' and '"ABC" | "XYZ" | number'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(12,9): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(13,11): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(14,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(16,9): error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(17,9): error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(18,9): error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (12 errors) ==== + + let abc: "ABC" = "ABC"; + let xyz: "XYZ" = "XYZ"; + let abcOrXyz: "ABC" | "XYZ" = abc || xyz; + let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; + + let a = abcOrXyzOrNumber + 100; + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'number'. + let b = 100 + abcOrXyzOrNumber; + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types 'number' and '"ABC" | "XYZ" | number'. + let c = abcOrXyzOrNumber + abcOrXyzOrNumber; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and '"ABC" | "XYZ" | number'. + let d = abcOrXyzOrNumber + true; + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types '"ABC" | "XYZ" | number' and 'boolean'. + let e = false + abcOrXyzOrNumber; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types 'boolean' and '"ABC" | "XYZ" | number'. + let f = abcOrXyzOrNumber++; + ~~~~~~~~~~~~~~~~ +!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. + let g = --abcOrXyzOrNumber; + ~~~~~~~~~~~~~~~~ +!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. + let h = abcOrXyzOrNumber ^ 10; + ~~~~~~~~~~~~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + let i = abcOrXyzOrNumber | 10; + ~~~~~~~~~~~~~~~~ +!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. + let j = abc < xyz; + ~~~~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'. + let k = abc === xyz; + ~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'. + let l = abc != xyz; + ~~~~~~~~~~ +!!! error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js new file mode 100644 index 0000000000000..4914ecf3d178a --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.js @@ -0,0 +1,56 @@ +//// [stringLiteralTypesWithVariousOperators02.ts] + +let abc: "ABC" = "ABC"; +let xyz: "XYZ" = "XYZ"; +let abcOrXyz: "ABC" | "XYZ" = abc || xyz; +let abcOrXyzOrNumber: "ABC" | "XYZ" | number = abcOrXyz || 100; + +let a = abcOrXyzOrNumber + 100; +let b = 100 + abcOrXyzOrNumber; +let c = abcOrXyzOrNumber + abcOrXyzOrNumber; +let d = abcOrXyzOrNumber + true; +let e = false + abcOrXyzOrNumber; +let f = abcOrXyzOrNumber++; +let g = --abcOrXyzOrNumber; +let h = abcOrXyzOrNumber ^ 10; +let i = abcOrXyzOrNumber | 10; +let j = abc < xyz; +let k = abc === xyz; +let l = abc != xyz; + +//// [stringLiteralTypesWithVariousOperators02.js] +var abc = "ABC"; +var xyz = "XYZ"; +var abcOrXyz = abc || xyz; +var abcOrXyzOrNumber = abcOrXyz || 100; +var a = abcOrXyzOrNumber + 100; +var b = 100 + abcOrXyzOrNumber; +var c = abcOrXyzOrNumber + abcOrXyzOrNumber; +var d = abcOrXyzOrNumber + true; +var e = false + abcOrXyzOrNumber; +var f = abcOrXyzOrNumber++; +var g = --abcOrXyzOrNumber; +var h = abcOrXyzOrNumber ^ 10; +var i = abcOrXyzOrNumber | 10; +var j = abc < xyz; +var k = abc === xyz; +var l = abc != xyz; + + +//// [stringLiteralTypesWithVariousOperators02.d.ts] +declare let abc: "ABC"; +declare let xyz: "XYZ"; +declare let abcOrXyz: "ABC" | "XYZ"; +declare let abcOrXyzOrNumber: "ABC" | "XYZ" | number; +declare let a: any; +declare let b: any; +declare let c: any; +declare let d: any; +declare let e: any; +declare let f: number; +declare let g: number; +declare let h: number; +declare let i: number; +declare let j: boolean; +declare let k: boolean; +declare let l: boolean; From f7b72047f0ff79b2b95e8638c0b9a0bcbc298e15 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 8 Oct 2015 14:26:40 -0700 Subject: [PATCH 064/353] Remove extension for emitting output should remove any of supported extensions + js/jsx to get the dts file --- src/compiler/core.ts | 6 ++++-- src/compiler/declarationEmitter.ts | 5 +++-- src/compiler/utilities.ts | 9 +++++++-- src/harness/harness.ts | 2 +- src/harness/projectsRunner.ts | 6 +++--- src/harness/test262Runner.ts | 2 +- tests/cases/unittests/transpile.ts | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 6035f9898ce3c..22cafc034b453 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -723,8 +723,10 @@ namespace ts { */ export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; - const extensionsToRemove = ["d.ts", "ts", "js", "tsx", "jsx"]; - export function removeFileExtension(path: string): string { + export function removeFileExtension(path: string, supportedExtensions: string[]): string { + // Sort the extensions in descending order of their length + let extensionsToRemove = supportedExtensions.slice(0, supportedExtensions.length) // Get duplicate array + .sort((ext1, ext2) => compareValues(ext2.length, ext1.length)); // Sort in descending order of extension length for (let ext of extensionsToRemove) { if (fileExtensionIs(path, ext)) { return path.substr(0, path.length - ext.length - 1); diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 4c0c6d20ad081..9e8e366aaac08 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1605,7 +1605,7 @@ namespace ts { ? referencedFile.fileName // Declaration file, use declaration file name : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file - : removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts"; // Global out file + : removeFileExtension(compilerOptions.outFile || compilerOptions.out, getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts"; // Global out file declFileName = getRelativePathToDirectoryOrUrl( getDirectoryPath(normalizeSlashes(jsFilePath)), @@ -1626,7 +1626,8 @@ namespace ts { if (!emitDeclarationResult.reportedDeclarationError) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); - writeFile(host, diagnostics, removeFileExtension(jsFilePath) + ".d.ts", declarationOutput, host.getCompilerOptions().emitBOM); + let compilerOptions = host.getCompilerOptions(); + writeFile(host, diagnostics, removeFileExtension(jsFilePath, getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts", declarationOutput, compilerOptions.emitBOM); } function getDeclarationOutput(synchronousDeclarationOutput: string, moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]) { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 00efbe9616e61..dc43b837c7ca5 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1748,14 +1748,19 @@ namespace ts { }; } + export function getExtensionsToRemoveForEmitPath(compilerOptons: CompilerOptions) { + return getSupportedExtensions(compilerOptons).concat("jsx", "js"); + } + export function getOwnEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost, extension: string) { let compilerOptions = host.getCompilerOptions(); let emitOutputFilePathWithoutExtension: string; if (compilerOptions.outDir) { - emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir)); + emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir), + getExtensionsToRemoveForEmitPath(compilerOptions)); } else { - emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName); + emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName, getExtensionsToRemoveForEmitPath(compilerOptions)); } return emitOutputFilePathWithoutExtension + extension; diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 451bb4adfc668..4ebc1976217da 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1187,7 +1187,7 @@ namespace Harness { sourceFileName = outFile; } - let dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts"; + let dTsFileName = ts.removeFileExtension(sourceFileName, ts.getExtensionsToRemoveForEmitPath(options)) + ".d.ts"; return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); } diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 39c9a458e9caf..cd099279fa8be 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -356,17 +356,17 @@ class ProjectRunner extends RunnerBase { if (compilerOptions.outDir) { let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, compilerResult.program.getCurrentDirectory()); sourceFilePath = sourceFilePath.replace(compilerResult.program.getCommonSourceDirectory(), ""); - emitOutputFilePathWithoutExtension = ts.removeFileExtension(ts.combinePaths(compilerOptions.outDir, sourceFilePath)); + emitOutputFilePathWithoutExtension = ts.removeFileExtension(ts.combinePaths(compilerOptions.outDir, sourceFilePath), ts.getExtensionsToRemoveForEmitPath(compilerOptions)); } else { - emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName); + emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName, ts.getExtensionsToRemoveForEmitPath(compilerOptions)); } let outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts"; allInputFiles.unshift(findOutpuDtsFile(outputDtsFileName)); } else { - let outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts"; + let outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out, ts.getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts"; let outputDtsFile = findOutpuDtsFile(outputDtsFileName); if (!ts.contains(allInputFiles, outputDtsFile)) { allInputFiles.unshift(outputDtsFile); diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts index 491c71a5839e4..1e95fc4ae74f1 100644 --- a/src/harness/test262Runner.ts +++ b/src/harness/test262Runner.ts @@ -37,7 +37,7 @@ class Test262BaselineRunner extends RunnerBase { before(() => { let content = Harness.IO.readFile(filePath); - let testFilename = ts.removeFileExtension(filePath).replace(/\//g, "_") + ".test"; + let testFilename = ts.removeFileExtension(filePath, ["js"]).replace(/\//g, "_") + ".test"; let testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, testFilename); let inputFiles = testCaseContent.testUnitData.map(unit => { diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index ca7d1faa4a910..95f7f443565ce 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -64,7 +64,7 @@ module ts { let transpileModuleResultWithSourceMap = transpileModule(input, transpileOptions); assert.isTrue(transpileModuleResultWithSourceMap.sourceMapText !== undefined); - let expectedSourceMapFileName = removeFileExtension(getBaseFileName(normalizeSlashes(transpileOptions.fileName))) + ".js.map"; + let expectedSourceMapFileName = removeFileExtension(getBaseFileName(normalizeSlashes(transpileOptions.fileName)), ts.getExtensionsToRemoveForEmitPath(transpileOptions.compilerOptions)) + ".js.map"; let expectedSourceMappingUrlLine = `//# sourceMappingURL=${expectedSourceMapFileName}`; if (testSettings.expectedOutput !== undefined) { From 2d083f7d83181aadb24436b91e224e237f1ec3ca Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 8 Oct 2015 14:27:02 -0700 Subject: [PATCH 065/353] Use compilation options to get extensions to remove to get module name --- src/compiler/binder.ts | 8 ++++---- src/compiler/checker.ts | 2 +- src/services/navigationBar.ts | 4 ++-- src/services/services.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 657683323604f..c869bb3c65dd7 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -77,13 +77,13 @@ namespace ts { IsContainerWithLocals = IsContainer | HasLocals } - export function bindSourceFile(file: SourceFile) { + export function bindSourceFile(file: SourceFile, compilerOptions: CompilerOptions) { let start = new Date().getTime(); - bindSourceFileWorker(file); + bindSourceFileWorker(file, compilerOptions); bindTime += new Date().getTime() - start; } - function bindSourceFileWorker(file: SourceFile) { + function bindSourceFileWorker(file: SourceFile, compilerOptions: CompilerOptions) { let parent: Node; let container: Node; let blockScopeContainer: Node; @@ -941,7 +941,7 @@ namespace ts { function bindSourceFileIfExternalModule() { setExportContextFlag(file); if (isExternalModule(file)) { - bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName)}"`); + bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName, getSupportedExtensions(compilerOptions))}"`); } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 40db300d3103a..def0eb4cf9f82 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14833,7 +14833,7 @@ namespace ts { function initializeTypeChecker() { // Bind all source files and propagate errors forEach(host.getSourceFiles(), file => { - bindSourceFile(file); + bindSourceFile(file, compilerOptions); }); // Initialize global symbol table diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index e822052a5b2c3..5dbc514d46205 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -2,7 +2,7 @@ /* @internal */ namespace ts.NavigationBar { - export function getNavigationBarItems(sourceFile: SourceFile): ts.NavigationBarItem[] { + export function getNavigationBarItems(sourceFile: SourceFile, compilerOptions: CompilerOptions): ts.NavigationBarItem[] { // If the source file has any child items, then it included in the tree // and takes lexical ownership of all other top-level items. let hasGlobalNode = false; @@ -442,7 +442,7 @@ namespace ts.NavigationBar { hasGlobalNode = true; let rootName = isExternalModule(node) - ? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName)))) + "\"" + ? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName), getSupportedExtensions(compilerOptions)))) + "\"" : "" return getNavigationBarItem(rootName, diff --git a/src/services/services.ts b/src/services/services.ts index e62132dac1e78..9420080abe9e9 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -6263,7 +6263,7 @@ namespace ts { function getNavigationBarItems(fileName: string): NavigationBarItem[] { let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - return NavigationBar.getNavigationBarItems(sourceFile); + return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings()); } function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] { From d2e2a55a9ed8e212c1c196a33c9163f8c8bf7da8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 14:36:36 -0700 Subject: [PATCH 066/353] Added fourslash test. --- ...ickInfoDisplayPartsVarWithStringTypes01.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts diff --git a/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts b/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts new file mode 100644 index 0000000000000..b48c7cfa3de19 --- /dev/null +++ b/tests/cases/fourslash/quickInfoDisplayPartsVarWithStringTypes01.ts @@ -0,0 +1,41 @@ +/// + +////let /*1*/hello: "hello" | 'hello' = "hello"; +////let /*2*/world: 'world' = "world"; +////let /*3*/helloOrWorld: "hello" | 'world'; + +goTo.marker("1"); +verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('1').position, length: "hello".length }, [ + { text: "let", kind: "keyword" }, + { text: " ", kind: "space" }, + { text: "hello", kind: "localName" }, + { text: ":", kind: "punctuation" }, + { text: " ", kind: "space" }, + { text: '"hello"', kind: "stringLiteral" }, ], + /*documentation*/ []); + +goTo.marker("2"); +verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('2').position, length: "world".length }, [ + { text: "let", kind: "keyword" }, + { text: " ", kind: "space" }, + { text: "world", kind: "localName" }, + { text: ":", kind: "punctuation" }, + { text: " ", kind: "space" }, + { text: '"world"', kind: "stringLiteral" }, + ], + /*documentation*/[]); + +goTo.marker("3"); +verify.verifyQuickInfoDisplayParts("let", "", { start: test.markerByName('3').position, length: "helloOrWorld".length }, [ + { text: "let", kind: "keyword" }, + { text: " ", kind: "space" }, + { text: "helloOrWorld", kind: "localName" }, + { text: ":", kind: "punctuation" }, + { text: " ", kind: "space" }, + { text: '"hello"', kind: "stringLiteral" }, + { text: " ", kind: "space" }, + { text: "|", kind: "punctuation" }, + { text: " ", kind: "space" }, + { text: '"world"', kind: "stringLiteral" }, + ], + /*documentation*/[]); \ No newline at end of file From 74ac57ddfcdca56e037ca7019f06b288560df43a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 15:26:00 -0700 Subject: [PATCH 067/353] Accepted post-merge baselines. --- .../parserErrorRecovery_IncompleteMemberVariable1.symbols | 6 +++--- .../parserErrorRecovery_IncompleteMemberVariable1.types | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols index db9cefbf64291..7b8be05f923f8 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols @@ -27,9 +27,9 @@ module Shapes { // Instance member getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } >getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60)) ->Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27)) ->Math : Symbol(Math, Decl(lib.d.ts, 522, 1), Decl(lib.d.ts, 633, 11)) ->sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27)) +>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) >this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) >this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) >x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types index bb51151cfd71b..b38bbbfe64d4d 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types @@ -34,17 +34,17 @@ module Shapes { >this.x * this.x + this.y * this.y : number >this.x * this.x : number >this.x : number ->this : Point +>this : this >x : number >this.x : number ->this : Point +>this : this >x : number >this.y * this.y : number >this.y : number ->this : Point +>this : this >y : number >this.y : number ->this : Point +>this : this >y : number // Static member From 61ece765c74f7cf48a7b61c9137405e206bd1766 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 15:27:12 -0700 Subject: [PATCH 068/353] Return the string literal type itself instead of the union type. --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index bf8072bf2a5fd..3b43533e56bd3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10292,7 +10292,7 @@ namespace ts { if (contextualType.flags & TypeFlags.Union) { for (const type of (contextualType).types) { if (type.flags & TypeFlags.StringLiteral && (type).text === node.text) { - return contextualType; + return type; } } } From 84b64c4c670676b06cbf98891c85ab8c9f537182 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 15:34:46 -0700 Subject: [PATCH 069/353] Accepted baselines. --- tests/baselines/reference/stringLiteralTypesAndTuples01.types | 4 ++-- .../reference/stringLiteralTypesInUnionTypes01.types | 4 ++-- .../reference/stringLiteralTypesInUnionTypes02.types | 4 ++-- .../reference/stringLiteralTypesInUnionTypes04.types | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.types b/tests/baselines/reference/stringLiteralTypesAndTuples01.types index 740cf237412ca..c874973e3e590 100644 --- a/tests/baselines/reference/stringLiteralTypesAndTuples01.types +++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.types @@ -20,10 +20,10 @@ let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex']; >a : "a" >dinosaur : "t-rex" | "raptor" >RexOrRaptor : "t-rex" | "raptor" ->['I\'m', 'a', 't-rex'] : ["I'm", "a", "t-rex" | "raptor"] +>['I\'m', 'a', 't-rex'] : ["I'm", "a", "t-rex"] >'I\'m' : "I'm" >'a' : "a" ->'t-rex' : "t-rex" | "raptor" +>'t-rex' : "t-rex" rawr(dinosaur); >rawr(dinosaur) : string diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types index b5a2d876bcc11..e5ff509822b99 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types @@ -5,12 +5,12 @@ type T = "foo" | "bar" | "baz"; var x: "foo" | "bar" | "baz" = "foo"; >x : "foo" | "bar" | "baz" ->"foo" : "foo" | "bar" | "baz" +>"foo" : "foo" var y: T = "bar"; >y : "foo" | "bar" | "baz" >T : "foo" | "bar" | "baz" ->"bar" : "foo" | "bar" | "baz" +>"bar" : "bar" if (x === "foo") { >x === "foo" : boolean diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types index e3ac5ba481785..b468c620376ba 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types @@ -5,12 +5,12 @@ type T = string | "foo" | "bar" | "baz"; var x: "foo" | "bar" | "baz" | string = "foo"; >x : "foo" | "bar" | "baz" | string ->"foo" : "foo" | "bar" | "baz" | string +>"foo" : "foo" var y: T = "bar"; >y : string | "foo" | "bar" | "baz" >T : string | "foo" | "bar" | "baz" ->"bar" : string | "foo" | "bar" | "baz" +>"bar" : "bar" if (x === "foo") { >x === "foo" : boolean diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types index 9a010b490cca2..ad92dc360d0a9 100644 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types @@ -6,12 +6,12 @@ type T = "" | "foo"; let x: T = ""; >x : "" | "foo" >T : "" | "foo" ->"" : "" | "foo" +>"" : "" let y: T = "foo"; >y : "" | "foo" >T : "" | "foo" ->"foo" : "" | "foo" +>"foo" : "foo" if (x === "") { >x === "" : boolean From 3788254fdc23e51f90d00444e02062671d89871d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 15:49:32 -0700 Subject: [PATCH 070/353] Semicolon. --- src/compiler/parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 5726d260876e8..dcc924d29b451 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2366,7 +2366,7 @@ namespace ts { let node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); case SyntaxKind.StringLiteral: - return parseLiteralNode(/*internName*/ true) + return parseLiteralNode(/*internName*/ true); case SyntaxKind.VoidKeyword: case SyntaxKind.ThisKeyword: return parseTokenNode(); From ebc47d5e0213d31c7eee6111b7c9f09078c8f1ae Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 8 Oct 2015 16:04:09 -0700 Subject: [PATCH 071/353] Linting. --- src/compiler/checker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3b43533e56bd3..be8a486cf6558 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10286,7 +10286,7 @@ namespace ts { function checkStringLiteralExpression(node: LiteralExpression) { // TODO (drosen): Do we want to apply the same approach to no-sub template literals? - + let contextualType = getContextualType(node); if (contextualType) { if (contextualType.flags & TypeFlags.Union) { @@ -10435,7 +10435,7 @@ namespace ts { case SyntaxKind.StringLiteral: return checkStringLiteralExpression(node); case SyntaxKind.NoSubstitutionTemplateLiteral: - return stringType + return stringType; case SyntaxKind.RegularExpressionLiteral: return globalRegExpType; case SyntaxKind.ArrayLiteralExpression: From ff43d464fc74e2617de0f8675961193a2f53a34f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Oct 2015 16:36:15 -0700 Subject: [PATCH 072/353] Add test case --- .../ambientClassDeclarationWithExtends.js | 13 ++++++++++++ ...ambientClassDeclarationWithExtends.symbols | 19 ++++++++++++++++++ .../ambientClassDeclarationWithExtends.types | 20 +++++++++++++++++++ .../ambientClassDeclarationWithExtends.ts | 8 ++++++++ 4 files changed, 60 insertions(+) diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.js b/tests/baselines/reference/ambientClassDeclarationWithExtends.js index 5fd4d5b4b28ea..5a31486bcf07b 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.js +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.js @@ -1,6 +1,19 @@ //// [ambientClassDeclarationWithExtends.ts] declare class A { } declare class B extends A { } + +declare class C { + public foo; +} +namespace D { var x; } +declare class D extends C { } + +var d: C = new D(); //// [ambientClassDeclarationWithExtends.js] +var D; +(function (D) { + var x; +})(D || (D = {})); +var d = new D(); diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols index 71d1e1a66d832..ba678910a9c8a 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols @@ -6,3 +6,22 @@ declare class B extends A { } >B : Symbol(B, Decl(ambientClassDeclarationWithExtends.ts, 0, 19)) >A : Symbol(A, Decl(ambientClassDeclarationWithExtends.ts, 0, 0)) +declare class C { +>C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) + + public foo; +>foo : Symbol(foo, Decl(ambientClassDeclarationWithExtends.ts, 3, 17)) +} +namespace D { var x; } +>D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) +>x : Symbol(x, Decl(ambientClassDeclarationWithExtends.ts, 6, 17)) + +declare class D extends C { } +>D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) +>C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) + +var d: C = new D(); +>d : Symbol(d, Decl(ambientClassDeclarationWithExtends.ts, 9, 3)) +>C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) +>D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) + diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.types b/tests/baselines/reference/ambientClassDeclarationWithExtends.types index 7609856882bed..528496e753d80 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.types +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.types @@ -6,3 +6,23 @@ declare class B extends A { } >B : B >A : A +declare class C { +>C : C + + public foo; +>foo : any +} +namespace D { var x; } +>D : typeof D +>x : any + +declare class D extends C { } +>D : D +>C : C + +var d: C = new D(); +>d : C +>C : C +>new D() : D +>D : typeof D + diff --git a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts index 0c5d8d156bf27..554a436c5ef3a 100644 --- a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts +++ b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts @@ -1,2 +1,10 @@ declare class A { } declare class B extends A { } + +declare class C { + public foo; +} +namespace D { var x; } +declare class D extends C { } + +var d: C = new D(); From 08c78fbe76d87d0e15ca67ac106583e9687ff9cb Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Oct 2015 16:39:53 -0700 Subject: [PATCH 073/353] Check for ClassDeclaration in getBaseTypeNodeOfClass Previously, it just used valueDeclaration. Now, it searches the declarations. --- src/compiler/checker.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 551f428ca9ac2..86754ff93d0e5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2766,7 +2766,10 @@ namespace ts { } function getBaseTypeNodeOfClass(type: InterfaceType): ExpressionWithTypeArguments { - return getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration); + let classDeclaration = getDeclarationOfKind(type.symbol, SyntaxKind.ClassDeclaration); + if (classDeclaration) { + return getClassExtendsHeritageClauseElement(classDeclaration as ClassLikeDeclaration); + } } function getConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] { From 440d01f0bde14d13cc2ca054439caaadcb5009ac Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 9 Oct 2015 10:12:17 -0700 Subject: [PATCH 074/353] Fall back to valueDeclaration Fall back to `valueDeclaration` in getBaseTypeNodeOfClass when no ClassDeclaration exists. --- src/compiler/checker.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 86754ff93d0e5..6c233a57ef40c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2766,10 +2766,9 @@ namespace ts { } function getBaseTypeNodeOfClass(type: InterfaceType): ExpressionWithTypeArguments { - let classDeclaration = getDeclarationOfKind(type.symbol, SyntaxKind.ClassDeclaration); - if (classDeclaration) { - return getClassExtendsHeritageClauseElement(classDeclaration as ClassLikeDeclaration); - } + let classDeclaration = + getDeclarationOfKind(type.symbol, SyntaxKind.ClassDeclaration) || type.symbol.valueDeclaration; + return getClassExtendsHeritageClauseElement(classDeclaration as ClassLikeDeclaration); } function getConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] { From 9e8031cfc3f889caacd79d98951b125265ab38ff Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 9 Oct 2015 14:19:49 -0700 Subject: [PATCH 075/353] Non-namespace merges override `valueDeclaration` Instead of searching `declarations` for a class declaration, make the binder and checker merge `valueDeclaration` such that non-namespace merges always have their `valueDeclaration` win. --- src/compiler/binder.ts | 4 +- src/compiler/checker.ts | 10 ++-- .../ambientClassDeclarationWithExtends.js | 25 +++++++++- ...ambientClassDeclarationWithExtends.symbols | 49 ++++++++++++++----- .../ambientClassDeclarationWithExtends.types | 26 +++++++++- .../ambientClassDeclarationWithExtends.ts | 13 +++++ 6 files changed, 106 insertions(+), 21 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 657683323604f..813a7e2cd4346 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -130,7 +130,9 @@ namespace ts { symbol.members = {}; } - if (symbolFlags & SymbolFlags.Value && !symbol.valueDeclaration) { + if (symbolFlags & SymbolFlags.Value && + (!symbol.valueDeclaration || symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) { + // other kinds of value declarations take precedence over modules symbol.valueDeclaration = node; } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6c233a57ef40c..d22266d951fc4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -293,7 +293,11 @@ namespace ts { target.constEnumOnlyModule = false; } target.flags |= source.flags; - if (!target.valueDeclaration && source.valueDeclaration) target.valueDeclaration = source.valueDeclaration; + if (source.valueDeclaration && + (!target.valueDeclaration || target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) { + // other kinds of value declarations take precedence over modules + target.valueDeclaration = source.valueDeclaration; + } forEach(source.declarations, node => { target.declarations.push(node); }); @@ -2766,9 +2770,7 @@ namespace ts { } function getBaseTypeNodeOfClass(type: InterfaceType): ExpressionWithTypeArguments { - let classDeclaration = - getDeclarationOfKind(type.symbol, SyntaxKind.ClassDeclaration) || type.symbol.valueDeclaration; - return getClassExtendsHeritageClauseElement(classDeclaration as ClassLikeDeclaration); + return getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration); } function getConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] { diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.js b/tests/baselines/reference/ambientClassDeclarationWithExtends.js index 5a31486bcf07b..940efb8899f86 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.js +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.js @@ -1,4 +1,6 @@ -//// [ambientClassDeclarationWithExtends.ts] +//// [tests/cases/compiler/ambientClassDeclarationWithExtends.ts] //// + +//// [ambientClassDeclarationExtends_singleFile.ts] declare class A { } declare class B extends A { } @@ -10,10 +12,29 @@ declare class D extends C { } var d: C = new D(); +//// [ambientClassDeclarationExtends_file1.ts] + +declare class E { + public bar; +} +namespace F { var y; } + +//// [ambientClassDeclarationExtends_file2.ts] + +declare class F extends E { } +var f: E = new F(); + -//// [ambientClassDeclarationWithExtends.js] +//// [ambientClassDeclarationExtends_singleFile.js] var D; (function (D) { var x; })(D || (D = {})); var d = new D(); +//// [ambientClassDeclarationExtends_file1.js] +var F; +(function (F) { + var y; +})(F || (F = {})); +//// [ambientClassDeclarationExtends_file2.js] +var f = new F(); diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols index ba678910a9c8a..023ae6bf582c3 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols @@ -1,27 +1,50 @@ -=== tests/cases/compiler/ambientClassDeclarationWithExtends.ts === +=== tests/cases/compiler/ambientClassDeclarationExtends_singleFile.ts === declare class A { } ->A : Symbol(A, Decl(ambientClassDeclarationWithExtends.ts, 0, 0)) +>A : Symbol(A, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 0)) declare class B extends A { } ->B : Symbol(B, Decl(ambientClassDeclarationWithExtends.ts, 0, 19)) ->A : Symbol(A, Decl(ambientClassDeclarationWithExtends.ts, 0, 0)) +>B : Symbol(B, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 19)) +>A : Symbol(A, Decl(ambientClassDeclarationExtends_singleFile.ts, 0, 0)) declare class C { ->C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) +>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29)) public foo; ->foo : Symbol(foo, Decl(ambientClassDeclarationWithExtends.ts, 3, 17)) +>foo : Symbol(foo, Decl(ambientClassDeclarationExtends_singleFile.ts, 3, 17)) } namespace D { var x; } ->D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) ->x : Symbol(x, Decl(ambientClassDeclarationWithExtends.ts, 6, 17)) +>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22)) +>x : Symbol(x, Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 17)) declare class D extends C { } ->D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) ->C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) +>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22)) +>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29)) var d: C = new D(); ->d : Symbol(d, Decl(ambientClassDeclarationWithExtends.ts, 9, 3)) ->C : Symbol(C, Decl(ambientClassDeclarationWithExtends.ts, 1, 29)) ->D : Symbol(D, Decl(ambientClassDeclarationWithExtends.ts, 5, 1), Decl(ambientClassDeclarationWithExtends.ts, 6, 22)) +>d : Symbol(d, Decl(ambientClassDeclarationExtends_singleFile.ts, 9, 3)) +>C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29)) +>D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22)) + +=== tests/cases/compiler/ambientClassDeclarationExtends_file1.ts === + +declare class E { +>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0)) + + public bar; +>bar : Symbol(bar, Decl(ambientClassDeclarationExtends_file1.ts, 1, 17)) +} +namespace F { var y; } +>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0)) +>y : Symbol(y, Decl(ambientClassDeclarationExtends_file1.ts, 4, 17)) + +=== tests/cases/compiler/ambientClassDeclarationExtends_file2.ts === + +declare class F extends E { } +>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0)) +>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0)) + +var f: E = new F(); +>f : Symbol(f, Decl(ambientClassDeclarationExtends_file2.ts, 2, 3)) +>E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0)) +>F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0)) diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.types b/tests/baselines/reference/ambientClassDeclarationWithExtends.types index 528496e753d80..c7f22eeb65fba 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.types +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/ambientClassDeclarationWithExtends.ts === +=== tests/cases/compiler/ambientClassDeclarationExtends_singleFile.ts === declare class A { } >A : A @@ -26,3 +26,27 @@ var d: C = new D(); >new D() : D >D : typeof D +=== tests/cases/compiler/ambientClassDeclarationExtends_file1.ts === + +declare class E { +>E : E + + public bar; +>bar : any +} +namespace F { var y; } +>F : typeof F +>y : any + +=== tests/cases/compiler/ambientClassDeclarationExtends_file2.ts === + +declare class F extends E { } +>F : F +>E : E + +var f: E = new F(); +>f : E +>E : E +>new F() : F +>F : typeof F + diff --git a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts index 554a436c5ef3a..ca26f1b2a4415 100644 --- a/tests/cases/compiler/ambientClassDeclarationWithExtends.ts +++ b/tests/cases/compiler/ambientClassDeclarationWithExtends.ts @@ -1,3 +1,4 @@ +// @Filename: ambientClassDeclarationExtends_singleFile.ts declare class A { } declare class B extends A { } @@ -8,3 +9,15 @@ namespace D { var x; } declare class D extends C { } var d: C = new D(); + +// @Filename: ambientClassDeclarationExtends_file1.ts + +declare class E { + public bar; +} +namespace F { var y; } + +// @Filename: ambientClassDeclarationExtends_file2.ts + +declare class F extends E { } +var f: E = new F(); From ec2eac53bf15f1729cbcc0c41b9928f53dd2e057 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Sun, 11 Oct 2015 15:33:17 -0700 Subject: [PATCH 076/353] Improved non-namespace overriding Per @ahejlsberg's suggestion, only overwrite a namespace `valueDeclaration` if the new declaration is not a namespace itself. This means that if there are multiple namespace declarations, and nothing else, `valueDeclaration` will be the first namespace declaration, not the last. --- src/compiler/binder.ts | 3 ++- src/compiler/checker.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 813a7e2cd4346..57d610c931edb 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -131,7 +131,8 @@ namespace ts { } if (symbolFlags & SymbolFlags.Value && - (!symbol.valueDeclaration || symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) { + (!symbol.valueDeclaration || + (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && node.kind !== SyntaxKind.ModuleDeclaration))) { // other kinds of value declarations take precedence over modules symbol.valueDeclaration = node; } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d22266d951fc4..6b3ddf9da324f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -294,7 +294,8 @@ namespace ts { } target.flags |= source.flags; if (source.valueDeclaration && - (!target.valueDeclaration || target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) { + (!target.valueDeclaration || + (target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && source.valueDeclaration.kind !== SyntaxKind.ModuleDeclaration))) { // other kinds of value declarations take precedence over modules target.valueDeclaration = source.valueDeclaration; } From 5e14edb4b740669451f8e0a4cffcf7692a3eb49d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 12:25:13 -0700 Subject: [PATCH 077/353] Verify the emit file name is unique and doesnt overwrite input file Fixes #4424 --- src/compiler/declarationEmitter.ts | 18 +++--- src/compiler/diagnosticMessages.json | 6 +- src/compiler/emitter.ts | 27 +++------ src/compiler/program.ts | 60 +++++++++++++++++-- src/compiler/utilities.ts | 40 +++++++++++++ ...hDeclarationEmitPathSameAsInput.errors.txt | 10 ++++ ...lationWithJsEmitPathSameAsInput.errors.txt | 12 ++++ ...rationFileNameSameAsInputJsFile.errors.txt | 10 ++++ ...ithOutFileNameSameAsInputJsFile.errors.txt | 4 +- ...ationWithDeclarationEmitPathSameAsInput.ts | 7 +++ ...ileCompilationWithJsEmitPathSameAsInput.ts | 8 +++ ...OutDeclarationFileNameSameAsInputJsFile.ts | 8 +++ 12 files changed, 175 insertions(+), 35 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt create mode 100644 tests/cases/compiler/jsFileCompilationWithDeclarationEmitPathSameAsInput.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 9e8e366aaac08..9534b22f47ab5 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -32,12 +32,12 @@ namespace ts { export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] { let diagnostics: Diagnostic[] = []; - let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js"); - emitDeclarations(host, resolver, diagnostics, jsFilePath, targetSourceFile); + let { declarationFilePath } = getEmitFileNames(targetSourceFile, host); + emitDeclarations(host, resolver, diagnostics, declarationFilePath, targetSourceFile); return diagnostics; } - function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], jsFilePath: string, root?: SourceFile): DeclarationEmit { + function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], declarationFilePath: string, root?: SourceFile): DeclarationEmit { let newLine = host.getNewLine(); let compilerOptions = host.getCompilerOptions(); @@ -1603,12 +1603,10 @@ namespace ts { function writeReferencePath(referencedFile: SourceFile) { let declFileName = referencedFile.flags & NodeFlags.DeclarationFile ? referencedFile.fileName // Declaration file, use declaration file name - : shouldEmitToOwnFile(referencedFile, compilerOptions) - ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file - : removeFileExtension(compilerOptions.outFile || compilerOptions.out, getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts"; // Global out file + : getEmitFileNames(referencedFile, host).declarationFilePath; // declaration file name declFileName = getRelativePathToDirectoryOrUrl( - getDirectoryPath(normalizeSlashes(jsFilePath)), + getDirectoryPath(normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, @@ -1619,15 +1617,15 @@ namespace ts { } /* @internal */ - export function writeDeclarationFile(jsFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { - let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile); + export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { + let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, declarationFilePath, sourceFile); // TODO(shkamat): Should we not write any declaration file if any of them can produce error, // or should we just not write this file like we are doing now if (!emitDeclarationResult.reportedDeclarationError) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); let compilerOptions = host.getCompilerOptions(); - writeFile(host, diagnostics, removeFileExtension(jsFilePath, getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts", declarationOutput, compilerOptions.emitBOM); + writeFile(host, diagnostics, declarationFilePath, declarationOutput, compilerOptions.emitBOM); } function getDeclarationOutput(synchronousDeclarationOutput: string, moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]) { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index da6196b1dafd3..b03faaf26df48 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2060,10 +2060,14 @@ "category": "Error", "code": 5054 }, - "Could not write file '{0}' which is one of the input files.": { + "Cannot write file '{0}' which is one of the input files.": { "category": "Error", "code": 5055 }, + "Cannot write file '{0}' since one or more input files would emit into it.": { + "category": "Error", + "code": 5056 + }, "Concatenate and emit output to single file.": { "category": "Message", diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a5166a3479f24..89fc1f5d92734 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -324,31 +324,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined; let diagnostics: Diagnostic[] = []; let newLine = host.getNewLine(); - let jsxDesugaring = host.getCompilerOptions().jsx !== JsxEmit.Preserve; - let shouldEmitJsx = (s: SourceFile) => (s.languageVariant === LanguageVariant.JSX && !jsxDesugaring); if (targetSourceFile === undefined) { forEach(host.getSourceFiles(), sourceFile => { if (shouldEmitToOwnFile(sourceFile, compilerOptions)) { - let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, sourceFile); + emitFile(getEmitFileNames(sourceFile, host), sourceFile); } }); if (compilerOptions.outFile || compilerOptions.out) { - emitFile(compilerOptions.outFile || compilerOptions.out); + emitFile(getBundledEmitFileNames(compilerOptions)); } } else { // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service) if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) { - let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, targetSourceFile); + emitFile(getEmitFileNames(targetSourceFile, host), targetSourceFile); } else if (!isDeclarationFile(targetSourceFile) && !isJavaScript(targetSourceFile.fileName) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(compilerOptions.outFile || compilerOptions.out); + emitFile(getBundledEmitFileNames(compilerOptions)); } } @@ -7491,18 +7487,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitFile(jsFilePath: string, sourceFile?: SourceFile) { - if (forEach(host.getSourceFiles(), sourceFile => jsFilePath === sourceFile.fileName)) { - // TODO(shkamat) Verify if this works if same file is referred via different paths ..\foo\a.js and a.js refering to same one - // Report error and dont emit this file - diagnostics.push(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_which_is_one_of_the_input_files, jsFilePath)); - return; + function emitFile({ jsFilePath, declarationFilePath}: { jsFilePath: string, declarationFilePath: string }, sourceFile?: SourceFile) { + if (!host.isEmitBlocked(jsFilePath)) { + emitJavaScript(jsFilePath, sourceFile); } - emitJavaScript(jsFilePath, sourceFile); - - if (compilerOptions.declaration) { - writeDeclarationFile(jsFilePath, sourceFile, host, resolver, diagnostics); + if (compilerOptions.declaration && !host.isEmitBlocked(declarationFilePath)) { + writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics); } } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index dcb9e0791a70f..b15db858db44f 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -330,6 +330,7 @@ namespace ts { let files: SourceFile[] = []; let fileProcessingDiagnostics = createDiagnosticCollection(); let programDiagnostics = createDiagnosticCollection(); + let hasEmitBlockingDiagnostics: Map = {}; // Map storing if there is emit blocking diagnostics for given input let commonSourceDirectory: string; let diagnosticsProducingTypeChecker: TypeChecker; @@ -374,13 +375,9 @@ namespace ts { } } - verifyCompilerOptions(); - // unconditionally set oldProgram to undefined to prevent it from being captured in closure oldProgram = undefined; - programTime += new Date().getTime() - start; - program = { getRootFileNames: () => rootNames, getSourceFile: getSourceFile, @@ -403,6 +400,11 @@ namespace ts { getTypeCount: () => getDiagnosticsProducingTypeChecker().getTypeCount(), getFileProcessingDiagnostics: () => fileProcessingDiagnostics }; + + verifyCompilerOptions(); + + programTime += new Date().getTime() - start; + return program; function getClassifiableNames() { @@ -519,6 +521,7 @@ namespace ts { getSourceFiles: program.getSourceFiles, writeFile: writeFileCallback || ( (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)), + isEmitBlocked: emitFileName => hasProperty(hasEmitBlockingDiagnostics, emitFileName), }; } @@ -1245,6 +1248,55 @@ namespace ts { options.target !== ScriptTarget.ES6) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_experimentalAsyncFunctions_cannot_be_specified_when_targeting_ES5_or_lower)); } + + if (!options.noEmit) { + let emitHost = getEmitHost(); + let emitFilesSeen: Map = {}; + + // Build map of files seen + for (let file of files) { + let { jsFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); + if (jsFilePath) { + let filesEmittingJsFilePath = lookUp(emitFilesSeen, jsFilePath); + if (!filesEmittingJsFilePath) { + emitFilesSeen[jsFilePath] = [file]; + if (options.declaration) { + emitFilesSeen[declarationFilePath] = [file]; + } + } + else { + filesEmittingJsFilePath.push(file); + } + } + } + + // Verify that all the emit files are unique and dont overwrite input files + forEachKey(emitFilesSeen, emitFilePath => { + // Report error if the output overwrites input file + if (hasFile(files, emitFilePath)) { + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_which_is_one_of_the_input_files); + } + + // Report error if multiple files write into same file (except if specified by --out or --outFile) + if (emitFilePath !== (options.outFile || options.out)) { + // Not --out or --outFile emit, There should be single file emitting to this file + if (emitFilesSeen[emitFilePath].length > 1) { + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_since_one_or_more_input_files_would_emit_into_it); + } + } + else { + // --out or --outFile, error if there exist file emitting to single file colliding with --out + if (forEach(emitFilesSeen[emitFilePath], sourceFile => shouldEmitToOwnFile(sourceFile, options))) { + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_since_one_or_more_input_files_would_emit_into_it); + } + } + }); + } + } + + function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) { + hasEmitBlockingDiagnostics[emitFileName] = true; + programDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); } } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index dc43b837c7ca5..f8a1af6f5cf28 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -39,6 +39,8 @@ namespace ts { getCanonicalFileName(fileName: string): string; getNewLine(): string; + isEmitBlocked(emitFileName: string): boolean; + writeFile: WriteFileCallback; } @@ -1766,6 +1768,44 @@ namespace ts { return emitOutputFilePathWithoutExtension + extension; } + export function getEmitFileNames(sourceFile: SourceFile, host: EmitHost) { + if (!isDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { + let options = host.getCompilerOptions(); + let jsFilePath: string; + if (shouldEmitToOwnFile(sourceFile, options)) { + let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, + sourceFile.languageVariant === LanguageVariant.JSX && options.jsx === JsxEmit.Preserve ? ".jsx" : ".js"); + return { + jsFilePath, + declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) + }; + } + else if (options.outFile || options.out) { + return getBundledEmitFileNames(options); + } + } + return { + jsFilePath: undefined, + declarationFilePath: undefined + }; + } + + export function getBundledEmitFileNames(options: CompilerOptions) { + let jsFilePath = options.outFile || options.out; + return { + jsFilePath, + declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) + }; + } + + function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) { + return options.declaration ? removeFileExtension(jsFilePath, getExtensionsToRemoveForEmitPath(options)) + ".d.ts" : undefined; + } + + export function hasFile(sourceFiles: SourceFile[], fileName: string) { + return forEach(sourceFiles, file => file.fileName === fileName); + } + export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) { let sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory()); sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), ""); diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt new file mode 100644 index 0000000000000..a9c60c0748fb4 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt @@ -0,0 +1,10 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' which is one of the input files. + + +!!! error TS5055: Cannot write file 'a.d.ts' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/a.d.ts (0 errors) ==== + declare function isC(): boolean; \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt new file mode 100644 index 0000000000000..09e07a67bf31b --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt @@ -0,0 +1,12 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/a.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt new file mode 100644 index 0000000000000..ed23a30c3faa0 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt @@ -0,0 +1,10 @@ +error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' which is one of the input files. + + +!!! error TS5055: Cannot write file 'b.d.ts' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.d.ts (0 errors) ==== + declare function foo(): boolean; \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt index 4b25824989d0b..3531296e019cf 100644 --- a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -!!! error TS5055: Could not write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/cases/compiler/jsFileCompilationWithDeclarationEmitPathSameAsInput.ts b/tests/cases/compiler/jsFileCompilationWithDeclarationEmitPathSameAsInput.ts new file mode 100644 index 0000000000000..c200602dddd65 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithDeclarationEmitPathSameAsInput.ts @@ -0,0 +1,7 @@ +// @declaration: true +// @filename: a.ts +class c { +} + +// @filename: a.d.ts +declare function isC(): boolean; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts b/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts new file mode 100644 index 0000000000000..27082e9a930a1 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts @@ -0,0 +1,8 @@ +// @jsExtensions: js +// @filename: a.ts +class c { +} + +// @filename: a.js +function foo() { +} diff --git a/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts new file mode 100644 index 0000000000000..1c6bb41de14db --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts @@ -0,0 +1,8 @@ +// @declaration: true +// @out: tests/cases/compiler/b.js +// @filename: a.ts +class c { +} + +// @filename: b.d.ts +declare function foo(): boolean; \ No newline at end of file From a87dae15a980e8d9b5e31fa1bd063733a6bb260c Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 12:44:21 -0700 Subject: [PATCH 078/353] Verify that when emit blocking error occurs rest of the emit occurs as expected --- src/harness/compilerRunner.ts | 2 +- .../fileReferencesWithNoExtensions.js | 34 +++++++++++++++++++ ...CompilationEmitBlockedCorrectly.errors.txt | 17 ++++++++++ .../jsFileCompilationEmitBlockedCorrectly.js | 23 +++++++++++++ ...ationWithDeclarationEmitPathSameAsInput.js | 15 ++++++++ ...OutDeclarationFileNameSameAsInputJsFile.js | 15 ++++++++ .../jsFileCompilationEmitBlockedCorrectly.ts | 13 +++++++ 7 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/fileReferencesWithNoExtensions.js create mode 100644 tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js create mode 100644 tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js create mode 100644 tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js create mode 100644 tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index d9082532cb575..e3c48e33e5c96 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -151,7 +151,7 @@ class CompilerBaselineRunner extends RunnerBase { }); it("Correct JS output for " + fileName, () => { - if (!ts.fileExtensionIs(lastUnit.name, "d.ts") && this.emit) { + if (!(units.length === 1 && ts.fileExtensionIs(lastUnit.name, "d.ts")) && this.emit) { if (result.files.length === 0 && result.errors.length === 0) { throw new Error("Expected at least one js file to be emitted or at least one error to be created."); } diff --git a/tests/baselines/reference/fileReferencesWithNoExtensions.js b/tests/baselines/reference/fileReferencesWithNoExtensions.js new file mode 100644 index 0000000000000..48421954c3a49 --- /dev/null +++ b/tests/baselines/reference/fileReferencesWithNoExtensions.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/fileReferencesWithNoExtensions.ts] //// + +//// [t.ts] +/// +/// +/// +var a = aa; // Check that a.ts is referenced +var b = bb; // Check that b.d.ts is referenced +var c = cc; // Check that c.ts has precedence over c.d.ts + +//// [a.ts] +var aa = 1; + +//// [b.d.ts] +declare var bb: number; + +//// [c.ts] +var cc = 1; + +//// [c.d.ts] +declare var xx: number; + + +//// [a.js] +var aa = 1; +//// [c.js] +var cc = 1; +//// [t.js] +/// +/// +/// +var a = aa; // Check that a.ts is referenced +var b = bb; // Check that b.d.ts is referenced +var c = cc; // Check that c.ts has precedence over c.d.ts diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt new file mode 100644 index 0000000000000..eb9e11e574b57 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt @@ -0,0 +1,17 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (0 errors) ==== + // this should be emitted + class d { + } + +==== tests/cases/compiler/a.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js new file mode 100644 index 0000000000000..ea9c9f62b8d64 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +// this should be emitted +class d { +} + +//// [a.js] +function foo() { +} + + +//// [b.js] +// this should be emitted +var d = (function () { + function d() { + } + return d; +})(); diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js new file mode 100644 index 0000000000000..a7ba8b49985a9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/jsFileCompilationWithDeclarationEmitPathSameAsInput.ts] //// + +//// [a.ts] +class c { +} + +//// [a.d.ts] +declare function isC(): boolean; + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js new file mode 100644 index 0000000000000..d3b2f788d6605 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts] //// + +//// [a.ts] +class c { +} + +//// [b.d.ts] +declare function foo(): boolean; + +//// [b.js] +var c = (function () { + function c() { + } + return c; +})(); diff --git a/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts b/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts new file mode 100644 index 0000000000000..80f9358fb7f68 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts @@ -0,0 +1,13 @@ +// @jsExtensions: js +// @filename: a.ts +class c { +} + +// @filename: b.ts +// this should be emitted +class d { +} + +// @filename: a.js +function foo() { +} From 6882035dc00f83e33e0a7117c4f9ad0110460d8d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 12:50:35 -0700 Subject: [PATCH 079/353] Verify if one or more files are emitting into same output file we provide error --- .../reference/filesEmittingIntoSameOutput.errors.txt | 12 ++++++++++++ ...lesEmittingIntoSameOutputWithOutOption.errors.txt | 12 ++++++++++++ tests/cases/compiler/filesEmittingIntoSameOutput.ts | 7 +++++++ .../filesEmittingIntoSameOutputWithOutOption.ts | 9 +++++++++ 4 files changed, 40 insertions(+) create mode 100644 tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt create mode 100644 tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt create mode 100644 tests/cases/compiler/filesEmittingIntoSameOutput.ts create mode 100644 tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts diff --git a/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt new file mode 100644 index 0000000000000..3a4c7eaad4509 --- /dev/null +++ b/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt @@ -0,0 +1,12 @@ +error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. + + +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/a.tsx (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt new file mode 100644 index 0000000000000..77cd91b9a7f56 --- /dev/null +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt @@ -0,0 +1,12 @@ +error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. + + +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +==== tests/cases/compiler/a.ts (0 errors) ==== + export class c { + } + +==== tests/cases/compiler/b.ts (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/cases/compiler/filesEmittingIntoSameOutput.ts b/tests/cases/compiler/filesEmittingIntoSameOutput.ts new file mode 100644 index 0000000000000..2e53db45edc60 --- /dev/null +++ b/tests/cases/compiler/filesEmittingIntoSameOutput.ts @@ -0,0 +1,7 @@ +// @filename: a.ts +class c { +} + +// @filename: a.tsx +function foo() { +} diff --git a/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts b/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts new file mode 100644 index 0000000000000..e8770c99fba0c --- /dev/null +++ b/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts @@ -0,0 +1,9 @@ +// @out: tests/cases/compiler/a.js +// @module: amd +// @filename: a.ts +export class c { +} + +// @filename: b.ts +function foo() { +} From 286fb3e94876018aae129e4dc8e03e68fb1a24b5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 13:10:54 -0700 Subject: [PATCH 080/353] Fix the lint error --- src/compiler/program.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index b15db858db44f..3b062e333c8bf 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -404,7 +404,7 @@ namespace ts { verifyCompilerOptions(); programTime += new Date().getTime() - start; - + return program; function getClassifiableNames() { From b38a81bc736ebdf06b7982ee044b507b18cc2ac3 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 14:31:44 -0700 Subject: [PATCH 081/353] Emit enabled for JS files --- src/compiler/declarationEmitter.ts | 42 +++++++------------ src/compiler/diagnosticMessages.json | 4 -- src/compiler/emitter.ts | 3 +- src/compiler/utilities.ts | 6 +-- ...tionAmbientVarDeclarationSyntax.errors.txt | 2 + ...sFileCompilationDecoratorSyntax.errors.txt | 2 + ...CompilationEmitBlockedCorrectly.errors.txt | 2 + .../jsFileCompilationEmitDeclarations.js | 3 ++ ...ileCompilationEmitTrippleSlashReference.js | 7 ++++ .../jsFileCompilationEnumSyntax.errors.txt | 2 + ...onsWithJsFileReferenceWithNoOut.errors.txt | 7 ++-- ...eclarationsWithJsFileReferenceWithNoOut.js | 5 +++ ...tionsWithJsFileReferenceWithOut.errors.txt | 18 -------- ...nDeclarationsWithJsFileReferenceWithOut.js | 9 ++++ ...rationsWithJsFileReferenceWithOut.symbols} | 2 +- ...larationsWithJsFileReferenceWithOut.types} | 2 +- ...mpilationExportAssignmentSyntax.errors.txt | 2 + ...tionHeritageClauseSyntaxOfClass.errors.txt | 2 + ...leCompilationImportEqualsSyntax.errors.txt | 2 + ...sFileCompilationInterfaceSyntax.errors.txt | 2 + .../jsFileCompilationModuleSyntax.errors.txt | 2 + ...onsWithJsFileReferenceWithNoOut.errors.txt | 17 ++++++++ ...tDeclarationsWithJsFileReferenceWithOut.js | 2 + ...ileCompilationOptionalParameter.errors.txt | 2 + ...ompilationPropertySyntaxOfClass.errors.txt | 2 + ...lationPublicMethodSyntaxOfClass.errors.txt | 2 + ...pilationPublicParameterModifier.errors.txt | 2 + .../jsFileCompilationRestParameter.js | 1 + ...ationReturnTypeSyntaxOfFunction.errors.txt | 2 + .../jsFileCompilationSyntaxError.errors.txt | 2 + ...sFileCompilationTypeAliasSyntax.errors.txt | 2 + ...ilationTypeArgumentSyntaxOfCall.errors.txt | 2 + ...jsFileCompilationTypeAssertions.errors.txt | 2 + ...sFileCompilationTypeOfParameter.errors.txt | 2 + ...ationTypeParameterSyntaxOfClass.errors.txt | 2 + ...onTypeParameterSyntaxOfFunction.errors.txt | 2 + ...sFileCompilationTypeSyntaxOfVar.errors.txt | 2 + ...lationWithJsEmitPathSameAsInput.errors.txt | 2 + .../reference/jsFileCompilationWithOut.js | 2 + .../jsFileCompilationWithoutOut.errors.txt | 12 ++++++ .../jsFileCompilationWithoutOut.symbols | 10 ----- .../jsFileCompilationWithoutOut.types | 10 ----- .../amd/test.d.ts | 1 + .../amd/test.js | 1 + .../node/test.d.ts | 1 + .../node/test.js | 1 + .../amd/test.d.ts | 1 + .../amd/test.js | 1 + .../node/test.d.ts | 1 + .../node/test.js | 1 + 50 files changed, 136 insertions(+), 80 deletions(-) delete mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt rename tests/baselines/reference/{jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols => jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols} (77%) rename tests/baselines/reference/{jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types => jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types} (72%) create mode 100644 tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationWithoutOut.types diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 9534b22f47ab5..76c3175dcd570 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -69,22 +69,16 @@ namespace ts { if (!compilerOptions.noResolve) { let addedGlobalFileReference = false; forEach(root.referencedFiles, fileReference => { - if (isJavaScript(fileReference.fileName)) { - reportedDeclarationError = true; - diagnostics.push(createFileDiagnostic(root, fileReference.pos, fileReference.end - fileReference.pos, Diagnostics.js_file_cannot_be_referenced_in_ts_file_when_emitting_declarations)); - } - else { - let referencedFile = tryResolveScriptReference(host, root, fileReference); + let referencedFile = tryResolveScriptReference(host, root, fileReference); - // All the references that are not going to be part of same file - if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference - shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file - !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added + // All the references that are not going to be part of same file + if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference + shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file + !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added - writeReferencePath(referencedFile); - if (!isExternalModuleOrDeclarationFile(referencedFile)) { - addedGlobalFileReference = true; - } + writeReferencePath(referencedFile); + if (!isExternalModuleOrDeclarationFile(referencedFile)) { + addedGlobalFileReference = true; } } }); @@ -111,24 +105,18 @@ namespace ts { // Emit references corresponding to this file let emittedReferencedFiles: SourceFile[] = []; forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { + if (!isExternalModuleOrDeclarationFile(sourceFile)) { // Check what references need to be added if (!compilerOptions.noResolve) { forEach(sourceFile.referencedFiles, fileReference => { - if (isJavaScript(fileReference.fileName)) { - reportedDeclarationError = true; - diagnostics.push(createFileDiagnostic(sourceFile, fileReference.pos, fileReference.end - fileReference.pos, Diagnostics.js_file_cannot_be_referenced_in_ts_file_when_emitting_declarations)); - } - else { - let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); + let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && - !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted + // If the reference file is a declaration file or an external module, emit that reference + if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && + !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted - writeReferencePath(referencedFile); - emittedReferencedFiles.push(referencedFile); - } + writeReferencePath(referencedFile); + emittedReferencedFiles.push(referencedFile); } }); } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 00e13ba634c38..d1beacfeaa9bd 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2465,10 +2465,6 @@ "category": "Error", "code": 8017 }, - ".js file cannot be referenced in .ts file when emitting declarations.": { - "category": "Error", - "code": 8018 - }, "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": { "category": "Error", diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ea2fd36889f22..ff60a5927bd9a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -342,7 +342,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitFile(getEmitFileNames(targetSourceFile, host), targetSourceFile); } else if (!isDeclarationFile(targetSourceFile) && - !isJavaScript(targetSourceFile.fileName) && (compilerOptions.outFile || compilerOptions.out)) { emitFile(getBundledEmitFileNames(compilerOptions)); } @@ -462,7 +461,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else { forEach(host.getSourceFiles(), sourceFile => { - if (!isJavaScript(sourceFile.fileName) && !isExternalModuleOrDeclarationFile(sourceFile)) { + if (!isExternalModuleOrDeclarationFile(sourceFile)) { emitSourceFile(sourceFile); } }); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index f8a1af6f5cf28..f4dd2c02c8d56 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1769,7 +1769,7 @@ namespace ts { } export function getEmitFileNames(sourceFile: SourceFile, host: EmitHost) { - if (!isDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { + if (!isDeclarationFile(sourceFile)) { let options = host.getCompilerOptions(); let jsFilePath: string; if (shouldEmitToOwnFile(sourceFile, options)) { @@ -1835,12 +1835,12 @@ namespace ts { } export function shouldEmitToOwnFile(sourceFile: SourceFile, compilerOptions: CompilerOptions): boolean { - if (!isDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { + if (!isDeclarationFile(sourceFile)) { if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) { // 1. in-browser single file compilation scenario // 2. non supported extension file return compilerOptions.isolatedModules || - forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(sourceFile.fileName, extension)); + forEach(getSupportedExtensions(compilerOptions), extension => fileExtensionIs(sourceFile.fileName, extension)); } return false; } diff --git a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt index a210385d996be..b0732afea729a 100644 --- a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== declare var v; ~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt index 6017ddc7a1120..b7fec2eefc671 100644 --- a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== @internal class C { } ~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt index eb9e11e574b57..5861e73f49b22 100644 --- a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt +++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt @@ -1,7 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js index 4c9f6802fd94f..c6711e4e85f42 100644 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js @@ -15,8 +15,11 @@ var c = (function () { } return c; })(); +function foo() { +} //// [out.d.ts] declare class c { } +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js index 33077f3038f3e..04f36213b1bde 100644 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js @@ -19,8 +19,15 @@ var c = (function () { } return c; })(); +function bar() { +} +/// +function foo() { +} //// [out.d.ts] declare class c { } +declare function bar(): void; +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt index 6b9d97e55bb32..e9fd9cc31b759 100644 --- a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== enum E { } ~ diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt index 1d6ddb3ed30c9..9be6b3f1ccdbd 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -1,14 +1,13 @@ -tests/cases/compiler/b.ts(1,1): error TS8018: .js file cannot be referenced in .ts file when emitting declarations. +error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } -==== tests/cases/compiler/b.ts (1 errors) ==== +==== tests/cases/compiler/b.ts (0 errors) ==== /// - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS8018: .js file cannot be referenced in .ts file when emitting declarations. // error on above reference path when emitting declarations function foo() { } diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js index 6bd76de881bfc..07d6fb812c066 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -30,3 +30,8 @@ function foo() { //// [a.d.ts] declare class c { } +//// [c.d.ts] +declare function bar(): void; +//// [b.d.ts] +/// +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt deleted file mode 100644 index a658130e10aa9..0000000000000 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/b.ts(1,1): error TS8018: .js file cannot be referenced in .ts file when emitting declarations. - - -==== tests/cases/compiler/a.ts (0 errors) ==== - class c { - } - -==== tests/cases/compiler/b.ts (1 errors) ==== - /// - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS8018: .js file cannot be referenced in .ts file when emitting declarations. - // error on above reference when emitting declarations - function foo() { - } - -==== tests/cases/compiler/c.js (0 errors) ==== - function bar() { - } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js index 99dd961db4c5b..0d1939d720801 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js @@ -20,7 +20,16 @@ var c = (function () { } return c; })(); +function bar() { +} /// // error on above reference when emitting declarations function foo() { } + + +//// [out.d.ts] +declare class c { +} +declare function bar(): void; +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols similarity index 77% rename from tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols rename to tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols index 06b80b144a4fe..544fe53f425af 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.symbols +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols @@ -5,7 +5,7 @@ class c { === tests/cases/compiler/b.ts === /// -// no error on above reference path since not emitting declarations +// error on above reference when emitting declarations function foo() { >foo : Symbol(foo, Decl(b.ts, 0, 0)) } diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types similarity index 72% rename from tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types rename to tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types index ea9b48061c37c..8aafb9f61d034 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.types +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types @@ -5,7 +5,7 @@ class c { === tests/cases/compiler/b.ts === /// -// no error on above reference path since not emitting declarations +// error on above reference when emitting declarations function foo() { >foo : () => void } diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt index a349e2bca13c8..27371222dceb3 100644 --- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== export = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt index df014047b35f6..c7d080404a232 100644 --- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C implements D { } ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt index e53bf2ac8608c..36ab7aab18859 100644 --- a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== import a = b; ~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt index c46c3c05b3fbe..3089aeecb4994 100644 --- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== interface I { } ~ diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt index 8748064cc9608..d85819b8588b3 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== module M { } ~ diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt new file mode 100644 index 0000000000000..06bfd61c7ab0e --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -0,0 +1,17 @@ +error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (0 errors) ==== + /// + // no error on above reference path since not emitting declarations + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js index 55412253441db..fae4936b6c916 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js @@ -20,6 +20,8 @@ var c = (function () { } return c; })(); +function bar() { +} /// //no error on above reference since not emitting declarations function foo() { diff --git a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt index 68b131d39f92d..6d9e3c5919d9e 100644 --- a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(p?) { } ~ diff --git a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt index 0ecf6f3c666c7..5a35e68bcec74 100644 --- a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,11): error TS8014: 'property declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { v } ~ diff --git a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt index 907775c7be65e..a6d47e5fbe372 100644 --- a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { public foo() { diff --git a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt index e5072278f4c40..fa3e0e34a774b 100644 --- a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { constructor(public x) { }} ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.js b/tests/baselines/reference/jsFileCompilationRestParameter.js index d28299c543aca..bcba97af02497 100644 --- a/tests/baselines/reference/jsFileCompilationRestParameter.js +++ b/tests/baselines/reference/jsFileCompilationRestParameter.js @@ -2,3 +2,4 @@ function foo(...a) { } //// [b.js] +function foo(...a) { } diff --git a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt index 50746dcfc82e1..8b83a9d1f903c 100644 --- a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(): number { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt index 1ca6e25178823..b06375e8a6a26 100644 --- a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt +++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(3,6): error TS1223: 'type' tag already specified. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== /** * @type {number} diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt index 6af5751ea8545..a0724e452b79d 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,1): error TS8008: 'type aliases' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== type a = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt index cade211aa63a3..acefc2ff569d7 100644 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== Foo(); ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index 6d4ef23dcc683..669e83688ccda 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,27): error TS17002: Expected corresponding JSX closing tag for 'string'. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== var v = undefined; diff --git a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt index ae3fd23c6efe6..69fa6251942db 100644 --- a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F(a: number) { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt index 708ff378137f0..f279896c4ed22 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== class C { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt index 391e8f476daa1..9b056bcae505b 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== function F() { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt index a4486a5d49d7f..080cb580bf2e5 100644 --- a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt @@ -1,6 +1,8 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== var v: () => number; ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt index 09e07a67bf31b..134c95dee1553 100644 --- a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt @@ -1,7 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationWithOut.js b/tests/baselines/reference/jsFileCompilationWithOut.js index 7bab7b973ab6d..32d0261061f6f 100644 --- a/tests/baselines/reference/jsFileCompilationWithOut.js +++ b/tests/baselines/reference/jsFileCompilationWithOut.js @@ -15,3 +15,5 @@ var c = (function () { } return c; })(); +function foo() { +} diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt new file mode 100644 index 0000000000000..3531296e019cf --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt @@ -0,0 +1,12 @@ +error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.symbols b/tests/baselines/reference/jsFileCompilationWithoutOut.symbols deleted file mode 100644 index 5260b8d6cf36a..0000000000000 --- a/tests/baselines/reference/jsFileCompilationWithoutOut.symbols +++ /dev/null @@ -1,10 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.types b/tests/baselines/reference/jsFileCompilationWithoutOut.types deleted file mode 100644 index dce83eeb8ebb7..0000000000000 --- a/tests/baselines/reference/jsFileCompilationWithoutOut.types +++ /dev/null @@ -1,10 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : c -} - -=== tests/cases/compiler/b.js === -function foo() { ->foo : () => void -} - diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts index 4c0b8989316ef..bbae04a30bf94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts @@ -1 +1,2 @@ declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js index e757934f20cc5..f2115703462fc 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js @@ -1 +1,2 @@ var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts index 4c0b8989316ef..bbae04a30bf94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts @@ -1 +1,2 @@ declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js index e757934f20cc5..f2115703462fc 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js @@ -1 +1,2 @@ var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts index 4c0b8989316ef..bbae04a30bf94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts @@ -1 +1,2 @@ declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js index e757934f20cc5..f2115703462fc 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js @@ -1 +1,2 @@ var test = 10; +var test2 = 10; // Should get compiled diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts index 4c0b8989316ef..bbae04a30bf94 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts @@ -1 +1,2 @@ declare var test: number; +declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js index e757934f20cc5..f2115703462fc 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js @@ -1 +1,2 @@ var test = 10; +var test2 = 10; // Should get compiled From d4d6e48ea57870bc68b562e28ff5486c39af4d37 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 14:39:10 -0700 Subject: [PATCH 082/353] Adding test case for scenario in which error reported depends on order of files --- .../jsFileCompilationDuplicateVariable.js | 16 ++++++++++++++++ .../jsFileCompilationDuplicateVariable.symbols | 8 ++++++++ .../jsFileCompilationDuplicateVariable.types | 10 ++++++++++ ...tionDuplicateVariableErrorReported.errors.txt | 10 ++++++++++ ...eCompilationDuplicateVariableErrorReported.js | 16 ++++++++++++++++ .../jsFileCompilationDuplicateVariable.ts | 8 ++++++++ ...eCompilationDuplicateVariableErrorReported.ts | 8 ++++++++ 7 files changed, 76 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.js create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.types create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js create mode 100644 tests/cases/compiler/jsFileCompilationDuplicateVariable.ts create mode 100644 tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js new file mode 100644 index 0000000000000..3e3d0b9802acb --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js @@ -0,0 +1,16 @@ +//// [tests/cases/compiler/jsFileCompilationDuplicateVariable.ts] //// + +//// [a.ts] +var x = 10; + +//// [b.js] +var x = "hello"; // No error is recorded here and declaration file will show this as number + +//// [out.js] +var x = 10; +var x = "hello"; // No error is recorded here and declaration file will show this as number + + +//// [out.d.ts] +declare var x: number; +declare var x: number; diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols b/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols new file mode 100644 index 0000000000000..9bfc61a64f85a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols @@ -0,0 +1,8 @@ +=== tests/cases/compiler/a.ts === +var x = 10; +>x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) + +=== tests/cases/compiler/b.js === +var x = "hello"; // No error is recorded here and declaration file will show this as number +>x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) + diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.types b/tests/baselines/reference/jsFileCompilationDuplicateVariable.types new file mode 100644 index 0000000000000..fefad3f6ddaa6 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === +var x = 10; +>x : number +>10 : number + +=== tests/cases/compiler/b.js === +var x = "hello"; // No error is recorded here and declaration file will show this as number +>x : number +>"hello" : string + diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt new file mode 100644 index 0000000000000..a3abc11411837 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt @@ -0,0 +1,10 @@ +tests/cases/compiler/a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. + + +==== tests/cases/compiler/b.js (0 errors) ==== + var x = "hello"; + +==== tests/cases/compiler/a.ts (1 errors) ==== + var x = 10; // Error reported so no declaration file generated? + ~ +!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js new file mode 100644 index 0000000000000..7b2643c13d3eb --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js @@ -0,0 +1,16 @@ +//// [tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts] //// + +//// [b.js] +var x = "hello"; + +//// [a.ts] +var x = 10; // Error reported so no declaration file generated? + +//// [out.js] +var x = "hello"; +var x = 10; // Error reported so no declaration file generated? + + +//// [out.d.ts] +declare var x: string; +declare var x: string; diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts new file mode 100644 index 0000000000000..f3f69ee5ec316 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts @@ -0,0 +1,8 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: a.ts +var x = 10; + +// @filename: b.js +var x = "hello"; // No error is recorded here and declaration file will show this as number \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts new file mode 100644 index 0000000000000..77db6222a9219 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts @@ -0,0 +1,8 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: b.js +var x = "hello"; + +// @filename: a.ts +var x = 10; // Error reported so no declaration file generated? \ No newline at end of file From 9f96f47a4f36849c5b5fb38013d3bd21d89d60c9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 14:47:22 -0700 Subject: [PATCH 083/353] Added scenario when duplicate function implementation is reported --- ...DuplicateFunctionImplementation.errors.txt | 15 ++++++++++++ ...pilationDuplicateFunctionImplementation.js | 23 ++++++++++++++++++ ...ImplementationFileOrderReversed.errors.txt | 16 +++++++++++++ ...FunctionImplementationFileOrderReversed.js | 24 +++++++++++++++++++ ...pilationDuplicateFunctionImplementation.ts | 12 ++++++++++ ...FunctionImplementationFileOrderReversed.ts | 13 ++++++++++ 6 files changed, 103 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js create mode 100644 tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts create mode 100644 tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt new file mode 100644 index 0000000000000..fb0c214ddf657 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt @@ -0,0 +1,15 @@ +tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation. + + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + return 10; + } +==== tests/cases/compiler/a.ts (1 errors) ==== + function foo() { + ~~~ +!!! error TS2393: Duplicate function implementation. + return 30; + } + + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js new file mode 100644 index 0000000000000..9b64450936186 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts] //// + +//// [b.js] +function foo() { + return 10; +} +//// [a.ts] +function foo() { + return 30; +} + + + +//// [out.js] +function foo() { + return 10; +} +function foo() { + return 30; +} + + +//// [out.d.ts] diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt new file mode 100644 index 0000000000000..78eb22546e8b0 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt @@ -0,0 +1,16 @@ +tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation. + + +==== tests/cases/compiler/a.ts (1 errors) ==== + function foo() { + ~~~ +!!! error TS2393: Duplicate function implementation. + return 30; + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + return 10; + } + + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js new file mode 100644 index 0000000000000..d7965e91be1d3 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts] //// + +//// [a.ts] +function foo() { + return 30; +} + +//// [b.js] +function foo() { + return 10; +} + + + +//// [out.js] +function foo() { + return 30; +} +function foo() { + return 10; +} + + +//// [out.d.ts] diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts new file mode 100644 index 0000000000000..1cc61edaf3270 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts @@ -0,0 +1,12 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: b.js +function foo() { + return 10; +} +// @filename: a.ts +function foo() { + return 30; +} + diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts new file mode 100644 index 0000000000000..af1d842d9b2e0 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts @@ -0,0 +1,13 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: a.ts +function foo() { + return 30; +} + +// @filename: b.js +function foo() { + return 10; +} + From 11b270f6ca3f0f518d0e3b93a56f2c8b9dfacb86 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 12 Oct 2015 16:27:11 -0700 Subject: [PATCH 084/353] Add testcase - generating declaration file results in more errors in ts file --- src/harness/fourslash.ts | 10 ++++++++++ tests/cases/fourslash/fourslash.ts | 4 ++++ ...pilationDuplicateFunctionImplementation.ts | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 3a628bb62c157..ef118e30fb58b 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -535,6 +535,16 @@ namespace FourSlash { } } + public verifyGetEmitOutputContentsForCurrentFile(expected: { fileName: string; content: string; }[]): void { + let emit = this.languageService.getEmitOutput(this.activeFile.fileName); + this.taoInvalidReason = "verifyGetEmitOutputContentsForCurrentFile impossible"; + assert.equal(emit.outputFiles.length, expected.length, "Number of emit output files"); + for (let i = 0; i < emit.outputFiles.length; i++) { + assert.equal(emit.outputFiles[i].name, expected[i].fileName, "FileName"); + assert.equal(emit.outputFiles[i].text, expected[i].content, "Content"); + } + } + public verifyMemberListContains(symbol: string, text?: string, documentation?: string, kind?: string) { this.scenarioActions.push(""); this.scenarioActions.push(``); diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 54e86786d1404..98bdccc9ab720 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -314,6 +314,10 @@ module FourSlashInterface { FourSlash.currentTestState.verifyGetEmitOutputForCurrentFile(expected); } + public verifyGetEmitOutputContentsForCurrentFile(expected: { fileName: string; content: string; }[]): void { + FourSlash.currentTestState.verifyGetEmitOutputContentsForCurrentFile(expected); + } + public currentParameterHelpArgumentNameIs(name: string) { FourSlash.currentTestState.verifyCurrentParameterHelpName(name); } diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts new file mode 100644 index 0000000000000..f9cc1f9b63538 --- /dev/null +++ b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts @@ -0,0 +1,20 @@ +/// + +// @declaration: true +// @out: out.js +// @jsExtensions: js +// @Filename: b.js +// @emitThisFile: true +////function foo() { return 10; }/*1*/ + +// @Filename: a.ts +// @emitThisFile: true +////function foo() { return 30; }/*2*/ + +goTo.marker("2"); +verify.getSemanticDiagnostics("[]"); +verify.verifyGetEmitOutputContentsForCurrentFile([ + { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }, + { fileName: "out.d.ts", content: "" }]); +goTo.marker("2"); +verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); \ No newline at end of file From 81763543f32c8b922d7d466d9f71240cf0f276ba Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 14 Oct 2015 12:00:43 -0700 Subject: [PATCH 085/353] Fix the duplicate function implementation error that depended on order of files --- src/compiler/checker.ts | 9 ++++++++- .../jsFileCompilationDuplicateFunctionImplementation.ts | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2127bf4587086..838172345c660 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10770,6 +10770,7 @@ namespace ts { let symbol = getSymbolOfNode(node); let firstDeclaration = getDeclarationOfKind(symbol, node.kind); + // Only type check the symbol once if (node === firstDeclaration) { checkFunctionOrConstructorSymbol(symbol); @@ -11782,7 +11783,13 @@ namespace ts { let symbol = getSymbolOfNode(node); let localSymbol = node.localSymbol || symbol; - let firstDeclaration = getDeclarationOfKind(localSymbol, node.kind); + let firstDeclaration = forEach(symbol.declarations, declaration => { + // Get first non javascript function declaration + if (declaration.kind === node.kind && !isJavaScript(getSourceFile(declaration).fileName)) { + return declaration; + } + }); + // Only type check the symbol once if (node === firstDeclaration) { checkFunctionOrConstructorSymbol(localSymbol); diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts index f9cc1f9b63538..cbc83bb9c414d 100644 --- a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts @@ -11,10 +11,14 @@ // @emitThisFile: true ////function foo() { return 30; }/*2*/ +goTo.marker("1"); +verify.getSemanticDiagnostics('[]'); goTo.marker("2"); -verify.getSemanticDiagnostics("[]"); +verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); verify.verifyGetEmitOutputContentsForCurrentFile([ { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }, { fileName: "out.d.ts", content: "" }]); goTo.marker("2"); -verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); \ No newline at end of file +verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); +goTo.marker("1"); +verify.getSemanticDiagnostics('[]'); \ No newline at end of file From 5aa7086b819e90f8b385487931815aa0ad6996f8 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 15 Oct 2015 11:04:25 -0700 Subject: [PATCH 086/353] Use ts.indexOf instead of Array.indexOf method --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 838172345c660..8f2c7d3f62f11 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -396,7 +396,7 @@ namespace ts { } let sourceFiles = host.getSourceFiles(); - return sourceFiles.indexOf(file1) <= sourceFiles.indexOf(file2); + return indexOf(sourceFiles, file1) <= indexOf(sourceFiles, file2); } // Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and From 1ae146476479e3e348befd206b49ef2f9da00320 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 15 Oct 2015 11:22:53 -0700 Subject: [PATCH 087/353] Test cases for let declaration and its use order --- .../jsFileCompilationLetDeclarationOrder.js | 21 +++++++++++++++++++ ...FileCompilationLetDeclarationOrder.symbols | 14 +++++++++++++ ...jsFileCompilationLetDeclarationOrder.types | 20 ++++++++++++++++++ ...CompilationLetDeclarationOrder2.errors.txt | 12 +++++++++++ .../jsFileCompilationLetDeclarationOrder2.js | 20 ++++++++++++++++++ .../jsFileCompilationLetDeclarationOrder.ts | 10 +++++++++ .../jsFileCompilationLetDeclarationOrder2.ts | 9 ++++++++ 7 files changed, 106 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js create mode 100644 tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts create mode 100644 tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js new file mode 100644 index 0000000000000..15a1e8d753354 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts] //// + +//// [b.js] +let a = 10; +b = 30; + +//// [a.ts] +let b = 30; +a = 10; + + +//// [out.js] +var a = 10; +b = 30; +var b = 30; +a = 10; + + +//// [out.d.ts] +declare let a: number; +declare let b: number; diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols new file mode 100644 index 0000000000000..c1e97340dc975 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols @@ -0,0 +1,14 @@ +=== tests/cases/compiler/b.js === +let a = 10; +>a : Symbol(a, Decl(b.js, 0, 3)) + +b = 30; +>b : Symbol(b, Decl(a.ts, 0, 3)) + +=== tests/cases/compiler/a.ts === +let b = 30; +>b : Symbol(b, Decl(a.ts, 0, 3)) + +a = 10; +>a : Symbol(a, Decl(b.js, 0, 3)) + diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types new file mode 100644 index 0000000000000..a28c62813deb4 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/b.js === +let a = 10; +>a : number +>10 : number + +b = 30; +>b = 30 : number +>b : number +>30 : number + +=== tests/cases/compiler/a.ts === +let b = 30; +>b : number +>30 : number + +a = 10; +>a = 10 : number +>a : number +>10 : number + diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt new file mode 100644 index 0000000000000..fb213ec4433f7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt @@ -0,0 +1,12 @@ +tests/cases/compiler/a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration. + + +==== tests/cases/compiler/a.ts (1 errors) ==== + let b = 30; + a = 10; + ~ +!!! error TS2448: Block-scoped variable 'a' used before its declaration. +==== tests/cases/compiler/b.js (0 errors) ==== + let a = 10; + b = 30; + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js new file mode 100644 index 0000000000000..641a89c1c5049 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js @@ -0,0 +1,20 @@ +//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts] //// + +//// [a.ts] +let b = 30; +a = 10; +//// [b.js] +let a = 10; +b = 30; + + +//// [out.js] +var b = 30; +a = 10; +var a = 10; +b = 30; + + +//// [out.d.ts] +declare let b: number; +declare let a: number; diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts new file mode 100644 index 0000000000000..d3e342a2d4bb4 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts @@ -0,0 +1,10 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: b.js +let a = 10; +b = 30; + +// @filename: a.ts +let b = 30; +a = 10; diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts new file mode 100644 index 0000000000000..c71d87ac9d94f --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts @@ -0,0 +1,9 @@ +// @jsExtensions: js +// @out: out.js +// @declaration: true +// @filename: a.ts +let b = 30; +a = 10; +// @filename: b.js +let a = 10; +b = 30; From ec0d49a312171c408263c40ea777963b4d02963f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 15 Oct 2015 14:26:27 -0700 Subject: [PATCH 088/353] Always use a string literal type if contextually typed by any string literal types. --- src/compiler/checker.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2980d8a7cad94..3b7436f01e21a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5691,6 +5691,10 @@ namespace ts { return !!getPropertyOfType(type, "0"); } + function isStringLiteralType(type: Type) { + return type.flags & TypeFlags.StringLiteral; + } + /** * Check if a Type was written as a tuple type literal. * Prefer using isTupleLikeType() unless the use of `elementTypes` is required. @@ -6953,6 +6957,10 @@ namespace ts { return applyToContextualType(type, t => getIndexTypeOfStructuredType(t, kind)); } + function contextualTypeIsStringLiteralType(type: Type): boolean { + return !!(type.flags & TypeFlags.Union ? forEach((type).types, isStringLiteralType) : isStringLiteralType(type)); + } + // Return true if the given contextual type is a tuple-like type function contextualTypeIsTupleLikeType(type: Type): boolean { return !!(type.flags & TypeFlags.Union ? forEach((type).types, isTupleLikeType) : isTupleLikeType(type)); @@ -10350,22 +10358,14 @@ namespace ts { return getUnionType([type1, type2]); } - function checkStringLiteralExpression(node: LiteralExpression) { + function checkStringLiteralExpression(node: StringLiteral): Type { // TODO (drosen): Do we want to apply the same approach to no-sub template literals? let contextualType = getContextualType(node); - if (contextualType) { - if (contextualType.flags & TypeFlags.Union) { - for (const type of (contextualType).types) { - if (type.flags & TypeFlags.StringLiteral && (type).text === node.text) { - return type; - } - } - } - else if (contextualType.flags & TypeFlags.StringLiteral && (contextualType).text === node.text) { - return contextualType; - } + if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { + return getStringLiteralType(node); } + return stringType; } @@ -10499,7 +10499,7 @@ namespace ts { case SyntaxKind.TemplateExpression: return checkTemplateExpression(node); case SyntaxKind.StringLiteral: - return checkStringLiteralExpression(node); + return checkStringLiteralExpression(node); case SyntaxKind.NoSubstitutionTemplateLiteral: return stringType; case SyntaxKind.RegularExpressionLiteral: From 1dbd8d1dd8309456f76ce46e7645cb0d4a646cd5 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 15 Oct 2015 14:26:41 -0700 Subject: [PATCH 089/353] Accepted baselines. --- ...loadOnConstantsInvalidOverload1.errors.txt | 4 ++-- .../overloadingOnConstants2.errors.txt | 4 ++-- ...gumentsWithStringLiteralTypes01.errors.txt | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt index 1676a2fb426a0..4fea7cc122795 100644 --- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt +++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(7,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type 'string' is not assignable to parameter of type '"SPAN"'. +tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type '"HI"' is not assignable to parameter of type '"SPAN"'. ==== tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts (3 errors) ==== @@ -20,4 +20,4 @@ tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: foo("HI"); ~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"SPAN"'. \ No newline at end of file +!!! error TS2345: Argument of type '"HI"' is not assignable to parameter of type '"SPAN"'. \ No newline at end of file diff --git a/tests/baselines/reference/overloadingOnConstants2.errors.txt b/tests/baselines/reference/overloadingOnConstants2.errors.txt index c6d6352357681..b448deaadc75b 100644 --- a/tests/baselines/reference/overloadingOnConstants2.errors.txt +++ b/tests/baselines/reference/overloadingOnConstants2.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/overloadingOnConstants2.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadingOnConstants2.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type 'string' is not assignable to parameter of type '"bye"'. +tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type '"um"' is not assignable to parameter of type '"bye"'. tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. @@ -25,7 +25,7 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialize var b: E = foo("bye", []); // E var c = foo("um", []); // error ~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"bye"'. +!!! error TS2345: Argument of type '"um"' is not assignable to parameter of type '"bye"'. //function bar(x: "hi", items: string[]): D; diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt index 69f8d6581a1ae..49f17e7891de1 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -14,18 +14,18 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'. Type 'string' is not assignable to type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(61,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(63,5): error TS2322: Type 'string' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(75,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. Type '"World"' is not assignable to type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(77,5): error TS2322: Type '"Hello" | "World"' is not assignable to type '"Hello"'. Type '"World"' is not assignable to type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(87,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type '"Hello"' is not assignable to parameter of type '"World"'. +tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. Type 'string' is not assignable to type '"World"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'. @@ -120,14 +120,14 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 export let a = fun1<"Hello">("Hello", "Hello"); export let b = fun1<"Hello">("Hello", "World"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. export let c = fun2<"Hello", "Hello">("Hello", "Hello"); export let d = fun2<"Hello", "Hello">("Hello", "World"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. export let e = fun3<"Hello">("Hello", "World"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. // Assignment from the returned value should cause an error. a = takeReturnString(a); @@ -168,13 +168,13 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 export let a = fun2<"Hello", "World">("Hello", "World"); export let b = fun2<"Hello", "World">("World", "Hello"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. export let c = fun2<"World", "Hello">("Hello", "Hello"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"World"'. +!!! error TS2345: Argument of type '"Hello"' is not assignable to parameter of type '"World"'. export let d = fun2<"World", "Hello">("World", "World"); ~~~~~~~ -!!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. +!!! error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'. export let e = fun3<"Hello" | "World">("Hello", "World"); // Assignment from the returned value should cause an error. From 6618fd21bfe5e34a9d0014d5a60f8ef97e0b91c8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 26 Oct 2015 15:42:02 -0700 Subject: [PATCH 090/353] Added tests for operations that use assignable to/from. --- .../stringLiteralCheckedInIf01.ts | 17 ++++++++++ .../stringLiteralCheckedInIf02.ts | 18 +++++++++++ .../stringLiteralMatchedInSwitch01.ts | 13 ++++++++ .../stringLiteralTypeAssertion01.ts | 31 +++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts new file mode 100644 index 0000000000000..093824acf0d42 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts @@ -0,0 +1,17 @@ + +type S = "a" | "b"; +type T = S[] | S; + +function f(foo: T) { + if (foo === "a") { + return foo; + } + else if (foo === "b") { + return foo; + } + else { + return (foo as S[])[0]; + } + + throw new Error("Unreachable code hit."); +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts new file mode 100644 index 0000000000000..53d625f720034 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts @@ -0,0 +1,18 @@ + +type S = "a" | "b"; +type T = S[] | S; + +function isS(t: T): t is S { + return t === "a" || t === "b"; +} + +function f(foo: T) { + if (isS(foo)) { + return foo; + } + else { + return foo[0]; + } + + throw new Error("Unreachable code hit."); +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts new file mode 100644 index 0000000000000..141f5d12795ef --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts @@ -0,0 +1,13 @@ + +type S = "a" | "b"; +type T = S[] | S; + +var foo: T; +switch (foo) { + case "a": + case "b": + break; + default: + foo = (foo as S[])[0]; + break; +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts new file mode 100644 index 0000000000000..ec1f1e5eb5634 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts @@ -0,0 +1,31 @@ + +type S = "a" | "b"; +type T = S[] | S; + +var s: S; +var t: T; +var str: string; + +//////////////// + +s = t; +s = t as S; + +s = str; +s = str as S; + +//////////////// + +t = s; +t = s as T; + +t = str; +t = str as T; + +//////////////// + +str = s; +str = s as string; + +str = t; +str = t as string; From b31b45f584282175281a04c4e465115e4dde6c6a Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 26 Oct 2015 15:42:25 -0700 Subject: [PATCH 091/353] JavaScript class inference from prototype property assignment --- src/compiler/binder.ts | 32 ++++++++++++++ src/compiler/checker.ts | 43 +++++++++++++------ src/compiler/types.ts | 2 + src/compiler/utilities.ts | 29 +++++++++++++ src/services/services.ts | 1 + tests/cases/fourslash/javaScriptPrototype1.ts | 36 ++++++++++++++++ 6 files changed, 129 insertions(+), 14 deletions(-) create mode 100644 tests/cases/fourslash/javaScriptPrototype1.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index d5ab7dd11ca9c..bfef27a9102f3 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -622,6 +622,7 @@ namespace ts { function bindAnonymousDeclaration(node: Declaration, symbolFlags: SymbolFlags, name: string) { let symbol = createSymbol(symbolFlags, name); addDeclarationToSymbol(symbol, node, symbolFlags); + return symbol; } function bindBlockScopedDeclaration(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) { @@ -867,6 +868,9 @@ namespace ts { else if (isModuleExportsAssignment(node)) { bindModuleExportsAssignment(node); } + else if (isPrototypePropertyAssignment(node)) { + bindPrototypePropertyAssignment(node); + } } return checkStrictModeBinaryExpression(node); case SyntaxKind.CatchClause: @@ -1034,6 +1038,34 @@ namespace ts { bindExportAssignment(node); } + function bindPrototypePropertyAssignment(node: BinaryExpression) { + // We saw a node of the form 'x.prototype.y = z'. + // This does two things: turns 'x' into a constructor function, and + // adds a member 'y' to the result of that constructor function + // Get 'x', the class + let classId = ((node.left).expression).expression; + + // Look up the function in the local scope, since prototype assignments should immediately + // follow the function declaration + let funcSymbol = container.locals[classId.text]; + if (!funcSymbol) { + return; + } + + // The function is now a constructor rather than a normal function + if (!funcSymbol.inferredConstructor) { + funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; + funcSymbol.members = funcSymbol.members || {}; + funcSymbol.members["__constructor"] = funcSymbol; + funcSymbol.inferredConstructor = true; + } + + // Get 'y', the property name, and add it to the type of the class + let propertyName = (node.left).name; + let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); + declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method | SymbolFlags.Property, SymbolFlags.None); + } + function bindCallExpression(node: CallExpression) { // We're only inspecting call expressions to detect CommonJS modules, so we can skip // this check if we've already seen the module indicator diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ac5056bf769a4..24da884a33087 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -122,8 +122,8 @@ namespace ts { let noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - let anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false); - let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false); + let anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, false, false); + let unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, false, false); let globals: SymbolTable = {}; @@ -3247,12 +3247,13 @@ namespace ts { resolveObjectTypeMembers(type, source, typeParameters, typeArguments); } - function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], + function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], kind: SignatureKind, resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { let sig = new Signature(checker); sig.declaration = declaration; sig.typeParameters = typeParameters; sig.parameters = parameters; + sig.kind = kind; sig.resolvedReturnType = resolvedReturnType; sig.typePredicate = typePredicate; sig.minArgumentCount = minArgumentCount; @@ -3262,13 +3263,13 @@ namespace ts { } function cloneSignature(sig: Signature): Signature { - return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, + return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.kind, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals); } function getDefaultConstructSignatures(classType: InterfaceType): Signature[] { if (!getBaseTypes(classType).length) { - return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)]; + return [createSignature(undefined, classType.localTypeParameters, emptyArray, SignatureKind.Construct, classType, undefined, 0, false, false)]; } let baseConstructorType = getBaseConstructorTypeOfClass(classType); let baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct); @@ -3788,7 +3789,26 @@ namespace ts { } } - links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, typePredicate, + let kind: SignatureKind; + switch (declaration.kind) { + case SyntaxKind.Constructor: + case SyntaxKind.ConstructSignature: + case SyntaxKind.ConstructorType: + kind = SignatureKind.Construct; + break; + default: + if (declaration.symbol.inferredConstructor) { + kind = SignatureKind.Construct; + let proto = declaration.symbol.members["prototype"]; + returnType = createAnonymousType(createSymbol(SymbolFlags.None, "__jsClass"), proto.members, emptyArray, emptyArray, undefined, undefined); + } + else { + kind = SignatureKind.Call; + } + break; + } + + links.resolvedSignature = createSignature(declaration, typeParameters, parameters, kind, returnType, typePredicate, minArgumentCount, hasRestParameter(declaration), hasStringLiterals); } return links.resolvedSignature; @@ -3905,7 +3925,7 @@ namespace ts { // object type literal or interface (using the new keyword). Each way of declaring a constructor // will result in a different declaration kind. if (!signature.isolatedSignatureType) { - let isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature; + let isConstructor = signature.kind === SignatureKind.Construct; let type = createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature); type.members = emptySymbols; type.properties = emptyArray; @@ -4611,6 +4631,7 @@ namespace ts { } let result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), + signature.kind, instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals); @@ -9359,13 +9380,7 @@ namespace ts { return voidType; } if (node.kind === SyntaxKind.NewExpression) { - let declaration = signature.declaration; - - if (declaration && - declaration.kind !== SyntaxKind.Constructor && - declaration.kind !== SyntaxKind.ConstructSignature && - declaration.kind !== SyntaxKind.ConstructorType) { - + if (signature.kind === SignatureKind.Call) { // When resolved signature is a call signature (and not a construct signature) the result type is any if (compilerOptions.noImplicitAny) { error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5e8de9a3fb411..5232209e7d198 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1714,6 +1714,7 @@ namespace ts { /* @internal */ parent?: Symbol; // Parent symbol /* @internal */ exportSymbol?: Symbol; // Exported symbol associated with this symbol /* @internal */ constEnumOnlyModule?: boolean; // True if module contains only const enums or other modules with only const enums + /* @internal */ inferredConstructor?: boolean; // A function promoted to constructor as the result of a prototype property assignment } /* @internal */ @@ -1958,6 +1959,7 @@ namespace ts { declaration: SignatureDeclaration; // Originating declaration typeParameters: TypeParameter[]; // Type parameters (undefined if non-generic) parameters: Symbol[]; // Parameters + kind: SignatureKind; // Call or Construct typePredicate?: TypePredicate; // Type predicate /* @internal */ resolvedReturnType: Type; // Resolved return type diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 9eff4370ec22a..05184e29f58c8 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1086,6 +1086,35 @@ namespace ts { (((expression).left).name.text === "exports"); } + /** + * Returns true if this expression is an assignment to the given named property + */ + function isAssignmentToProperty(expression: Node, name?: string): expression is BinaryExpression { + return (expression.kind === SyntaxKind.BinaryExpression) && + ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && + isNamedPropertyAccess((expression).left, name); + } + + /** + * Returns true if this expression is a PropertyAccessExpression where the property name is the provided name + */ + function isNamedPropertyAccess(expression: Node, name?: string): expression is PropertyAccessExpression { + return expression.kind === SyntaxKind.PropertyAccessExpression && + (!name || (expression).name.text === name); + } + + /** + * Returns true if the node is an assignment in the form 'id1.prototype.id2 = expr' where id1 and id2 + * are any identifier. + * This function does not test if the node is in a JavaScript file or not. + */ + export function isPrototypePropertyAssignment(expression: Node): expression is BinaryExpression { + return isAssignmentToProperty(expression) && + isNamedPropertyAccess(expression.left) && + isNamedPropertyAccess((expression.left).expression, "prototype") && + ((expression.left).expression).expression.kind === SyntaxKind.Identifier; + } + export function getExternalModuleName(node: Node): Expression { if (node.kind === SyntaxKind.ImportDeclaration) { return (node).moduleSpecifier; diff --git a/src/services/services.ts b/src/services/services.ts index 30d993cb6b634..2c2bbb8e73e88 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -735,6 +735,7 @@ namespace ts { declaration: SignatureDeclaration; typeParameters: TypeParameter[]; parameters: Symbol[]; + kind: SignatureKind; resolvedReturnType: Type; minArgumentCount: number; hasRestParameter: boolean; diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts new file mode 100644 index 0000000000000..0dec8d721d6f4 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype1.ts @@ -0,0 +1,36 @@ +/// + +// Assignments to the 'prototype' property of a function create a class + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// var m = new myCtor(10); +//// m/*1*/ +//// var x = m.foo(); +//// x/*2*/ +//// var y = m.bar(); +//// y/*3*/ + +goTo.marker('1'); +edit.insert('.'); +verify.memberListContains('foo', undefined, undefined, 'method'); +edit.insert('foo'); + +edit.backspace(); +edit.backspace(); + +goTo.marker('2'); +edit.insert('.'); +verify.memberListContains('toFixed', undefined, undefined, 'method'); +verify.not.memberListContains('substr', undefined, undefined, 'method'); +edit.backspace(); + +goTo.marker('3'); +edit.insert('.'); +verify.memberListContains('substr', undefined, undefined, 'method'); +verify.not.memberListContains('toFixed', undefined, undefined, 'method'); From 5e2314303f89ac4dae495700471c9f6d8f5f3303 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 26 Oct 2015 18:49:41 -0700 Subject: [PATCH 092/353] Accepted baselines. --- .../stringLiteralCheckedInIf01.errors.txt | 26 +++++++++ .../reference/stringLiteralCheckedInIf01.js | 32 +++++++++++ .../stringLiteralCheckedInIf02.errors.txt | 27 +++++++++ .../reference/stringLiteralCheckedInIf02.js | 33 +++++++++++ .../stringLiteralMatchedInSwitch01.errors.txt | 26 +++++++++ .../stringLiteralMatchedInSwitch01.js | 25 +++++++++ .../stringLiteralTypeAssertion01.errors.txt | 55 +++++++++++++++++++ .../reference/stringLiteralTypeAssertion01.js | 53 ++++++++++++++++++ 8 files changed, 277 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf01.js create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf02.js create mode 100644 tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralMatchedInSwitch01.js create mode 100644 tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypeAssertion01.js diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt b/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt new file mode 100644 index 0000000000000..fb94cf6bc96d7 --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt @@ -0,0 +1,26 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts(6,9): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. +tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts(9,14): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts (2 errors) ==== + + type S = "a" | "b"; + type T = S[] | S; + + function f(foo: T) { + if (foo === "a") { + ~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + return foo; + } + else if (foo === "b") { + ~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + return foo; + } + else { + return (foo as S[])[0]; + } + + throw new Error("Unreachable code hit."); + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.js b/tests/baselines/reference/stringLiteralCheckedInIf01.js new file mode 100644 index 0000000000000..227a243133c6b --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.js @@ -0,0 +1,32 @@ +//// [stringLiteralCheckedInIf01.ts] + +type S = "a" | "b"; +type T = S[] | S; + +function f(foo: T) { + if (foo === "a") { + return foo; + } + else if (foo === "b") { + return foo; + } + else { + return (foo as S[])[0]; + } + + throw new Error("Unreachable code hit."); +} + +//// [stringLiteralCheckedInIf01.js] +function f(foo) { + if (foo === "a") { + return foo; + } + else if (foo === "b") { + return foo; + } + else { + return foo[0]; + } + throw new Error("Unreachable code hit."); +} diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt b/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt new file mode 100644 index 0000000000000..ced5adf626334 --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt @@ -0,0 +1,27 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts(6,12): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. +tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts(6,25): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts (2 errors) ==== + + type S = "a" | "b"; + type T = S[] | S; + + function isS(t: T): t is S { + return t === "a" || t === "b"; + ~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + ~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. + } + + function f(foo: T) { + if (isS(foo)) { + return foo; + } + else { + return foo[0]; + } + + throw new Error("Unreachable code hit."); + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.js b/tests/baselines/reference/stringLiteralCheckedInIf02.js new file mode 100644 index 0000000000000..b0b3a64116b3c --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.js @@ -0,0 +1,33 @@ +//// [stringLiteralCheckedInIf02.ts] + +type S = "a" | "b"; +type T = S[] | S; + +function isS(t: T): t is S { + return t === "a" || t === "b"; +} + +function f(foo: T) { + if (isS(foo)) { + return foo; + } + else { + return foo[0]; + } + + throw new Error("Unreachable code hit."); +} + +//// [stringLiteralCheckedInIf02.js] +function isS(t) { + return t === "a" || t === "b"; +} +function f(foo) { + if (isS(foo)) { + return foo; + } + else { + return foo[0]; + } + throw new Error("Unreachable code hit."); +} diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt b/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt new file mode 100644 index 0000000000000..17e690715a1c5 --- /dev/null +++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt @@ -0,0 +1,26 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts(7,10): error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. + Type 'string' is not assignable to type '"b"'. +tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts(8,10): error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. + Type 'string' is not assignable to type '"b"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts (2 errors) ==== + + type S = "a" | "b"; + type T = S[] | S; + + var foo: T; + switch (foo) { + case "a": + ~~~ +!!! error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. +!!! error TS2322: Type 'string' is not assignable to type '"b"'. + case "b": + ~~~ +!!! error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. +!!! error TS2322: Type 'string' is not assignable to type '"b"'. + break; + default: + foo = (foo as S[])[0]; + break; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.js b/tests/baselines/reference/stringLiteralMatchedInSwitch01.js new file mode 100644 index 0000000000000..b9b24cf0c66b3 --- /dev/null +++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.js @@ -0,0 +1,25 @@ +//// [stringLiteralMatchedInSwitch01.ts] + +type S = "a" | "b"; +type T = S[] | S; + +var foo: T; +switch (foo) { + case "a": + case "b": + break; + default: + foo = (foo as S[])[0]; + break; +} + +//// [stringLiteralMatchedInSwitch01.js] +var foo; +switch (foo) { + case "a": + case "b": + break; + default: + foo = foo[0]; + break; +} diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt b/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt new file mode 100644 index 0000000000000..867ad80ee7fbf --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt @@ -0,0 +1,55 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(22,5): error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. + Type 'string' is not assignable to type '"b"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(23,5): error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. + Type 'string' is not assignable to type '"b"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(30,7): error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. + Type '("a" | "b")[]' is not assignable to type 'string'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(31,7): error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. + Type '("a" | "b")[]' is not assignable to type 'string'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts (4 errors) ==== + + type S = "a" | "b"; + type T = S[] | S; + + var s: S; + var t: T; + var str: string; + + //////////////// + + s = t; + s = t as S; + + s = str; + s = str as S; + + //////////////// + + t = s; + t = s as T; + + t = str; + ~~~~~~ +!!! error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. +!!! error TS2352: Type 'string' is not assignable to type '"b"'. + t = str as T; + ~~~~~~~~ +!!! error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. +!!! error TS2352: Type 'string' is not assignable to type '"b"'. + + //////////////// + + str = s; + str = s as string; + + str = t; + ~~~~~~~~~ +!!! error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. +!!! error TS2352: Type '("a" | "b")[]' is not assignable to type 'string'. + str = t as string; + ~~~~~~~~~~~ +!!! error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. +!!! error TS2352: Type '("a" | "b")[]' is not assignable to type 'string'. + \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.js b/tests/baselines/reference/stringLiteralTypeAssertion01.js new file mode 100644 index 0000000000000..7877004cf01ab --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeAssertion01.js @@ -0,0 +1,53 @@ +//// [stringLiteralTypeAssertion01.ts] + +type S = "a" | "b"; +type T = S[] | S; + +var s: S; +var t: T; +var str: string; + +//////////////// + +s = t; +s = t as S; + +s = str; +s = str as S; + +//////////////// + +t = s; +t = s as T; + +t = str; +t = str as T; + +//////////////// + +str = s; +str = s as string; + +str = t; +str = t as string; + + +//// [stringLiteralTypeAssertion01.js] +var s; +var t; +var str; +//////////////// +s = t; +s = t; +s = str; +s = str; +//////////////// +t = s; +t = s; +t = str; +t = str; +//////////////// +str = s; +str = s; +str = t; +str = t; From bc3d95c0a41c833802d0939ecda081a167565b02 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 27 Oct 2015 17:17:31 -0700 Subject: [PATCH 093/353] JS class members as methods --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index bfef27a9102f3..85882c495b680 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1063,7 +1063,7 @@ namespace ts { // Get 'y', the property name, and add it to the type of the class let propertyName = (node.left).name; let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); - declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method | SymbolFlags.Property, SymbolFlags.None); + declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); } function bindCallExpression(node: CallExpression) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 24da884a33087..f0bdd48afa7a7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3843,6 +3843,11 @@ namespace ts { } } result.push(getSignatureFromDeclaration(node)); + break; + + case SyntaxKind.PropertyAccessExpression: + // Class inference from ClassName.prototype.methodName = expr + return getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); } } return result; From 68040879c905caff9e2d26de7c7be8122ffbe259 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 19 Oct 2015 16:44:38 -0700 Subject: [PATCH 094/353] Refactoring to fix build issues --- src/compiler/core.ts | 4 ++++ src/compiler/utilities.ts | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 649539452d1f0..73e25bc472f56 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -729,6 +729,10 @@ namespace ts { * List of supported extensions in order of file resolution precedence. */ export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; + + export function getSupportedExtensions(options?: CompilerOptions): string[] { + return options && options.jsExtensions ? supportedTypeScriptExtensions.concat(options.jsExtensions) : supportedTypeScriptExtensions; + } export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions) { if (!fileName) { return false; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 6dd8041f39001..2d6f541069806 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1855,10 +1855,6 @@ namespace ts { return false; } - export function getSupportedExtensions(options?: CompilerOptions): string[] { - return options && options.jsExtensions ? supportedTypeScriptExtensions.concat(options.jsExtensions) : supportedTypeScriptExtensions; - } - export function getAllAccessorDeclarations(declarations: NodeArray, accessor: AccessorDeclaration) { let firstAccessor: AccessorDeclaration; let secondAccessor: AccessorDeclaration; From 3215438ddf3f13deb59fb564f826fd8b360c5171 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 11:22:46 -0700 Subject: [PATCH 095/353] Dont emit declaration file if there are errors in the source file --- src/compiler/core.ts | 2 +- src/compiler/declarationEmitter.ts | 4 +-- src/compiler/emitter.ts | 2 +- src/compiler/program.ts | 52 +++++++++++++++++++++++++++--- src/compiler/types.ts | 1 + src/compiler/utilities.ts | 1 + 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 73e25bc472f56..de9a93ee6792e 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -729,7 +729,7 @@ namespace ts { * List of supported extensions in order of file resolution precedence. */ export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; - + export function getSupportedExtensions(options?: CompilerOptions): string[] { return options && options.jsExtensions ? supportedTypeScriptExtensions.concat(options.jsExtensions) : supportedTypeScriptExtensions; } diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 76c3175dcd570..8b4e1500a1c67 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1607,9 +1607,7 @@ namespace ts { /* @internal */ export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, declarationFilePath, sourceFile); - // TODO(shkamat): Should we not write any declaration file if any of them can produce error, - // or should we just not write this file like we are doing now - if (!emitDeclarationResult.reportedDeclarationError) { + if (!emitDeclarationResult.reportedDeclarationError && !host.isDeclarationEmitBlocked(declarationFilePath, sourceFile)) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); let compilerOptions = host.getCompilerOptions(); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 842bfcfcf7be9..3f7414376095c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -7601,7 +7601,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitJavaScript(jsFilePath, sourceFile); } - if (compilerOptions.declaration && !host.isEmitBlocked(declarationFilePath)) { + if (compilerOptions.declaration) { writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics); } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 22dca3ace4a7a..4ab0bf4cceab6 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -330,6 +330,7 @@ namespace ts { let files: SourceFile[] = []; let fileProcessingDiagnostics = createDiagnosticCollection(); let programDiagnostics = createDiagnosticCollection(); + let emitBlockingDiagnostics = createDiagnosticCollection(); let hasEmitBlockingDiagnostics: Map = {}; // Map storing if there is emit blocking diagnostics for given input let commonSourceDirectory: string; @@ -393,6 +394,7 @@ namespace ts { getDiagnosticsProducingTypeChecker, getCommonSourceDirectory: () => commonSourceDirectory, emit, + isDeclarationEmitBlocked, getCurrentDirectory: () => host.getCurrentDirectory(), getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(), getIdentifierCount: () => getDiagnosticsProducingTypeChecker().getIdentifierCount(), @@ -510,7 +512,7 @@ namespace ts { return true; } - function getEmitHost(writeFileCallback?: WriteFileCallback): EmitHost { + function getEmitHost(writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitHost { return { getCanonicalFileName: fileName => host.getCanonicalFileName(fileName), getCommonSourceDirectory: program.getCommonSourceDirectory, @@ -521,7 +523,8 @@ namespace ts { getSourceFiles: program.getSourceFiles, writeFile: writeFileCallback || ( (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)), - isEmitBlocked: emitFileName => hasProperty(hasEmitBlockingDiagnostics, emitFileName), + isEmitBlocked, + isDeclarationEmitBlocked: (emitFileName, sourceFile) => program.isDeclarationEmitBlocked(emitFileName, sourceFile, cancellationToken), }; } @@ -537,6 +540,42 @@ namespace ts { return runWithCancellationToken(() => emitWorker(this, sourceFile, writeFileCallback, cancellationToken)); } + function isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile, cancellationToken?: CancellationToken): boolean { + if (isEmitBlocked(emitFileName)) { + return true; + } + + // Dont check for emit blocking options diagnostics because that check per emit file is already covered in isEmitBlocked + // We dont want to end up blocking declaration emit of one file because other file results in emit blocking error + if (getOptionsDiagnostics(cancellationToken, /*includeEmitBlockingDiagnostics*/false).length || + getGlobalDiagnostics().length) { + return true; + } + + if (sourceFile) { + // Do not generate declaration file for this if there are any errors in this file or any of the declaration files + return hasSyntaxOrSemanticDiagnostics(sourceFile) || + forEach(files, sourceFile => isDeclarationFile(sourceFile) && hasSyntaxOrSemanticDiagnostics(sourceFile)); + } + + // Check if the bundled emit source files have errors + return forEach(files, sourceFile => { + // Check all the files that will be bundled together as well as all the included declaration files are error free + if (!isExternalModule(sourceFile)) { + return hasSyntaxOrSemanticDiagnostics(sourceFile); + } + }); + + function hasSyntaxOrSemanticDiagnostics(file: SourceFile) { + return !!getSyntacticDiagnostics(file, cancellationToken).length || + !!getSemanticDiagnostics(file, cancellationToken).length; + } + } + + function isEmitBlocked(emitFileName: string): boolean { + return hasProperty(hasEmitBlockingDiagnostics, emitFileName); + } + function emitWorker(program: Program, sourceFile: SourceFile, writeFileCallback: WriteFileCallback, cancellationToken: CancellationToken): EmitResult { // If the noEmitOnError flag is set, then check if we have any errors so far. If so, // immediately bail out. Note that we pass 'undefined' for 'sourceFile' so that we @@ -559,7 +598,7 @@ namespace ts { let emitResult = emitFiles( emitResolver, - getEmitHost(writeFileCallback), + getEmitHost(writeFileCallback, cancellationToken), sourceFile); emitTime += new Date().getTime() - start; @@ -821,10 +860,13 @@ namespace ts { }); } - function getOptionsDiagnostics(): Diagnostic[] { + function getOptionsDiagnostics(cancellationToken?: CancellationToken, includeEmitBlockingDiagnostics?: boolean): Diagnostic[] { let allDiagnostics: Diagnostic[] = []; addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics()); addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics()); + if (!includeEmitBlockingDiagnostics) { + addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics()); + } return sortAndDeduplicateDiagnostics(allDiagnostics); } @@ -1291,7 +1333,7 @@ namespace ts { function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) { hasEmitBlockingDiagnostics[emitFileName] = true; - programDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); + emitBlockingDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); } } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c501fd52bc2ae..b5451c3311d04 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1358,6 +1358,7 @@ namespace ts { getTypeChecker(): TypeChecker; /* @internal */ getCommonSourceDirectory(): string; + /* @internal */ isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile, cancellationToken?: CancellationToken): boolean; // For testing purposes only. Should not be used by any other consumers (including the // language service). diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 2d6f541069806..0b0c9f2db33da 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -40,6 +40,7 @@ namespace ts { getNewLine(): string; isEmitBlocked(emitFileName: string): boolean; + isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile): boolean; writeFile: WriteFileCallback; } From d14934e4dabad0ee33acaebbd5d9b58537a33027 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 11:26:02 -0700 Subject: [PATCH 096/353] Tests update for emitting declarations if no errors --- .../baselines/reference/classdecl.errors.txt | 108 ---- tests/baselines/reference/classdecl.js | 4 +- tests/baselines/reference/classdecl.symbols | 198 +++++++ tests/baselines/reference/classdecl.types | 212 +++++++ ...mputedPropertyNamesDeclarationEmit3_ES5.js | 5 - ...mputedPropertyNamesDeclarationEmit3_ES6.js | 5 - ...mputedPropertyNamesDeclarationEmit4_ES5.js | 5 - ...mputedPropertyNamesDeclarationEmit4_ES6.js | 5 - tests/baselines/reference/constEnum2.js | 10 - .../reference/constEnumPropertyAccess2.js | 13 - ...lFileObjectLiteralWithAccessors.errors.txt | 20 - ...declFileObjectLiteralWithAccessors.symbols | 36 ++ .../declFileObjectLiteralWithAccessors.types | 47 ++ ...FileObjectLiteralWithOnlyGetter.errors.txt | 15 - .../declFileObjectLiteralWithOnlyGetter.js | 2 +- ...eclFileObjectLiteralWithOnlyGetter.symbols | 23 + .../declFileObjectLiteralWithOnlyGetter.types | 27 + ...FileObjectLiteralWithOnlySetter.errors.txt | 15 - ...eclFileObjectLiteralWithOnlySetter.symbols | 26 + .../declFileObjectLiteralWithOnlySetter.types | 37 ++ .../declFilePrivateStatic.errors.txt | 29 - .../reference/declFilePrivateStatic.symbols | 31 + .../reference/declFilePrivateStatic.types | 35 ++ .../declarationEmitDestructuring2.js | 24 - .../declarationEmitDestructuring4.js | 10 - ...clarationEmitDestructuringArrayPattern2.js | 12 - ...onEmitDestructuringObjectLiteralPattern.js | 19 - ...nEmitDestructuringObjectLiteralPattern1.js | 9 - ...ionEmitDestructuringParameterProperties.js | 21 - ...tructuringWithOptionalBindingParameters.js | 9 - .../declarationEmit_invalidReference2.js | 4 - ...uplicateIdentifiersAcrossFileBoundaries.js | 33 -- .../emptyObjectBindingPatternParameter04.js | 8 - ...ariableDeclarationBindingPatterns02_ES5.js | 3 - ...ariableDeclarationBindingPatterns02_ES6.js | 3 - tests/baselines/reference/es5ExportEquals.js | 5 - tests/baselines/reference/es6ExportEquals.js | 5 - ...tDefaultBindingFollowedWithNamedImport1.js | 1 - ...ultBindingFollowedWithNamedImport1InEs5.js | 1 - ...ndingFollowedWithNamedImport1WithExport.js | 7 - ...efaultBindingFollowedWithNamedImportDts.js | 12 - ...faultBindingFollowedWithNamedImportDts1.js | 8 - ...aultBindingFollowedWithNamedImportInEs5.js | 1 - ...indingFollowedWithNamedImportWithExport.js | 7 - ...aultBindingFollowedWithNamespaceBinding.js | 1 - ...FollowedWithNamespaceBinding1WithExport.js | 2 - ...tBindingFollowedWithNamespaceBindingDts.js | 3 - ...indingFollowedWithNamespaceBindingInEs5.js | 1 - ...gFollowedWithNamespaceBindingWithExport.js | 2 - .../reference/es6ImportDefaultBindingInEs5.js | 1 - .../es6ImportDefaultBindingWithExport.js | 2 - .../es6ImportNameSpaceImportWithExport.js | 2 - .../es6ImportNamedImportWithExport.js | 13 - .../es6ImportWithoutFromClauseWithExport.js | 2 - .../exportDeclarationInInternalModule.js | 17 - .../reference/exportStarFromEmptyModule.js | 7 - .../getEmitOutputTsxFile_React.baseline | 3 +- .../getEmitOutputWithSemanticErrors2.baseline | 2 - ...thSemanticErrorsForMultipleFiles2.baseline | 3 - tests/baselines/reference/giant.js | 304 ---------- .../reference/isolatedModulesDeclaration.js | 4 - ...pilationDuplicateFunctionImplementation.js | 3 - ...FunctionImplementationFileOrderReversed.js | 3 - ...mpilationDuplicateVariableErrorReported.js | 5 - ...eclarationsWithJsFileReferenceWithNoOut.js | 10 - .../jsFileCompilationLetDeclarationOrder2.js | 5 - tests/baselines/reference/letAsIdentifier.js | 6 - .../baselines/reference/moduledecl.errors.txt | 241 -------- tests/baselines/reference/moduledecl.js | 1 + tests/baselines/reference/moduledecl.symbols | 536 +++++++++++++++++ tests/baselines/reference/moduledecl.types | 551 ++++++++++++++++++ tests/baselines/reference/out-flag3.js | 8 +- ...ileCompilationDifferentNamesSpecified.json | 3 +- .../amd/test.d.ts | 1 - ...ileCompilationDifferentNamesSpecified.json | 3 +- .../node/test.d.ts | 1 - .../amd/outdir/simple/FolderC/fileC.d.ts | 2 - .../amd/outdir/simple/fileB.d.ts | 4 - .../amd/rootDirectoryErrors.json | 4 +- .../node/outdir/simple/FolderC/fileC.d.ts | 2 - .../node/outdir/simple/fileB.d.ts | 4 - .../node/rootDirectoryErrors.json | 4 +- tests/baselines/reference/widenedTypes.js | 14 - .../reference/withExportDecl.errors.txt | 64 -- tests/baselines/reference/withExportDecl.js | 2 +- .../reference/withExportDecl.symbols | 129 ++++ .../baselines/reference/withExportDecl.types | 156 +++++ tests/cases/compiler/classdecl.ts | 3 +- .../declFileObjectLiteralWithAccessors.ts | 1 + .../declFileObjectLiteralWithOnlyGetter.ts | 1 + .../declFileObjectLiteralWithOnlySetter.ts | 1 + tests/cases/compiler/declFilePrivateStatic.ts | 1 + tests/cases/compiler/moduledecl.ts | 2 + tests/cases/compiler/withExportDecl.ts | 2 +- .../fourslash/getEmitOutputTsxFile_React.ts | 8 + ...pilationDuplicateFunctionImplementation.ts | 3 +- 96 files changed, 2074 insertions(+), 1189 deletions(-) delete mode 100644 tests/baselines/reference/classdecl.errors.txt create mode 100644 tests/baselines/reference/classdecl.symbols create mode 100644 tests/baselines/reference/classdecl.types delete mode 100644 tests/baselines/reference/declFileObjectLiteralWithAccessors.errors.txt create mode 100644 tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols create mode 100644 tests/baselines/reference/declFileObjectLiteralWithAccessors.types delete mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.errors.txt create mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.symbols create mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types delete mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlySetter.errors.txt create mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols create mode 100644 tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types delete mode 100644 tests/baselines/reference/declFilePrivateStatic.errors.txt create mode 100644 tests/baselines/reference/declFilePrivateStatic.symbols create mode 100644 tests/baselines/reference/declFilePrivateStatic.types delete mode 100644 tests/baselines/reference/moduledecl.errors.txt create mode 100644 tests/baselines/reference/moduledecl.symbols create mode 100644 tests/baselines/reference/moduledecl.types delete mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts delete mode 100644 tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts delete mode 100644 tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts delete mode 100644 tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts delete mode 100644 tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts delete mode 100644 tests/baselines/reference/withExportDecl.errors.txt create mode 100644 tests/baselines/reference/withExportDecl.symbols create mode 100644 tests/baselines/reference/withExportDecl.types diff --git a/tests/baselines/reference/classdecl.errors.txt b/tests/baselines/reference/classdecl.errors.txt deleted file mode 100644 index e43be2f5ad083..0000000000000 --- a/tests/baselines/reference/classdecl.errors.txt +++ /dev/null @@ -1,108 +0,0 @@ -tests/cases/compiler/classdecl.ts(12,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/classdecl.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/classdecl.ts(18,23): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/classdecl.ts(24,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/classdecl.ts (4 errors) ==== - class a { - //constructor (); - constructor (n: number); - constructor (s: string); - constructor (ns: any) { - - } - - public pgF() { } - - public pv; - public get d() { - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - return 30; - } - public set d() { - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - } - - public static get p2() { - ~~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - return { x: 30, y: 40 }; - } - - private static d2() { - } - private static get p3() { - ~~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - return "string"; - } - private pv3; - - private foo(n: number): string; - private foo(s: string): string; - private foo(ns: any) { - return ns.toString(); - } - } - - class b extends a { - } - - module m1 { - export class b { - } - class d { - } - - - export interface ib { - } - } - - module m2 { - - export module m3 { - export class c extends b { - } - export class ib2 implements m1.ib { - } - } - } - - class c extends m1.b { - } - - class ib2 implements m1.ib { - } - - declare class aAmbient { - constructor (n: number); - constructor (s: string); - public pgF(): void; - public pv; - public d : number; - static p2 : { x: number; y: number; }; - static d2(); - static p3; - private pv3; - private foo(s); - } - - class d { - private foo(n: number): string; - private foo(s: string): string; - private foo(ns: any) { - return ns.toString(); - } - } - - class e { - private foo(s: string): string; - private foo(n: number): string; - private foo(ns: any) { - return ns.toString(); - } - } \ No newline at end of file diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index 2af85da5b5783..b424243c164d5 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -13,7 +13,7 @@ class a { public get d() { return 30; } - public set d() { + public set d(a: number) { } public static get p2() { @@ -107,7 +107,7 @@ var a = (function () { get: function () { return 30; }, - set: function () { + set: function (a) { }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/classdecl.symbols b/tests/baselines/reference/classdecl.symbols new file mode 100644 index 0000000000000..ad355e2351760 --- /dev/null +++ b/tests/baselines/reference/classdecl.symbols @@ -0,0 +1,198 @@ +=== tests/cases/compiler/classdecl.ts === +class a { +>a : Symbol(a, Decl(classdecl.ts, 0, 0)) + + //constructor (); + constructor (n: number); +>n : Symbol(n, Decl(classdecl.ts, 2, 17)) + + constructor (s: string); +>s : Symbol(s, Decl(classdecl.ts, 3, 17)) + + constructor (ns: any) { +>ns : Symbol(ns, Decl(classdecl.ts, 4, 17)) + + } + + public pgF() { } +>pgF : Symbol(pgF, Decl(classdecl.ts, 6, 5)) + + public pv; +>pv : Symbol(pv, Decl(classdecl.ts, 8, 20)) + + public get d() { +>d : Symbol(d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5)) + + return 30; + } + public set d(a: number) { +>d : Symbol(d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5)) +>a : Symbol(a, Decl(classdecl.ts, 14, 17)) + } + + public static get p2() { +>p2 : Symbol(a.p2, Decl(classdecl.ts, 15, 5)) + + return { x: 30, y: 40 }; +>x : Symbol(x, Decl(classdecl.ts, 18, 16)) +>y : Symbol(y, Decl(classdecl.ts, 18, 23)) + } + + private static d2() { +>d2 : Symbol(a.d2, Decl(classdecl.ts, 19, 5)) + } + private static get p3() { +>p3 : Symbol(a.p3, Decl(classdecl.ts, 22, 5)) + + return "string"; + } + private pv3; +>pv3 : Symbol(pv3, Decl(classdecl.ts, 25, 5)) + + private foo(n: number): string; +>foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35)) +>n : Symbol(n, Decl(classdecl.ts, 28, 16)) + + private foo(s: string): string; +>foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35)) +>s : Symbol(s, Decl(classdecl.ts, 29, 16)) + + private foo(ns: any) { +>foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35)) +>ns : Symbol(ns, Decl(classdecl.ts, 30, 16)) + + return ns.toString(); +>ns : Symbol(ns, Decl(classdecl.ts, 30, 16)) + } +} + +class b extends a { +>b : Symbol(b, Decl(classdecl.ts, 33, 1)) +>a : Symbol(a, Decl(classdecl.ts, 0, 0)) +} + +module m1 { +>m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) + + export class b { +>b : Symbol(b, Decl(classdecl.ts, 38, 11)) + } + class d { +>d : Symbol(d, Decl(classdecl.ts, 40, 5)) + } + + + export interface ib { +>ib : Symbol(ib, Decl(classdecl.ts, 42, 5)) + } +} + +module m2 { +>m2 : Symbol(m2, Decl(classdecl.ts, 47, 1)) + + export module m3 { +>m3 : Symbol(m3, Decl(classdecl.ts, 49, 11)) + + export class c extends b { +>c : Symbol(c, Decl(classdecl.ts, 51, 22)) +>b : Symbol(b, Decl(classdecl.ts, 33, 1)) + } + export class ib2 implements m1.ib { +>ib2 : Symbol(ib2, Decl(classdecl.ts, 53, 9)) +>m1.ib : Symbol(m1.ib, Decl(classdecl.ts, 42, 5)) +>m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) +>ib : Symbol(m1.ib, Decl(classdecl.ts, 42, 5)) + } + } +} + +class c extends m1.b { +>c : Symbol(c, Decl(classdecl.ts, 57, 1)) +>m1.b : Symbol(m1.b, Decl(classdecl.ts, 38, 11)) +>m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) +>b : Symbol(m1.b, Decl(classdecl.ts, 38, 11)) +} + +class ib2 implements m1.ib { +>ib2 : Symbol(ib2, Decl(classdecl.ts, 60, 1)) +>m1.ib : Symbol(m1.ib, Decl(classdecl.ts, 42, 5)) +>m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) +>ib : Symbol(m1.ib, Decl(classdecl.ts, 42, 5)) +} + +declare class aAmbient { +>aAmbient : Symbol(aAmbient, Decl(classdecl.ts, 63, 1)) + + constructor (n: number); +>n : Symbol(n, Decl(classdecl.ts, 66, 17)) + + constructor (s: string); +>s : Symbol(s, Decl(classdecl.ts, 67, 17)) + + public pgF(): void; +>pgF : Symbol(pgF, Decl(classdecl.ts, 67, 28)) + + public pv; +>pv : Symbol(pv, Decl(classdecl.ts, 68, 23)) + + public d : number; +>d : Symbol(d, Decl(classdecl.ts, 69, 14)) + + static p2 : { x: number; y: number; }; +>p2 : Symbol(aAmbient.p2, Decl(classdecl.ts, 70, 22)) +>x : Symbol(x, Decl(classdecl.ts, 71, 17)) +>y : Symbol(y, Decl(classdecl.ts, 71, 28)) + + static d2(); +>d2 : Symbol(aAmbient.d2, Decl(classdecl.ts, 71, 42)) + + static p3; +>p3 : Symbol(aAmbient.p3, Decl(classdecl.ts, 72, 16)) + + private pv3; +>pv3 : Symbol(pv3, Decl(classdecl.ts, 73, 14)) + + private foo(s); +>foo : Symbol(foo, Decl(classdecl.ts, 74, 16)) +>s : Symbol(s, Decl(classdecl.ts, 75, 16)) +} + +class d { +>d : Symbol(d, Decl(classdecl.ts, 76, 1)) + + private foo(n: number): string; +>foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35)) +>n : Symbol(n, Decl(classdecl.ts, 79, 16)) + + private foo(s: string): string; +>foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35)) +>s : Symbol(s, Decl(classdecl.ts, 80, 16)) + + private foo(ns: any) { +>foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35)) +>ns : Symbol(ns, Decl(classdecl.ts, 81, 16)) + + return ns.toString(); +>ns : Symbol(ns, Decl(classdecl.ts, 81, 16)) + } +} + +class e { +>e : Symbol(e, Decl(classdecl.ts, 84, 1)) + + private foo(s: string): string; +>foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35)) +>s : Symbol(s, Decl(classdecl.ts, 87, 16)) + + private foo(n: number): string; +>foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35)) +>n : Symbol(n, Decl(classdecl.ts, 88, 16)) + + private foo(ns: any) { +>foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35)) +>ns : Symbol(ns, Decl(classdecl.ts, 89, 16)) + + return ns.toString(); +>ns : Symbol(ns, Decl(classdecl.ts, 89, 16)) + } +} diff --git a/tests/baselines/reference/classdecl.types b/tests/baselines/reference/classdecl.types new file mode 100644 index 0000000000000..6339873656343 --- /dev/null +++ b/tests/baselines/reference/classdecl.types @@ -0,0 +1,212 @@ +=== tests/cases/compiler/classdecl.ts === +class a { +>a : a + + //constructor (); + constructor (n: number); +>n : number + + constructor (s: string); +>s : string + + constructor (ns: any) { +>ns : any + + } + + public pgF() { } +>pgF : () => void + + public pv; +>pv : any + + public get d() { +>d : number + + return 30; +>30 : number + } + public set d(a: number) { +>d : number +>a : number + } + + public static get p2() { +>p2 : { x: number; y: number; } + + return { x: 30, y: 40 }; +>{ x: 30, y: 40 } : { x: number; y: number; } +>x : number +>30 : number +>y : number +>40 : number + } + + private static d2() { +>d2 : () => void + } + private static get p3() { +>p3 : string + + return "string"; +>"string" : string + } + private pv3; +>pv3 : any + + private foo(n: number): string; +>foo : { (n: number): string; (s: string): string; } +>n : number + + private foo(s: string): string; +>foo : { (n: number): string; (s: string): string; } +>s : string + + private foo(ns: any) { +>foo : { (n: number): string; (s: string): string; } +>ns : any + + return ns.toString(); +>ns.toString() : any +>ns.toString : any +>ns : any +>toString : any + } +} + +class b extends a { +>b : b +>a : a +} + +module m1 { +>m1 : typeof m1 + + export class b { +>b : b + } + class d { +>d : d + } + + + export interface ib { +>ib : ib + } +} + +module m2 { +>m2 : typeof m2 + + export module m3 { +>m3 : typeof m3 + + export class c extends b { +>c : c +>b : b + } + export class ib2 implements m1.ib { +>ib2 : ib2 +>m1.ib : any +>m1 : typeof m1 +>ib : m1.ib + } + } +} + +class c extends m1.b { +>c : c +>m1.b : m1.b +>m1 : typeof m1 +>b : typeof m1.b +} + +class ib2 implements m1.ib { +>ib2 : ib2 +>m1.ib : any +>m1 : typeof m1 +>ib : m1.ib +} + +declare class aAmbient { +>aAmbient : aAmbient + + constructor (n: number); +>n : number + + constructor (s: string); +>s : string + + public pgF(): void; +>pgF : () => void + + public pv; +>pv : any + + public d : number; +>d : number + + static p2 : { x: number; y: number; }; +>p2 : { x: number; y: number; } +>x : number +>y : number + + static d2(); +>d2 : () => any + + static p3; +>p3 : any + + private pv3; +>pv3 : any + + private foo(s); +>foo : (s: any) => any +>s : any +} + +class d { +>d : d + + private foo(n: number): string; +>foo : { (n: number): string; (s: string): string; } +>n : number + + private foo(s: string): string; +>foo : { (n: number): string; (s: string): string; } +>s : string + + private foo(ns: any) { +>foo : { (n: number): string; (s: string): string; } +>ns : any + + return ns.toString(); +>ns.toString() : any +>ns.toString : any +>ns : any +>toString : any + } +} + +class e { +>e : e + + private foo(s: string): string; +>foo : { (s: string): string; (n: number): string; } +>s : string + + private foo(n: number): string; +>foo : { (s: string): string; (n: number): string; } +>n : number + + private foo(ns: any) { +>foo : { (s: string): string; (n: number): string; } +>ns : any + + return ns.toString(); +>ns.toString() : any +>ns.toString : any +>ns : any +>toString : any + } +} diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js index c24eaf68a6f6d..1f339b36fafcb 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js @@ -4,8 +4,3 @@ interface I { } //// [computedPropertyNamesDeclarationEmit3_ES5.js] - - -//// [computedPropertyNamesDeclarationEmit3_ES5.d.ts] -interface I { -} diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js index dc54ff2cbb2b6..55e657c2325be 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js @@ -4,8 +4,3 @@ interface I { } //// [computedPropertyNamesDeclarationEmit3_ES6.js] - - -//// [computedPropertyNamesDeclarationEmit3_ES6.d.ts] -interface I { -} diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js index c57c0384afc3a..bca1ddbfdc7fa 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js @@ -5,8 +5,3 @@ var v: { //// [computedPropertyNamesDeclarationEmit4_ES5.js] var v; - - -//// [computedPropertyNamesDeclarationEmit4_ES5.d.ts] -declare var v: { -}; diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js index 903687d078073..c3b26b97c9b95 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js @@ -5,8 +5,3 @@ var v: { //// [computedPropertyNamesDeclarationEmit4_ES6.js] var v; - - -//// [computedPropertyNamesDeclarationEmit4_ES6.d.ts] -declare var v: { -}; diff --git a/tests/baselines/reference/constEnum2.js b/tests/baselines/reference/constEnum2.js index c0c640b87fda4..5c46778c7cea1 100644 --- a/tests/baselines/reference/constEnum2.js +++ b/tests/baselines/reference/constEnum2.js @@ -20,13 +20,3 @@ const enum D { // it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression. // Error : not a constant enum expression var CONST = 9000 % 2; - - -//// [constEnum2.d.ts] -declare const CONST: number; -declare const enum D { - d = 10, - e, - f, - g, -} diff --git a/tests/baselines/reference/constEnumPropertyAccess2.js b/tests/baselines/reference/constEnumPropertyAccess2.js index 46a1d918b94b3..f2d63ba1389d4 100644 --- a/tests/baselines/reference/constEnumPropertyAccess2.js +++ b/tests/baselines/reference/constEnumPropertyAccess2.js @@ -31,16 +31,3 @@ var g; g = "string"; function foo(x) { } 2 /* B */ = 3; - - -//// [constEnumPropertyAccess2.d.ts] -declare const enum G { - A = 1, - B = 2, - C = 3, - D = 2, -} -declare var z: typeof G; -declare var z1: any; -declare var g: G; -declare function foo(x: G): void; diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.errors.txt b/tests/baselines/reference/declFileObjectLiteralWithAccessors.errors.txt deleted file mode 100644 index 4c0093a543821..0000000000000 --- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.errors.txt +++ /dev/null @@ -1,20 +0,0 @@ -tests/cases/compiler/declFileObjectLiteralWithAccessors.ts(5,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/declFileObjectLiteralWithAccessors.ts(6,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/declFileObjectLiteralWithAccessors.ts (2 errors) ==== - - function /*1*/makePoint(x: number) { - return { - b: 10, - get x() { return x; }, - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - set x(a: number) { this.b = a; } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - }; - }; - var /*4*/point = makePoint(2); - var /*2*/x = point.x; - point./*3*/x = 30; \ No newline at end of file diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols b/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols new file mode 100644 index 0000000000000..862b0b3781eff --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols @@ -0,0 +1,36 @@ +=== tests/cases/compiler/declFileObjectLiteralWithAccessors.ts === + +function /*1*/makePoint(x: number) { +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithAccessors.ts, 0, 0)) +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 1, 24)) + + return { + b: 10, +>b : Symbol(b, Decl(declFileObjectLiteralWithAccessors.ts, 2, 12)) + + get x() { return x; }, +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 1, 24)) + + set x(a: number) { this.b = a; } +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) +>a : Symbol(a, Decl(declFileObjectLiteralWithAccessors.ts, 5, 14)) +>a : Symbol(a, Decl(declFileObjectLiteralWithAccessors.ts, 5, 14)) + + }; +}; +var /*4*/point = makePoint(2); +>point : Symbol(point, Decl(declFileObjectLiteralWithAccessors.ts, 8, 3)) +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithAccessors.ts, 0, 0)) + +var /*2*/x = point.x; +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 9, 3)) +>point.x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) +>point : Symbol(point, Decl(declFileObjectLiteralWithAccessors.ts, 8, 3)) +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) + +point./*3*/x = 30; +>point./*3*/x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) +>point : Symbol(point, Decl(declFileObjectLiteralWithAccessors.ts, 8, 3)) +>x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30)) + diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.types b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types new file mode 100644 index 0000000000000..f7bb57b0e1e7d --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types @@ -0,0 +1,47 @@ +=== tests/cases/compiler/declFileObjectLiteralWithAccessors.ts === + +function /*1*/makePoint(x: number) { +>makePoint : (x: number) => { b: number; x: number; } +>x : number + + return { +>{ b: 10, get x() { return x; }, set x(a: number) { this.b = a; } } : { b: number; x: number; } + + b: 10, +>b : number +>10 : number + + get x() { return x; }, +>x : number +>x : number + + set x(a: number) { this.b = a; } +>x : number +>a : number +>this.b = a : number +>this.b : any +>this : any +>b : any +>a : number + + }; +}; +var /*4*/point = makePoint(2); +>point : { b: number; x: number; } +>makePoint(2) : { b: number; x: number; } +>makePoint : (x: number) => { b: number; x: number; } +>2 : number + +var /*2*/x = point.x; +>x : number +>point.x : number +>point : { b: number; x: number; } +>x : number + +point./*3*/x = 30; +>point./*3*/x = 30 : number +>point./*3*/x : number +>point : { b: number; x: number; } +>x : number +>30 : number + diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.errors.txt b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.errors.txt deleted file mode 100644 index 961442c23d073..0000000000000 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts(4,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts (1 errors) ==== - - function /*1*/makePoint(x: number) { - return { - get x() { return x; }, - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - }; - }; - var /*4*/point = makePoint(2); - var /*2*/x = point./*3*/x; - \ No newline at end of file diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js index 8d79a576b06ea..396ee75422e71 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js @@ -12,7 +12,7 @@ var /*2*/x = point./*3*/x; //// [declFileObjectLiteralWithOnlyGetter.js] function makePoint(x) { return { - get x() { return x; } + get x() { return x; }, }; } ; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.symbols b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.symbols new file mode 100644 index 0000000000000..ef9cd96e5555c --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.symbols @@ -0,0 +1,23 @@ +=== tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts === + +function /*1*/makePoint(x: number) { +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithOnlyGetter.ts, 0, 0)) +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 1, 24)) + + return { + get x() { return x; }, +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 2, 12)) +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 1, 24)) + + }; +}; +var /*4*/point = makePoint(2); +>point : Symbol(point, Decl(declFileObjectLiteralWithOnlyGetter.ts, 6, 3)) +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithOnlyGetter.ts, 0, 0)) + +var /*2*/x = point./*3*/x; +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 7, 3)) +>point./*3*/x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 2, 12)) +>point : Symbol(point, Decl(declFileObjectLiteralWithOnlyGetter.ts, 6, 3)) +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlyGetter.ts, 2, 12)) + diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types new file mode 100644 index 0000000000000..c0fb7b763fcfb --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts === + +function /*1*/makePoint(x: number) { +>makePoint : (x: number) => { x: number; } +>x : number + + return { +>{ get x() { return x; }, } : { x: number; } + + get x() { return x; }, +>x : number +>x : number + + }; +}; +var /*4*/point = makePoint(2); +>point : { x: number; } +>makePoint(2) : { x: number; } +>makePoint : (x: number) => { x: number; } +>2 : number + +var /*2*/x = point./*3*/x; +>x : number +>point./*3*/x : number +>point : { x: number; } +>x : number + diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.errors.txt b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.errors.txt deleted file mode 100644 index 7680a8d14dccd..0000000000000 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts(5,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts (1 errors) ==== - - function /*1*/makePoint(x: number) { - return { - b: 10, - set x(a: number) { this.b = a; } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - }; - }; - var /*3*/point = makePoint(2); - point./*2*/x = 30; \ No newline at end of file diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols new file mode 100644 index 0000000000000..f747446614018 --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols @@ -0,0 +1,26 @@ +=== tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts === + +function /*1*/makePoint(x: number) { +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithOnlySetter.ts, 0, 0)) +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlySetter.ts, 1, 24)) + + return { + b: 10, +>b : Symbol(b, Decl(declFileObjectLiteralWithOnlySetter.ts, 2, 12)) + + set x(a: number) { this.b = a; } +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlySetter.ts, 3, 14)) +>a : Symbol(a, Decl(declFileObjectLiteralWithOnlySetter.ts, 4, 14)) +>a : Symbol(a, Decl(declFileObjectLiteralWithOnlySetter.ts, 4, 14)) + + }; +}; +var /*3*/point = makePoint(2); +>point : Symbol(point, Decl(declFileObjectLiteralWithOnlySetter.ts, 7, 3)) +>makePoint : Symbol(makePoint, Decl(declFileObjectLiteralWithOnlySetter.ts, 0, 0)) + +point./*2*/x = 30; +>point./*2*/x : Symbol(x, Decl(declFileObjectLiteralWithOnlySetter.ts, 3, 14)) +>point : Symbol(point, Decl(declFileObjectLiteralWithOnlySetter.ts, 7, 3)) +>x : Symbol(x, Decl(declFileObjectLiteralWithOnlySetter.ts, 3, 14)) + diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types new file mode 100644 index 0000000000000..2b9b98a896398 --- /dev/null +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types @@ -0,0 +1,37 @@ +=== tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts === + +function /*1*/makePoint(x: number) { +>makePoint : (x: number) => { b: number; x: number; } +>x : number + + return { +>{ b: 10, set x(a: number) { this.b = a; } } : { b: number; x: number; } + + b: 10, +>b : number +>10 : number + + set x(a: number) { this.b = a; } +>x : number +>a : number +>this.b = a : number +>this.b : any +>this : any +>b : any +>a : number + + }; +}; +var /*3*/point = makePoint(2); +>point : { b: number; x: number; } +>makePoint(2) : { b: number; x: number; } +>makePoint : (x: number) => { b: number; x: number; } +>2 : number + +point./*2*/x = 30; +>point./*2*/x = 30 : number +>point./*2*/x : number +>point : { b: number; x: number; } +>x : number +>30 : number + diff --git a/tests/baselines/reference/declFilePrivateStatic.errors.txt b/tests/baselines/reference/declFilePrivateStatic.errors.txt deleted file mode 100644 index 4e1da34b979a9..0000000000000 --- a/tests/baselines/reference/declFilePrivateStatic.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -tests/cases/compiler/declFilePrivateStatic.ts(9,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/declFilePrivateStatic.ts(10,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/declFilePrivateStatic.ts(12,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/declFilePrivateStatic.ts(13,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/declFilePrivateStatic.ts (4 errors) ==== - - class C { - private static x = 1; - static y = 1; - - private static a() { } - static b() { } - - private static get c() { return 1; } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - static get d() { return 1; } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - private static set e(v) { } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - static set f(v) { } - ~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - } \ No newline at end of file diff --git a/tests/baselines/reference/declFilePrivateStatic.symbols b/tests/baselines/reference/declFilePrivateStatic.symbols new file mode 100644 index 0000000000000..d3d0753123c6d --- /dev/null +++ b/tests/baselines/reference/declFilePrivateStatic.symbols @@ -0,0 +1,31 @@ +=== tests/cases/compiler/declFilePrivateStatic.ts === + +class C { +>C : Symbol(C, Decl(declFilePrivateStatic.ts, 0, 0)) + + private static x = 1; +>x : Symbol(C.x, Decl(declFilePrivateStatic.ts, 1, 9)) + + static y = 1; +>y : Symbol(C.y, Decl(declFilePrivateStatic.ts, 2, 25)) + + private static a() { } +>a : Symbol(C.a, Decl(declFilePrivateStatic.ts, 3, 17)) + + static b() { } +>b : Symbol(C.b, Decl(declFilePrivateStatic.ts, 5, 26)) + + private static get c() { return 1; } +>c : Symbol(C.c, Decl(declFilePrivateStatic.ts, 6, 18)) + + static get d() { return 1; } +>d : Symbol(C.d, Decl(declFilePrivateStatic.ts, 8, 40)) + + private static set e(v) { } +>e : Symbol(C.e, Decl(declFilePrivateStatic.ts, 9, 32)) +>v : Symbol(v, Decl(declFilePrivateStatic.ts, 11, 25)) + + static set f(v) { } +>f : Symbol(C.f, Decl(declFilePrivateStatic.ts, 11, 31)) +>v : Symbol(v, Decl(declFilePrivateStatic.ts, 12, 17)) +} diff --git a/tests/baselines/reference/declFilePrivateStatic.types b/tests/baselines/reference/declFilePrivateStatic.types new file mode 100644 index 0000000000000..35aaa3acdeb44 --- /dev/null +++ b/tests/baselines/reference/declFilePrivateStatic.types @@ -0,0 +1,35 @@ +=== tests/cases/compiler/declFilePrivateStatic.ts === + +class C { +>C : C + + private static x = 1; +>x : number +>1 : number + + static y = 1; +>y : number +>1 : number + + private static a() { } +>a : () => void + + static b() { } +>b : () => void + + private static get c() { return 1; } +>c : number +>1 : number + + static get d() { return 1; } +>d : number +>1 : number + + private static set e(v) { } +>e : any +>v : any + + static set f(v) { } +>f : any +>v : any +} diff --git a/tests/baselines/reference/declarationEmitDestructuring2.js b/tests/baselines/reference/declarationEmitDestructuring2.js index 09980c5c9dd11..31329ded30499 100644 --- a/tests/baselines/reference/declarationEmitDestructuring2.js +++ b/tests/baselines/reference/declarationEmitDestructuring2.js @@ -17,27 +17,3 @@ function h(_a) { function h1(_a) { var a = _a[0], b = _a[1][0], c = _a[2][0][0], _b = _a[3], _c = _b.x, x = _c === void 0 ? 10 : _c, _d = _b.y, y = _d === void 0 ? [1, 2, 3] : _d, _e = _b.z, a1 = _e.a1, b1 = _e.b1; } - - -//// [declarationEmitDestructuring2.d.ts] -declare function f({x, y: [a, b, c, d]}?: { - x?: number; - y?: [number, number, number, number]; -}): void; -declare function g([a, b, c, d]?: [number, number, number, number]): void; -declare function h([a, [b], [[c]], {x, y: [a, b, c], z: {a1, b1}}]: [any, [any], [[any]], { - x?: number; - y: [any, any, any]; - z: { - a1: any; - b1: any; - }; -}]): void; -declare function h1([a, [b], [[c]], {x, y, z: {a1, b1}}]: [any, [any], [[any]], { - x?: number; - y?: number[]; - z: { - a1: any; - b1: any; - }; -}]): void; diff --git a/tests/baselines/reference/declarationEmitDestructuring4.js b/tests/baselines/reference/declarationEmitDestructuring4.js index 16e6b49a4cf0a..58cf0e0b2f9f6 100644 --- a/tests/baselines/reference/declarationEmitDestructuring4.js +++ b/tests/baselines/reference/declarationEmitDestructuring4.js @@ -26,13 +26,3 @@ function baz3(_a) { } function baz4(_a) { var _a = { x: 10 }; } - - -//// [declarationEmitDestructuring4.d.ts] -declare function baz([]: any[]): void; -declare function baz1([]?: number[]): void; -declare function baz2([[]]?: [number[]]): void; -declare function baz3({}: {}): void; -declare function baz4({}?: { - x: number; -}): void; diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js index 662b4625ec807..cac419605babb 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js @@ -17,15 +17,3 @@ var _f = [], a11 = _f[0], b11 = _f[1], c11 = _f[2]; var _g = [1, ["hello", { x12: 5, y12: true }]], a2 = _g[0], _h = _g[1], _j = _h === void 0 ? ["abc", { x12: 10, y12: false }] : _h, b2 = _j[0], _k = _j[1], x12 = _k.x12, c2 = _k.y12; var _l = [1, "hello"], x13 = _l[0], y13 = _l[1]; var _m = [[x13, y13], { x: x13, y: y13 }], a3 = _m[0], b3 = _m[1]; - - -//// [declarationEmitDestructuringArrayPattern2.d.ts] -declare var x10: number, y10: string, z10: boolean; -declare var x11: number, y11: string; -declare var a11: any, b11: any, c11: any; -declare var a2: number, b2: string, x12: number, c2: boolean; -declare var x13: number, y13: string; -declare var a3: (number | string)[], b3: { - x: number; - y: string; -}; diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js index 38b0a14af5c97..d102ad301737f 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js @@ -43,22 +43,3 @@ var m; _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4; var _a; })(m || (m = {})); - - -//// [declarationEmitDestructuringObjectLiteralPattern.d.ts] -declare var x4: number; -declare var y5: string; -declare var x6: number, y6: string; -declare var a1: number; -declare var b1: string; -declare var a2: number, b2: string; -declare var x11: number, y11: string, z11: boolean; -declare function f15(): { - a4: string; - b4: number; - c4: boolean; -}; -declare var a4: string, b4: number, c4: boolean; -declare module m { - var a4: string, b4: number, c4: boolean; -} diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js index 264e56fe58c5c..2c7cf979c9c6b 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js @@ -16,12 +16,3 @@ var _b = { x6: 5, y6: "hello" }, x6 = _b.x6, y6 = _b.y6; var a1 = { x7: 5, y7: "hello" }.x7; var b1 = { x8: 5, y8: "hello" }.y8; var _c = { x9: 5, y9: "hello" }, a2 = _c.x9, b2 = _c.y9; - - -//// [declarationEmitDestructuringObjectLiteralPattern1.d.ts] -declare var x4: number; -declare var y5: string; -declare var x6: number, y6: string; -declare var a1: number; -declare var b1: string; -declare var a2: number, b2: string; diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js index a98620c852902..9fc1943eae66d 100644 --- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js +++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js @@ -38,24 +38,3 @@ var C3 = (function () { } return C3; })(); - - -//// [declarationEmitDestructuringParameterProperties.d.ts] -declare class C1 { - x: string, y: string, z: string; - constructor([x, y, z]: string[]); -} -declare type TupleType1 = [string, number, boolean]; -declare class C2 { - x: string, y: number, z: boolean; - constructor([x, y, z]: TupleType1); -} -declare type ObjType1 = { - x: number; - y: string; - z: boolean; -}; -declare class C3 { - x: number, y: string, z: boolean; - constructor({x, y, z}: ObjType1); -} diff --git a/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js b/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js index 5c7f4d2cec593..ab42602a035a4 100644 --- a/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js +++ b/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js @@ -11,12 +11,3 @@ function foo(_a) { function foo1(_a) { var x = _a.x, y = _a.y, z = _a.z; } - - -//// [declarationEmitDestructuringWithOptionalBindingParameters.d.ts] -declare function foo([x, y, z]?: [string, number, boolean]): void; -declare function foo1({x, y, z}?: { - x: string; - y: number; - z: boolean; -}): void; diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.js b/tests/baselines/reference/declarationEmit_invalidReference2.js index 78fb232cca78e..0f8d5d4c07d7d 100644 --- a/tests/baselines/reference/declarationEmit_invalidReference2.js +++ b/tests/baselines/reference/declarationEmit_invalidReference2.js @@ -5,7 +5,3 @@ var x = 0; //// [declarationEmit_invalidReference2.js] /// var x = 0; - - -//// [declarationEmit_invalidReference2.d.ts] -declare var x: number; diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index a2509ea97f462..bdb7a1148f09c 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -75,36 +75,3 @@ var v = 3; var Foo; (function (Foo) { })(Foo || (Foo = {})); - - -//// [file1.d.ts] -interface I { -} -declare class C1 { -} -declare class C2 { -} -declare function f(): void; -declare var v: number; -declare class Foo { - static x: number; -} -declare module N { - module F { - } -} -//// [file2.d.ts] -declare class I { -} -interface C1 { -} -declare function C2(): void; -declare class f { -} -declare var v: number; -declare module Foo { - var x: number; -} -declare module N { - function F(): any; -} diff --git a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js index 8c128bb806eda..d9b0e6bc40225 100644 --- a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js +++ b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js @@ -9,11 +9,3 @@ function f(_a) { var _a = { a: 1, b: "2", c: true }; var x, y, z; } - - -//// [emptyObjectBindingPatternParameter04.d.ts] -declare function f({}?: { - a: number; - b: string; - c: boolean; -}): void; diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js index 7710b5e26c1c9..9b26893b42498 100644 --- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js +++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js @@ -19,6 +19,3 @@ var _e = void 0; var _f = void 0; })(); - - -//// [emptyVariableDeclarationBindingPatterns02_ES5.d.ts] diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js index 8b2df68ed709d..9fbdd26991296 100644 --- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js +++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js @@ -19,6 +19,3 @@ let []; const []; })(); - - -//// [emptyVariableDeclarationBindingPatterns02_ES6.d.ts] diff --git a/tests/baselines/reference/es5ExportEquals.js b/tests/baselines/reference/es5ExportEquals.js index 88d1da4201d34..d392979240908 100644 --- a/tests/baselines/reference/es5ExportEquals.js +++ b/tests/baselines/reference/es5ExportEquals.js @@ -9,8 +9,3 @@ export = f; function f() { } exports.f = f; module.exports = f; - - -//// [es5ExportEquals.d.ts] -export declare function f(): void; -export = f; diff --git a/tests/baselines/reference/es6ExportEquals.js b/tests/baselines/reference/es6ExportEquals.js index e4cf13758ffd2..ba838296f9d75 100644 --- a/tests/baselines/reference/es6ExportEquals.js +++ b/tests/baselines/reference/es6ExportEquals.js @@ -7,8 +7,3 @@ export = f; //// [es6ExportEquals.js] export function f() { } - - -//// [es6ExportEquals.d.ts] -export declare function f(): void; -export = f; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js index 755af6f4fdb85..a733eba1045b8 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js @@ -41,4 +41,3 @@ var x1 = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1_0.d.ts] declare var a: number; export default a; -//// [es6ImportDefaultBindingFollowedWithNamedImport1_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 7eda76622defc..53f701cb0c13a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -42,4 +42,3 @@ var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts] declare var a: number; export default a; -//// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index b83571066f051..c724eade06c66 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -42,10 +42,3 @@ exports.x1 = server_6.default; //// [server.d.ts] declare var a: number; export default a; -//// [client.d.ts] -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 9314190e786e2..1dc0013ecbe60 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -88,15 +88,3 @@ export declare class a12 { } export declare class x11 { } -//// [client.d.ts] -import { a } from "./server"; -export declare var x1: a; -import { a11 as b } from "./server"; -export declare var x2: b; -import { x, a12 as y } from "./server"; -export declare var x4: x; -export declare var x5: y; -import { x11 as z } from "./server"; -export declare var x3: z; -import { m } from "./server"; -export declare var x6: m; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index 71d35fd85a176..3451176bdb2cf 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -46,11 +46,3 @@ exports.x6 = new server_6.default(); declare class a { } export default a; -//// [client.d.ts] -import defaultBinding1 from "./server"; -export declare var x1: defaultBinding1; -export declare var x2: defaultBinding1; -export declare var x3: defaultBinding1; -export declare var x4: defaultBinding1; -export declare var x5: defaultBinding1; -export declare var x6: defaultBinding1; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index 9674f8c12f432..d4b1b45d5a7b9 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -43,4 +43,3 @@ var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m; export declare var a: number; export declare var x: number; export declare var m: number; -//// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index b7da05d7dbbb9..2d8be87a3d1e0 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -47,10 +47,3 @@ export declare var x: number; export declare var m: number; declare var _default: {}; export default _default; -//// [client.d.ts] -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; -export declare var x1: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js index 2b24fda075559..f6607da3397b1 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js @@ -17,4 +17,3 @@ var x = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.d.ts] export declare var a: number; -//// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index a032325fbb446..caeaa76ab4a9a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -25,5 +25,3 @@ define(["require", "exports", "server"], function (require, exports, server_1) { //// [server.d.ts] declare var a: number; export default a; -//// [client.d.ts] -export declare var x: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 93918f6171a64..86514091f6c47 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -23,6 +23,3 @@ exports.x = new nameSpaceBinding.a(); //// [server.d.ts] export declare class a { } -//// [client.d.ts] -import * as nameSpaceBinding from "./server"; -export declare var x: nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 49717c588b707..35811288691e6 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -17,4 +17,3 @@ var x = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] export declare var a: number; -//// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index dec9b8cfebe0e..9a02028e43189 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -17,5 +17,3 @@ exports.x = nameSpaceBinding.a; //// [server.d.ts] export declare var a: number; -//// [client.d.ts] -export declare var x: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js index 34323b2752bc3..4420397ac61f6 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js @@ -17,4 +17,3 @@ module.exports = a; //// [es6ImportDefaultBindingInEs5_0.d.ts] declare var a: number; export = a; -//// [es6ImportDefaultBindingInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index 2fb7f0644b9ca..c3a7315929db0 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -25,5 +25,3 @@ define(["require", "exports", "server"], function (require, exports, server_1) { //// [server.d.ts] declare var a: number; export default a; -//// [client.d.ts] -export declare var x: number; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index 84f6936d4b0f1..9da18ee7d0c4e 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -22,5 +22,3 @@ define(["require", "exports", "server"], function (require, exports, nameSpaceBi //// [server.d.ts] export declare var a: number; -//// [client.d.ts] -export declare var x: number; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 5175554f0f916..d51e677381a66 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -82,16 +82,3 @@ export declare var x1: number; export declare var z1: number; export declare var z2: number; export declare var aaaa: number; -//// [client.d.ts] -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var xxxx: number; -export declare var z111: number; -export declare var z2: number; diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 208f71bcbfe9f..0089dd2b3dfde 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -15,5 +15,3 @@ require("server"); //// [server.d.ts] export declare var a: number; -//// [client.d.ts] -export import "server"; diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 4a1ee9b739f2b..bcfb7d8347d52 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -56,20 +56,3 @@ var Bbb; __export(require()); // this line causes the nullref })(Bbb || (Bbb = {})); var a; - - -//// [exportDeclarationInInternalModule.d.ts] -declare class Bbb { -} -declare class Aaa extends Bbb { -} -declare module Aaa { - class SomeType { - } -} -declare module Bbb { - class SomeType { - } - export * from Aaa; -} -declare var a: Bbb.SomeType; diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index d433e7b3682c8..e6db992f8f84b 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -56,10 +56,3 @@ export declare class A { static r: any; } //// [exportStarFromEmptyModule_module2.d.ts] -//// [exportStarFromEmptyModule_module3.d.ts] -export * from "./exportStarFromEmptyModule_module2"; -export * from "./exportStarFromEmptyModule_module1"; -export declare class A { - static q: any; -} -//// [exportStarFromEmptyModule_module4.d.ts] diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline index c796f8e78bc85..fcf6437e79e7c 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline +++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline @@ -17,10 +17,11 @@ declare class Bar { EmitSkipped: false FileName : tests/cases/fourslash/inputFile2.js.map -{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,KAAC,IAAI,GAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js +{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,KAAC,IAAI,GAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js var y = "my div"; var x = React.createElement("div", {"name": y}); //# sourceMappingURL=inputFile2.js.mapFileName : tests/cases/fourslash/inputFile2.d.ts +declare var React: any; declare var y: string; declare var x: any; diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline index 396e220bdb653..b62498221317c 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline @@ -1,6 +1,4 @@ EmitSkipped: false FileName : tests/cases/fourslash/inputFile.js var x = "hello world"; -FileName : tests/cases/fourslash/inputFile.d.ts -declare var x: number; diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline index 6a58015c1b3bc..38a695301d21b 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline @@ -5,7 +5,4 @@ FileName : out.js var noErrors = true; // File not emitted, and contains semantic errors var semanticError = "string"; -FileName : out.d.ts -declare var noErrors: boolean; -declare var semanticError: boolean; diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 46bdaf827d5c5..096f1ecd60098 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1107,307 +1107,3 @@ define(["require", "exports"], function (require, exports) { })(eM = exports.eM || (exports.eM = {})); ; }); - - -//// [giant.d.ts] -export declare var eV: any; -export declare function eF(): void; -export declare class eC { - constructor(); - pV: any; - private rV; - pF(): void; - private rF(); - pgF(): void; - pgF: any; - psF(param: any): void; - psF: any; - private rgF(); - private rgF; - private rsF(param); - private rsF; - static tV: any; - static tF(): void; - static tsF(param: any): void; - static tsF: any; - static tgF(): void; - static tgF: any; -} -export interface eI { - (): any; - (): number; - (p: any): any; - (p1: string): any; - (p2?: string): any; - (...p3: any[]): any; - (p4: string, p5?: string): any; - (p6: string, ...p7: any[]): any; - new (): any; - new (): number; - new (p: string): any; - new (p2?: string): any; - new (...p3: any[]): any; - new (p4: string, p5?: string): any; - new (p6: string, ...p7: any[]): any; - [p1: string]: any; - [p2: string, p3: number]: any; - p: any; - p1?: any; - p2?: string; - p3(): any; - p4?(): any; - p5?(): void; - p6(pa1: any): void; - p7(pa1: any, pa2: any): void; - p7?(pa1: any, pa2: any): void; -} -export declare module eM { - var eV: any; - function eF(): void; - class eC { - constructor(); - pV: any; - private rV; - pF(): void; - private rF(); - pgF(): void; - pgF: any; - psF(param: any): void; - psF: any; - private rgF(); - private rgF; - private rsF(param); - private rsF; - static tV: any; - static tF(): void; - static tsF(param: any): void; - static tsF: any; - static tgF(): void; - static tgF: any; - } - interface eI { - (): any; - (): number; - (p: any): any; - (p1: string): any; - (p2?: string): any; - (...p3: any[]): any; - (p4: string, p5?: string): any; - (p6: string, ...p7: any[]): any; - new (): any; - new (): number; - new (p: string): any; - new (p2?: string): any; - new (...p3: any[]): any; - new (p4: string, p5?: string): any; - new (p6: string, ...p7: any[]): any; - [p1: string]: any; - [p2: string, p3: number]: any; - p: any; - p1?: any; - p2?: string; - p3(): any; - p4?(): any; - p5?(): void; - p6(pa1: any): void; - p7(pa1: any, pa2: any): void; - p7?(pa1: any, pa2: any): void; - } - module eM { - var eV: any; - function eF(): void; - class eC { - } - interface eI { - } - module eM { - } - var eaV: any; - function eaF(): void; - class eaC { - } - module eaM { - } - } - var eaV: any; - function eaF(): void; - class eaC { - constructor(); - pV: any; - private rV; - pF(): void; - private rF(); - pgF(): void; - pgF: any; - psF(param: any): void; - psF: any; - private rgF(); - private rgF; - private rsF(param); - private rsF; - static tV: any; - static tF(): void; - static tsF(param: any): void; - static tsF: any; - static tgF(): void; - static tgF: any; - } - module eaM { - var V: any; - function F(): void; - class C { - } - interface I { - } - module M { - } - var eV: any; - function eF(): void; - class eC { - } - interface eI { - } - module eM { - } - } -} -export declare var eaV: any; -export declare function eaF(): void; -export declare class eaC { - constructor(); - pV: any; - private rV; - pF(): void; - private rF(); - pgF(): void; - pgF: any; - psF(param: any): void; - psF: any; - private rgF(); - private rgF; - private rsF(param); - private rsF; - static tV: any; - static tF(): void; - static tsF(param: any): void; - static tsF: any; - static tgF(): void; - static tgF: any; -} -export declare module eaM { - var V: any; - function F(): void; - class C { - constructor(); - pV: any; - private rV; - pF(): void; - static tV: any; - static tF(): void; - } - interface I { - (): any; - (): number; - (p: string): any; - (p2?: string): any; - (...p3: any[]): any; - (p4: string, p5?: string): any; - (p6: string, ...p7: any[]): any; - new (): any; - new (): number; - new (p: string): any; - new (p2?: string): any; - new (...p3: any[]): any; - new (p4: string, p5?: string): any; - new (p6: string, ...p7: any[]): any; - [p1: string]: any; - [p2: string, p3: number]: any; - p: any; - p1?: any; - p2?: string; - p3(): any; - p4?(): any; - p5?(): void; - p6(pa1: any): void; - p7(pa1: any, pa2: any): void; - p7?(pa1: any, pa2: any): void; - } - module M { - var V: any; - function F(): void; - class C { - } - interface I { - } - module M { - } - var eV: any; - function eF(): void; - class eC { - } - interface eI { - } - module eM { - } - var eaV: any; - function eaF(): void; - class eaC { - } - module eaM { - } - } - var eV: any; - function eF(): void; - class eC { - constructor(); - pV: any; - private rV; - pF(): void; - static tV: any; - static tF(): void; - } - interface eI { - (): any; - (): number; - (p: any): any; - (p1: string): any; - (p2?: string): any; - (...p3: any[]): any; - (p4: string, p5?: string): any; - (p6: string, ...p7: any[]): any; - new (): any; - new (): number; - new (p: string): any; - new (p2?: string): any; - new (...p3: any[]): any; - new (p4: string, p5?: string): any; - new (p6: string, ...p7: any[]): any; - [p1: string]: any; - [p2: string, p3: number]: any; - p: any; - p1?: any; - p2?: string; - p3(): any; - p4?(): any; - p5?(): void; - p6(pa1: any): void; - p7(pa1: any, pa2: any): void; - p7?(pa1: any, pa2: any): void; - } - module eM { - var V: any; - function F(): void; - class C { - } - module M { - } - var eV: any; - function eF(): void; - class eC { - } - interface eI { - } - module eM { - } - } -} diff --git a/tests/baselines/reference/isolatedModulesDeclaration.js b/tests/baselines/reference/isolatedModulesDeclaration.js index bb3e560a2f83e..4a24f0e201f24 100644 --- a/tests/baselines/reference/isolatedModulesDeclaration.js +++ b/tests/baselines/reference/isolatedModulesDeclaration.js @@ -4,7 +4,3 @@ export var x; //// [file1.js] export var x; - - -//// [file1.d.ts] -export declare var x: any; diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js index 9b64450936186..2392b461ebfb2 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js @@ -18,6 +18,3 @@ function foo() { function foo() { return 30; } - - -//// [out.d.ts] diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js index d7965e91be1d3..807cdbf0925e9 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js @@ -19,6 +19,3 @@ function foo() { function foo() { return 10; } - - -//// [out.d.ts] diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js index 7b2643c13d3eb..aab4ba6af81a2 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js @@ -9,8 +9,3 @@ var x = 10; // Error reported so no declaration file generated? //// [out.js] var x = "hello"; var x = 10; // Error reported so no declaration file generated? - - -//// [out.d.ts] -declare var x: string; -declare var x: string; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js index 07d6fb812c066..fc8c7b441658b 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -25,13 +25,3 @@ var c = (function () { // error on above reference path when emitting declarations function foo() { } - - -//// [a.d.ts] -declare class c { -} -//// [c.d.ts] -declare function bar(): void; -//// [b.d.ts] -/// -declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js index 641a89c1c5049..87fccf56d5031 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js @@ -13,8 +13,3 @@ var b = 30; a = 10; var a = 10; b = 30; - - -//// [out.d.ts] -declare let b: number; -declare let a: number; diff --git a/tests/baselines/reference/letAsIdentifier.js b/tests/baselines/reference/letAsIdentifier.js index 05811ce108890..9e0bce41c8383 100644 --- a/tests/baselines/reference/letAsIdentifier.js +++ b/tests/baselines/reference/letAsIdentifier.js @@ -11,9 +11,3 @@ var let = 10; var a = 10; let = 30; var a; - - -//// [letAsIdentifier.d.ts] -declare var let: number; -declare var a: number; -declare let a: any; diff --git a/tests/baselines/reference/moduledecl.errors.txt b/tests/baselines/reference/moduledecl.errors.txt deleted file mode 100644 index 2ef60f058c2ac..0000000000000 --- a/tests/baselines/reference/moduledecl.errors.txt +++ /dev/null @@ -1,241 +0,0 @@ -tests/cases/compiler/moduledecl.ts(164,21): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/moduledecl.ts(172,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - - -==== tests/cases/compiler/moduledecl.ts (2 errors) ==== - module a { - } - - module b.a { - } - - module c.a.b { - import ma = a; - } - - module mImport { - import d = a; - import e = b.a; - import d1 = a; - import e1 = b.a; - } - - module m0 { - function f1() { - } - - function f2(s: string); - function f2(n: number); - function f2(ns: any) { - } - - class c1 { - public a : ()=>string; - private b: ()=>number; - private static s1; - public static s2; - } - - interface i1 { - () : Object; - [n: number]: c1; - } - - import m2 = a; - import m3 = b; - import m4 = b.a; - import m5 = c; - import m6 = c.a; - import m7 = c.a.b; - } - - module m1 { - export function f1() { - } - - export function f2(s: string); - export function f2(n: number); - export function f2(ns: any) { - } - - export class c1 { - public a: () =>string; - private b: () =>number; - private static s1; - public static s2; - - public d() { - return "Hello"; - } - - public e: { x: number; y: string; }; - constructor (public n, public n2: number, private n3, private n4: string) { - } - } - - export interface i1 { - () : Object; - [n: number]: c1; - } - - import m2 = a; - import m3 = b; - import m4 = b.a; - import m5 = c; - import m6 = c.a; - import m7 = c.a.b; - } - - module m { - export module m2 { - var a = 10; - export var b: number; - } - - export module m3 { - export var c: number; - } - } - - module m { - - export module m25 { - export module m5 { - export var c: number; - } - } - } - - module m13 { - export module m4 { - export module m2 { - export module m3 { - export var c: number; - } - } - - export function f() { - return 20; - } - } - } - - declare module m4 { - export var b; - } - - declare module m5 { - export var c; - } - - declare module m43 { - export var b; - } - - declare module m55 { - export var c; - } - - declare module "m3" { - export var b: number; - } - - module exportTests { - export class C1_public { - private f2() { - return 30; - } - - public f3() { - return "string"; - } - } - class C2_private { - private f2() { - return 30; - } - - public f3() { - return "string"; - } - } - - export class C3_public { - private getC2_private() { - return new C2_private(); - } - private setC2_private(arg: C2_private) { - } - private get c2() { - ~~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - public getC1_public() { - return new C1_public(); - } - public setC1_public(arg: C1_public) { - } - public get c1() { - ~~ -!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - } - } - - declare module mAmbient { - class C { - public myProp: number; - } - - function foo() : C; - var aVar: C; - interface B { - x: number; - y: C; - } - enum e { - x, - y, - z - } - - module m3 { - class C { - public myProp: number; - } - - function foo(): C; - var aVar: C; - interface B { - x: number; - y: C; - } - enum e { - x, - y, - z - } - } - } - - function foo() { - return mAmbient.foo(); - } - - var cVar = new mAmbient.C(); - var aVar = mAmbient.aVar; - var bB: mAmbient.B; - var eVar: mAmbient.e; - - function m3foo() { - return mAmbient.m3.foo(); - } - - var m3cVar = new mAmbient.m3.C(); - var m3aVar = mAmbient.m3.aVar; - var m3bB: mAmbient.m3.B; - var m3eVar: mAmbient.m3.e; - - \ No newline at end of file diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index ef3b9a2965c3f..f835729dc4db2 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -1,4 +1,5 @@ //// [moduledecl.ts] + module a { } diff --git a/tests/baselines/reference/moduledecl.symbols b/tests/baselines/reference/moduledecl.symbols new file mode 100644 index 0000000000000..178c406f8cdb3 --- /dev/null +++ b/tests/baselines/reference/moduledecl.symbols @@ -0,0 +1,536 @@ +=== tests/cases/compiler/moduledecl.ts === + +module a { +>a : Symbol(a, Decl(moduledecl.ts, 0, 0)) +} + +module b.a { +>b : Symbol(b, Decl(moduledecl.ts, 2, 1)) +>a : Symbol(a, Decl(moduledecl.ts, 4, 9)) +} + +module c.a.b { +>c : Symbol(c, Decl(moduledecl.ts, 5, 1)) +>a : Symbol(a, Decl(moduledecl.ts, 7, 9)) +>b : Symbol(ma.b, Decl(moduledecl.ts, 7, 11)) + + import ma = a; +>ma : Symbol(ma, Decl(moduledecl.ts, 7, 14)) +>a : Symbol(ma, Decl(moduledecl.ts, 7, 9)) +} + +module mImport { +>mImport : Symbol(mImport, Decl(moduledecl.ts, 9, 1)) + + import d = a; +>d : Symbol(d, Decl(moduledecl.ts, 11, 16)) +>a : Symbol(d, Decl(moduledecl.ts, 0, 0)) + + import e = b.a; +>e : Symbol(e, Decl(moduledecl.ts, 12, 17)) +>b : Symbol(b, Decl(moduledecl.ts, 2, 1)) +>a : Symbol(e, Decl(moduledecl.ts, 4, 9)) + + import d1 = a; +>d1 : Symbol(d1, Decl(moduledecl.ts, 13, 19)) +>a : Symbol(d, Decl(moduledecl.ts, 0, 0)) + + import e1 = b.a; +>e1 : Symbol(e1, Decl(moduledecl.ts, 14, 18)) +>b : Symbol(b, Decl(moduledecl.ts, 2, 1)) +>a : Symbol(e, Decl(moduledecl.ts, 4, 9)) +} + +module m0 { +>m0 : Symbol(m0, Decl(moduledecl.ts, 16, 1)) + + function f1() { +>f1 : Symbol(f1, Decl(moduledecl.ts, 18, 11)) + } + + function f2(s: string); +>f2 : Symbol(f2, Decl(moduledecl.ts, 20, 5), Decl(moduledecl.ts, 22, 27), Decl(moduledecl.ts, 23, 27)) +>s : Symbol(s, Decl(moduledecl.ts, 22, 16)) + + function f2(n: number); +>f2 : Symbol(f2, Decl(moduledecl.ts, 20, 5), Decl(moduledecl.ts, 22, 27), Decl(moduledecl.ts, 23, 27)) +>n : Symbol(n, Decl(moduledecl.ts, 23, 16)) + + function f2(ns: any) { +>f2 : Symbol(f2, Decl(moduledecl.ts, 20, 5), Decl(moduledecl.ts, 22, 27), Decl(moduledecl.ts, 23, 27)) +>ns : Symbol(ns, Decl(moduledecl.ts, 24, 16)) + } + + class c1 { +>c1 : Symbol(c1, Decl(moduledecl.ts, 25, 5)) + + public a : ()=>string; +>a : Symbol(a, Decl(moduledecl.ts, 27, 14)) + + private b: ()=>number; +>b : Symbol(b, Decl(moduledecl.ts, 28, 30)) + + private static s1; +>s1 : Symbol(c1.s1, Decl(moduledecl.ts, 29, 30)) + + public static s2; +>s2 : Symbol(c1.s2, Decl(moduledecl.ts, 30, 26)) + } + + interface i1 { +>i1 : Symbol(i1, Decl(moduledecl.ts, 32, 5)) + + () : Object; +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + [n: number]: c1; +>n : Symbol(n, Decl(moduledecl.ts, 36, 9)) +>c1 : Symbol(c1, Decl(moduledecl.ts, 25, 5)) + } + + import m2 = a; +>m2 : Symbol(m2, Decl(moduledecl.ts, 37, 5)) +>a : Symbol(m2, Decl(moduledecl.ts, 0, 0)) + + import m3 = b; +>m3 : Symbol(m3, Decl(moduledecl.ts, 39, 18)) +>b : Symbol(m3, Decl(moduledecl.ts, 2, 1)) + + import m4 = b.a; +>m4 : Symbol(m4, Decl(moduledecl.ts, 40, 18)) +>b : Symbol(m3, Decl(moduledecl.ts, 2, 1)) +>a : Symbol(m3.a, Decl(moduledecl.ts, 4, 9)) + + import m5 = c; +>m5 : Symbol(m5, Decl(moduledecl.ts, 41, 20)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) + + import m6 = c.a; +>m6 : Symbol(m6, Decl(moduledecl.ts, 42, 18)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 7, 9)) + + import m7 = c.a.b; +>m7 : Symbol(m7, Decl(moduledecl.ts, 43, 20)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 7, 9)) +>b : Symbol(m6.b, Decl(moduledecl.ts, 7, 11)) +} + +module m1 { +>m1 : Symbol(m1, Decl(moduledecl.ts, 45, 1)) + + export function f1() { +>f1 : Symbol(f1, Decl(moduledecl.ts, 47, 11)) + } + + export function f2(s: string); +>f2 : Symbol(f2, Decl(moduledecl.ts, 49, 5), Decl(moduledecl.ts, 51, 34), Decl(moduledecl.ts, 52, 34)) +>s : Symbol(s, Decl(moduledecl.ts, 51, 23)) + + export function f2(n: number); +>f2 : Symbol(f2, Decl(moduledecl.ts, 49, 5), Decl(moduledecl.ts, 51, 34), Decl(moduledecl.ts, 52, 34)) +>n : Symbol(n, Decl(moduledecl.ts, 52, 23)) + + export function f2(ns: any) { +>f2 : Symbol(f2, Decl(moduledecl.ts, 49, 5), Decl(moduledecl.ts, 51, 34), Decl(moduledecl.ts, 52, 34)) +>ns : Symbol(ns, Decl(moduledecl.ts, 53, 23)) + } + + export class c1 { +>c1 : Symbol(c1, Decl(moduledecl.ts, 54, 5)) + + public a: () =>string; +>a : Symbol(a, Decl(moduledecl.ts, 56, 21)) + + private b: () =>number; +>b : Symbol(b, Decl(moduledecl.ts, 57, 30)) + + private static s1; +>s1 : Symbol(c1.s1, Decl(moduledecl.ts, 58, 31)) + + public static s2; +>s2 : Symbol(c1.s2, Decl(moduledecl.ts, 59, 26)) + + public d() { +>d : Symbol(d, Decl(moduledecl.ts, 60, 25)) + + return "Hello"; + } + + public e: { x: number; y: string; }; +>e : Symbol(e, Decl(moduledecl.ts, 64, 9)) +>x : Symbol(x, Decl(moduledecl.ts, 66, 19)) +>y : Symbol(y, Decl(moduledecl.ts, 66, 30)) + + constructor (public n, public n2: number, private n3, private n4: string) { +>n : Symbol(n, Decl(moduledecl.ts, 67, 21)) +>n2 : Symbol(n2, Decl(moduledecl.ts, 67, 30)) +>n3 : Symbol(n3, Decl(moduledecl.ts, 67, 49)) +>n4 : Symbol(n4, Decl(moduledecl.ts, 67, 61)) + } + } + + export interface i1 { +>i1 : Symbol(i1, Decl(moduledecl.ts, 69, 5)) + + () : Object; +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + [n: number]: c1; +>n : Symbol(n, Decl(moduledecl.ts, 73, 9)) +>c1 : Symbol(c1, Decl(moduledecl.ts, 54, 5)) + } + + import m2 = a; +>m2 : Symbol(m2, Decl(moduledecl.ts, 74, 5)) +>a : Symbol(m2, Decl(moduledecl.ts, 0, 0)) + + import m3 = b; +>m3 : Symbol(m3, Decl(moduledecl.ts, 76, 18)) +>b : Symbol(m3, Decl(moduledecl.ts, 2, 1)) + + import m4 = b.a; +>m4 : Symbol(m4, Decl(moduledecl.ts, 77, 18)) +>b : Symbol(m3, Decl(moduledecl.ts, 2, 1)) +>a : Symbol(m3.a, Decl(moduledecl.ts, 4, 9)) + + import m5 = c; +>m5 : Symbol(m5, Decl(moduledecl.ts, 78, 20)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) + + import m6 = c.a; +>m6 : Symbol(m6, Decl(moduledecl.ts, 79, 18)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 7, 9)) + + import m7 = c.a.b; +>m7 : Symbol(m7, Decl(moduledecl.ts, 80, 20)) +>c : Symbol(m5, Decl(moduledecl.ts, 5, 1)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 7, 9)) +>b : Symbol(m6.b, Decl(moduledecl.ts, 7, 11)) +} + +module m { +>m : Symbol(m, Decl(moduledecl.ts, 82, 1), Decl(moduledecl.ts, 93, 1)) + + export module m2 { +>m2 : Symbol(m2, Decl(moduledecl.ts, 84, 10)) + + var a = 10; +>a : Symbol(a, Decl(moduledecl.ts, 86, 11)) + + export var b: number; +>b : Symbol(b, Decl(moduledecl.ts, 87, 18)) + } + + export module m3 { +>m3 : Symbol(m3, Decl(moduledecl.ts, 88, 5)) + + export var c: number; +>c : Symbol(c, Decl(moduledecl.ts, 91, 18)) + } +} + +module m { +>m : Symbol(m, Decl(moduledecl.ts, 82, 1), Decl(moduledecl.ts, 93, 1)) + + export module m25 { +>m25 : Symbol(m25, Decl(moduledecl.ts, 95, 10)) + + export module m5 { +>m5 : Symbol(m5, Decl(moduledecl.ts, 97, 23)) + + export var c: number; +>c : Symbol(c, Decl(moduledecl.ts, 99, 22)) + } + } +} + +module m13 { +>m13 : Symbol(m13, Decl(moduledecl.ts, 102, 1)) + + export module m4 { +>m4 : Symbol(m4, Decl(moduledecl.ts, 104, 12)) + + export module m2 { +>m2 : Symbol(m2, Decl(moduledecl.ts, 105, 22)) + + export module m3 { +>m3 : Symbol(m3, Decl(moduledecl.ts, 106, 26)) + + export var c: number; +>c : Symbol(c, Decl(moduledecl.ts, 108, 26)) + } + } + + export function f() { +>f : Symbol(f, Decl(moduledecl.ts, 110, 9)) + + return 20; + } + } +} + +declare module m4 { +>m4 : Symbol(m4, Decl(moduledecl.ts, 116, 1)) + + export var b; +>b : Symbol(b, Decl(moduledecl.ts, 119, 14)) +} + +declare module m5 { +>m5 : Symbol(m5, Decl(moduledecl.ts, 120, 1)) + + export var c; +>c : Symbol(c, Decl(moduledecl.ts, 123, 14)) +} + +declare module m43 { +>m43 : Symbol(m43, Decl(moduledecl.ts, 124, 1)) + + export var b; +>b : Symbol(b, Decl(moduledecl.ts, 127, 14)) +} + +declare module m55 { +>m55 : Symbol(m55, Decl(moduledecl.ts, 128, 1)) + + export var c; +>c : Symbol(c, Decl(moduledecl.ts, 131, 14)) +} + +declare module "m3" { + export var b: number; +>b : Symbol(b, Decl(moduledecl.ts, 135, 14)) +} + +module exportTests { +>exportTests : Symbol(exportTests, Decl(moduledecl.ts, 136, 1)) + + export class C1_public { +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20)) + + private f2() { +>f2 : Symbol(f2, Decl(moduledecl.ts, 139, 28)) + + return 30; + } + + public f3() { +>f3 : Symbol(f3, Decl(moduledecl.ts, 142, 9)) + + return "string"; + } + } + class C2_private { +>C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5)) + + private f2() { +>f2 : Symbol(f2, Decl(moduledecl.ts, 148, 22)) + + return 30; + } + + public f3() { +>f3 : Symbol(f3, Decl(moduledecl.ts, 151, 9)) + + return "string"; + } + } + + export class C3_public { +>C3_public : Symbol(C3_public, Decl(moduledecl.ts, 156, 5)) + + private getC2_private() { +>getC2_private : Symbol(getC2_private, Decl(moduledecl.ts, 158, 28)) + + return new C2_private(); +>C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5)) + } + private setC2_private(arg: C2_private) { +>setC2_private : Symbol(setC2_private, Decl(moduledecl.ts, 161, 9)) +>arg : Symbol(arg, Decl(moduledecl.ts, 162, 30)) +>C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5)) + } + private get c2() { +>c2 : Symbol(c2, Decl(moduledecl.ts, 163, 9)) + + return new C2_private(); +>C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5)) + } + public getC1_public() { +>getC1_public : Symbol(getC1_public, Decl(moduledecl.ts, 166, 9)) + + return new C1_public(); +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20)) + } + public setC1_public(arg: C1_public) { +>setC1_public : Symbol(setC1_public, Decl(moduledecl.ts, 169, 9)) +>arg : Symbol(arg, Decl(moduledecl.ts, 170, 28)) +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20)) + } + public get c1() { +>c1 : Symbol(c1, Decl(moduledecl.ts, 171, 9)) + + return new C1_public(); +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20)) + } + } +} + +declare module mAmbient { +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) + + class C { +>C : Symbol(C, Decl(moduledecl.ts, 178, 25)) + + public myProp: number; +>myProp : Symbol(myProp, Decl(moduledecl.ts, 179, 13)) + } + + function foo() : C; +>foo : Symbol(foo, Decl(moduledecl.ts, 181, 5)) +>C : Symbol(C, Decl(moduledecl.ts, 178, 25)) + + var aVar: C; +>aVar : Symbol(aVar, Decl(moduledecl.ts, 184, 7)) +>C : Symbol(C, Decl(moduledecl.ts, 178, 25)) + + interface B { +>B : Symbol(B, Decl(moduledecl.ts, 184, 16)) + + x: number; +>x : Symbol(x, Decl(moduledecl.ts, 185, 17)) + + y: C; +>y : Symbol(y, Decl(moduledecl.ts, 186, 18)) +>C : Symbol(C, Decl(moduledecl.ts, 178, 25)) + } + enum e { +>e : Symbol(e, Decl(moduledecl.ts, 188, 5)) + + x, +>x : Symbol(e.x, Decl(moduledecl.ts, 189, 12)) + + y, +>y : Symbol(e.y, Decl(moduledecl.ts, 190, 10)) + + z +>z : Symbol(e.z, Decl(moduledecl.ts, 191, 10)) + } + + module m3 { +>m3 : Symbol(m3, Decl(moduledecl.ts, 193, 5)) + + class C { +>C : Symbol(C, Decl(moduledecl.ts, 195, 15)) + + public myProp: number; +>myProp : Symbol(myProp, Decl(moduledecl.ts, 196, 17)) + } + + function foo(): C; +>foo : Symbol(foo, Decl(moduledecl.ts, 198, 9)) +>C : Symbol(C, Decl(moduledecl.ts, 195, 15)) + + var aVar: C; +>aVar : Symbol(aVar, Decl(moduledecl.ts, 201, 11)) +>C : Symbol(C, Decl(moduledecl.ts, 195, 15)) + + interface B { +>B : Symbol(B, Decl(moduledecl.ts, 201, 20)) + + x: number; +>x : Symbol(x, Decl(moduledecl.ts, 202, 21)) + + y: C; +>y : Symbol(y, Decl(moduledecl.ts, 203, 22)) +>C : Symbol(C, Decl(moduledecl.ts, 195, 15)) + } + enum e { +>e : Symbol(e, Decl(moduledecl.ts, 205, 9)) + + x, +>x : Symbol(e.x, Decl(moduledecl.ts, 206, 16)) + + y, +>y : Symbol(e.y, Decl(moduledecl.ts, 207, 14)) + + z +>z : Symbol(e.z, Decl(moduledecl.ts, 208, 14)) + } + } +} + +function foo() { +>foo : Symbol(foo, Decl(moduledecl.ts, 212, 1)) + + return mAmbient.foo(); +>mAmbient.foo : Symbol(mAmbient.foo, Decl(moduledecl.ts, 181, 5)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>foo : Symbol(mAmbient.foo, Decl(moduledecl.ts, 181, 5)) +} + +var cVar = new mAmbient.C(); +>cVar : Symbol(cVar, Decl(moduledecl.ts, 218, 3)) +>mAmbient.C : Symbol(mAmbient.C, Decl(moduledecl.ts, 178, 25)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>C : Symbol(mAmbient.C, Decl(moduledecl.ts, 178, 25)) + +var aVar = mAmbient.aVar; +>aVar : Symbol(aVar, Decl(moduledecl.ts, 219, 3)) +>mAmbient.aVar : Symbol(mAmbient.aVar, Decl(moduledecl.ts, 184, 7)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>aVar : Symbol(mAmbient.aVar, Decl(moduledecl.ts, 184, 7)) + +var bB: mAmbient.B; +>bB : Symbol(bB, Decl(moduledecl.ts, 220, 3)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>B : Symbol(mAmbient.B, Decl(moduledecl.ts, 184, 16)) + +var eVar: mAmbient.e; +>eVar : Symbol(eVar, Decl(moduledecl.ts, 221, 3)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>e : Symbol(mAmbient.e, Decl(moduledecl.ts, 188, 5)) + +function m3foo() { +>m3foo : Symbol(m3foo, Decl(moduledecl.ts, 221, 21)) + + return mAmbient.m3.foo(); +>mAmbient.m3.foo : Symbol(mAmbient.m3.foo, Decl(moduledecl.ts, 198, 9)) +>mAmbient.m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>foo : Symbol(mAmbient.m3.foo, Decl(moduledecl.ts, 198, 9)) +} + +var m3cVar = new mAmbient.m3.C(); +>m3cVar : Symbol(m3cVar, Decl(moduledecl.ts, 227, 3)) +>mAmbient.m3.C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 195, 15)) +>mAmbient.m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 195, 15)) + +var m3aVar = mAmbient.m3.aVar; +>m3aVar : Symbol(m3aVar, Decl(moduledecl.ts, 228, 3)) +>mAmbient.m3.aVar : Symbol(mAmbient.m3.aVar, Decl(moduledecl.ts, 201, 11)) +>mAmbient.m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>aVar : Symbol(mAmbient.m3.aVar, Decl(moduledecl.ts, 201, 11)) + +var m3bB: mAmbient.m3.B; +>m3bB : Symbol(m3bB, Decl(moduledecl.ts, 229, 3)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>B : Symbol(mAmbient.m3.B, Decl(moduledecl.ts, 201, 20)) + +var m3eVar: mAmbient.m3.e; +>m3eVar : Symbol(m3eVar, Decl(moduledecl.ts, 230, 3)) +>mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 176, 1)) +>m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 193, 5)) +>e : Symbol(mAmbient.m3.e, Decl(moduledecl.ts, 205, 9)) + + diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types new file mode 100644 index 0000000000000..0c117fb51840d --- /dev/null +++ b/tests/baselines/reference/moduledecl.types @@ -0,0 +1,551 @@ +=== tests/cases/compiler/moduledecl.ts === + +module a { +>a : any +} + +module b.a { +>b : any +>a : any +} + +module c.a.b { +>c : any +>a : any +>b : any + + import ma = a; +>ma : any +>a : any +} + +module mImport { +>mImport : any + + import d = a; +>d : any +>a : any + + import e = b.a; +>e : any +>b : any +>a : any + + import d1 = a; +>d1 : any +>a : any + + import e1 = b.a; +>e1 : any +>b : any +>a : any +} + +module m0 { +>m0 : typeof m0 + + function f1() { +>f1 : () => void + } + + function f2(s: string); +>f2 : { (s: string): any; (n: number): any; } +>s : string + + function f2(n: number); +>f2 : { (s: string): any; (n: number): any; } +>n : number + + function f2(ns: any) { +>f2 : { (s: string): any; (n: number): any; } +>ns : any + } + + class c1 { +>c1 : c1 + + public a : ()=>string; +>a : () => string + + private b: ()=>number; +>b : () => number + + private static s1; +>s1 : any + + public static s2; +>s2 : any + } + + interface i1 { +>i1 : i1 + + () : Object; +>Object : Object + + [n: number]: c1; +>n : number +>c1 : c1 + } + + import m2 = a; +>m2 : any +>a : any + + import m3 = b; +>m3 : any +>b : any + + import m4 = b.a; +>m4 : any +>b : any +>a : any + + import m5 = c; +>m5 : any +>c : any + + import m6 = c.a; +>m6 : any +>c : any +>a : any + + import m7 = c.a.b; +>m7 : any +>c : any +>a : any +>b : any +} + +module m1 { +>m1 : typeof m1 + + export function f1() { +>f1 : () => void + } + + export function f2(s: string); +>f2 : { (s: string): any; (n: number): any; } +>s : string + + export function f2(n: number); +>f2 : { (s: string): any; (n: number): any; } +>n : number + + export function f2(ns: any) { +>f2 : { (s: string): any; (n: number): any; } +>ns : any + } + + export class c1 { +>c1 : c1 + + public a: () =>string; +>a : () => string + + private b: () =>number; +>b : () => number + + private static s1; +>s1 : any + + public static s2; +>s2 : any + + public d() { +>d : () => string + + return "Hello"; +>"Hello" : string + } + + public e: { x: number; y: string; }; +>e : { x: number; y: string; } +>x : number +>y : string + + constructor (public n, public n2: number, private n3, private n4: string) { +>n : any +>n2 : number +>n3 : any +>n4 : string + } + } + + export interface i1 { +>i1 : i1 + + () : Object; +>Object : Object + + [n: number]: c1; +>n : number +>c1 : c1 + } + + import m2 = a; +>m2 : any +>a : any + + import m3 = b; +>m3 : any +>b : any + + import m4 = b.a; +>m4 : any +>b : any +>a : any + + import m5 = c; +>m5 : any +>c : any + + import m6 = c.a; +>m6 : any +>c : any +>a : any + + import m7 = c.a.b; +>m7 : any +>c : any +>a : any +>b : any +} + +module m { +>m : typeof m + + export module m2 { +>m2 : typeof m2 + + var a = 10; +>a : number +>10 : number + + export var b: number; +>b : number + } + + export module m3 { +>m3 : typeof m3 + + export var c: number; +>c : number + } +} + +module m { +>m : typeof m + + export module m25 { +>m25 : typeof m25 + + export module m5 { +>m5 : typeof m5 + + export var c: number; +>c : number + } + } +} + +module m13 { +>m13 : typeof m13 + + export module m4 { +>m4 : typeof m4 + + export module m2 { +>m2 : typeof m2 + + export module m3 { +>m3 : typeof m3 + + export var c: number; +>c : number + } + } + + export function f() { +>f : () => number + + return 20; +>20 : number + } + } +} + +declare module m4 { +>m4 : typeof m4 + + export var b; +>b : any +} + +declare module m5 { +>m5 : typeof m5 + + export var c; +>c : any +} + +declare module m43 { +>m43 : typeof m43 + + export var b; +>b : any +} + +declare module m55 { +>m55 : typeof m55 + + export var c; +>c : any +} + +declare module "m3" { + export var b: number; +>b : number +} + +module exportTests { +>exportTests : typeof exportTests + + export class C1_public { +>C1_public : C1_public + + private f2() { +>f2 : () => number + + return 30; +>30 : number + } + + public f3() { +>f3 : () => string + + return "string"; +>"string" : string + } + } + class C2_private { +>C2_private : C2_private + + private f2() { +>f2 : () => number + + return 30; +>30 : number + } + + public f3() { +>f3 : () => string + + return "string"; +>"string" : string + } + } + + export class C3_public { +>C3_public : C3_public + + private getC2_private() { +>getC2_private : () => C2_private + + return new C2_private(); +>new C2_private() : C2_private +>C2_private : typeof C2_private + } + private setC2_private(arg: C2_private) { +>setC2_private : (arg: C2_private) => void +>arg : C2_private +>C2_private : C2_private + } + private get c2() { +>c2 : C2_private + + return new C2_private(); +>new C2_private() : C2_private +>C2_private : typeof C2_private + } + public getC1_public() { +>getC1_public : () => C1_public + + return new C1_public(); +>new C1_public() : C1_public +>C1_public : typeof C1_public + } + public setC1_public(arg: C1_public) { +>setC1_public : (arg: C1_public) => void +>arg : C1_public +>C1_public : C1_public + } + public get c1() { +>c1 : C1_public + + return new C1_public(); +>new C1_public() : C1_public +>C1_public : typeof C1_public + } + } +} + +declare module mAmbient { +>mAmbient : typeof mAmbient + + class C { +>C : C + + public myProp: number; +>myProp : number + } + + function foo() : C; +>foo : () => C +>C : C + + var aVar: C; +>aVar : C +>C : C + + interface B { +>B : B + + x: number; +>x : number + + y: C; +>y : C +>C : C + } + enum e { +>e : e + + x, +>x : e + + y, +>y : e + + z +>z : e + } + + module m3 { +>m3 : typeof m3 + + class C { +>C : C + + public myProp: number; +>myProp : number + } + + function foo(): C; +>foo : () => C +>C : C + + var aVar: C; +>aVar : C +>C : C + + interface B { +>B : B + + x: number; +>x : number + + y: C; +>y : C +>C : C + } + enum e { +>e : e + + x, +>x : e + + y, +>y : e + + z +>z : e + } + } +} + +function foo() { +>foo : () => mAmbient.C + + return mAmbient.foo(); +>mAmbient.foo() : mAmbient.C +>mAmbient.foo : () => mAmbient.C +>mAmbient : typeof mAmbient +>foo : () => mAmbient.C +} + +var cVar = new mAmbient.C(); +>cVar : mAmbient.C +>new mAmbient.C() : mAmbient.C +>mAmbient.C : typeof mAmbient.C +>mAmbient : typeof mAmbient +>C : typeof mAmbient.C + +var aVar = mAmbient.aVar; +>aVar : mAmbient.C +>mAmbient.aVar : mAmbient.C +>mAmbient : typeof mAmbient +>aVar : mAmbient.C + +var bB: mAmbient.B; +>bB : mAmbient.B +>mAmbient : any +>B : mAmbient.B + +var eVar: mAmbient.e; +>eVar : mAmbient.e +>mAmbient : any +>e : mAmbient.e + +function m3foo() { +>m3foo : () => mAmbient.m3.C + + return mAmbient.m3.foo(); +>mAmbient.m3.foo() : mAmbient.m3.C +>mAmbient.m3.foo : () => mAmbient.m3.C +>mAmbient.m3 : typeof mAmbient.m3 +>mAmbient : typeof mAmbient +>m3 : typeof mAmbient.m3 +>foo : () => mAmbient.m3.C +} + +var m3cVar = new mAmbient.m3.C(); +>m3cVar : mAmbient.m3.C +>new mAmbient.m3.C() : mAmbient.m3.C +>mAmbient.m3.C : typeof mAmbient.m3.C +>mAmbient.m3 : typeof mAmbient.m3 +>mAmbient : typeof mAmbient +>m3 : typeof mAmbient.m3 +>C : typeof mAmbient.m3.C + +var m3aVar = mAmbient.m3.aVar; +>m3aVar : mAmbient.m3.C +>mAmbient.m3.aVar : mAmbient.m3.C +>mAmbient.m3 : typeof mAmbient.m3 +>mAmbient : typeof mAmbient +>m3 : typeof mAmbient.m3 +>aVar : mAmbient.m3.C + +var m3bB: mAmbient.m3.B; +>m3bB : mAmbient.m3.B +>mAmbient : any +>m3 : any +>B : mAmbient.m3.B + +var m3eVar: mAmbient.m3.e; +>m3eVar : mAmbient.m3.e +>mAmbient : any +>m3 : any +>e : mAmbient.m3.e + + diff --git a/tests/baselines/reference/out-flag3.js b/tests/baselines/reference/out-flag3.js index 8327c3429d3ae..3ec03ecc84192 100644 --- a/tests/baselines/reference/out-flag3.js +++ b/tests/baselines/reference/out-flag3.js @@ -21,10 +21,4 @@ var B = (function () { } return B; })(); -//# sourceMappingURL=c.js.map - -//// [c.d.ts] -declare class A { -} -declare class B { -} +//# sourceMappingURL=c.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json index 36eed6a651812..591a855b5c92f 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json @@ -9,7 +9,6 @@ "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ - "test.js", - "test.d.ts" + "test.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts deleted file mode 100644 index 4c0b8989316ef..0000000000000 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json index 36eed6a651812..591a855b5c92f 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json @@ -9,7 +9,6 @@ "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ - "test.js", - "test.d.ts" + "test.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts deleted file mode 100644 index 4c0b8989316ef..0000000000000 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare var test: number; diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts deleted file mode 100644 index 8147620b2111b..0000000000000 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare class C { -} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts deleted file mode 100644 index 4ff813c3839e8..0000000000000 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -declare class B { - c: C; -} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json index 42f348a4b56d6..14f15bd6fdb53 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json @@ -15,8 +15,6 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/FolderC/fileC.d.ts", - "outdir/simple/fileB.js", - "outdir/simple/fileB.d.ts" + "outdir/simple/fileB.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts deleted file mode 100644 index 8147620b2111b..0000000000000 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare class C { -} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts deleted file mode 100644 index 4ff813c3839e8..0000000000000 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -declare class B { - c: C; -} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json index 42f348a4b56d6..14f15bd6fdb53 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json @@ -15,8 +15,6 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/FolderC/fileC.d.ts", - "outdir/simple/fileB.js", - "outdir/simple/fileB.d.ts" + "outdir/simple/fileB.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/widenedTypes.js b/tests/baselines/reference/widenedTypes.js index a0ff6327f2500..5d48d8f5636e9 100644 --- a/tests/baselines/reference/widenedTypes.js +++ b/tests/baselines/reference/widenedTypes.js @@ -41,17 +41,3 @@ var ob = { x: "" }; // Highlights the difference between array literals and object literals var arr = [3, null]; // not assignable because null is not widened. BCT is {} var obj = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any - - -//// [widenedTypes.d.ts] -declare var t: number[]; -declare var x: typeof undefined; -declare var y: any; -declare var u: number[]; -declare var ob: { - x: typeof undefined; -}; -declare var arr: string[]; -declare var obj: { - [x: string]: string; -}; diff --git a/tests/baselines/reference/withExportDecl.errors.txt b/tests/baselines/reference/withExportDecl.errors.txt deleted file mode 100644 index 77d185d207f01..0000000000000 --- a/tests/baselines/reference/withExportDecl.errors.txt +++ /dev/null @@ -1,64 +0,0 @@ -tests/cases/compiler/withExportDecl.ts(43,9): error TS1029: 'export' modifier must precede 'declare' modifier. - - -==== tests/cases/compiler/withExportDecl.ts (1 errors) ==== - var simpleVar; - export var exportedSimpleVar; - - var anotherVar: any; - var varWithSimpleType: number; - var varWithArrayType: number[]; - - var varWithInitialValue = 30; - export var exportedVarWithInitialValue = 70; - - var withComplicatedValue = { x: 30, y: 70, desc: "position" }; - export var exportedWithComplicatedValue = { x: 30, y: 70, desc: "position" }; - - declare var declaredVar; - declare var declareVar2 - - declare var declaredVar; - declare var deckareVarWithType: number; - export declare var exportedDeclaredVar: number; - - var arrayVar: string[] = ['a', 'b']; - - export var exportedArrayVar: { x: number; y: string; }[] ; - exportedArrayVar.push({ x: 30, y : 'hello world' }); - - function simpleFunction() { - return { - x: "Hello", - y: "word", - n: 2 - }; - } - - export function exportedFunction() { - return simpleFunction(); - } - - module m1 { - export function foo() { - return "Hello"; - } - } - declare export module m2 { - ~~~~~~ -!!! error TS1029: 'export' modifier must precede 'declare' modifier. - - export var a: number; - } - - - export module m3 { - - export function foo() { - return m1.foo(); - } - } - - export var eVar1, eVar2 = 10; - var eVar22; - export var eVar3 = 10, eVar4, eVar5; \ No newline at end of file diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 8d8b8b817ea81..085458717ec35 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -41,7 +41,7 @@ module m1 { return "Hello"; } } -declare export module m2 { +export declare module m2 { export var a: number; } diff --git a/tests/baselines/reference/withExportDecl.symbols b/tests/baselines/reference/withExportDecl.symbols new file mode 100644 index 0000000000000..4457abb76ea9f --- /dev/null +++ b/tests/baselines/reference/withExportDecl.symbols @@ -0,0 +1,129 @@ +=== tests/cases/compiler/withExportDecl.ts === +var simpleVar; +>simpleVar : Symbol(simpleVar, Decl(withExportDecl.ts, 0, 3)) + +export var exportedSimpleVar; +>exportedSimpleVar : Symbol(exportedSimpleVar, Decl(withExportDecl.ts, 1, 10)) + +var anotherVar: any; +>anotherVar : Symbol(anotherVar, Decl(withExportDecl.ts, 3, 3)) + +var varWithSimpleType: number; +>varWithSimpleType : Symbol(varWithSimpleType, Decl(withExportDecl.ts, 4, 3)) + +var varWithArrayType: number[]; +>varWithArrayType : Symbol(varWithArrayType, Decl(withExportDecl.ts, 5, 3)) + +var varWithInitialValue = 30; +>varWithInitialValue : Symbol(varWithInitialValue, Decl(withExportDecl.ts, 7, 3)) + +export var exportedVarWithInitialValue = 70; +>exportedVarWithInitialValue : Symbol(exportedVarWithInitialValue, Decl(withExportDecl.ts, 8, 10)) + +var withComplicatedValue = { x: 30, y: 70, desc: "position" }; +>withComplicatedValue : Symbol(withComplicatedValue, Decl(withExportDecl.ts, 10, 3)) +>x : Symbol(x, Decl(withExportDecl.ts, 10, 28)) +>y : Symbol(y, Decl(withExportDecl.ts, 10, 35)) +>desc : Symbol(desc, Decl(withExportDecl.ts, 10, 42)) + +export var exportedWithComplicatedValue = { x: 30, y: 70, desc: "position" }; +>exportedWithComplicatedValue : Symbol(exportedWithComplicatedValue, Decl(withExportDecl.ts, 11, 10)) +>x : Symbol(x, Decl(withExportDecl.ts, 11, 43)) +>y : Symbol(y, Decl(withExportDecl.ts, 11, 50)) +>desc : Symbol(desc, Decl(withExportDecl.ts, 11, 57)) + +declare var declaredVar; +>declaredVar : Symbol(declaredVar, Decl(withExportDecl.ts, 13, 11), Decl(withExportDecl.ts, 16, 11)) + +declare var declareVar2 +>declareVar2 : Symbol(declareVar2, Decl(withExportDecl.ts, 14, 11)) + +declare var declaredVar; +>declaredVar : Symbol(declaredVar, Decl(withExportDecl.ts, 13, 11), Decl(withExportDecl.ts, 16, 11)) + +declare var deckareVarWithType: number; +>deckareVarWithType : Symbol(deckareVarWithType, Decl(withExportDecl.ts, 17, 11)) + +export declare var exportedDeclaredVar: number; +>exportedDeclaredVar : Symbol(exportedDeclaredVar, Decl(withExportDecl.ts, 18, 18)) + +var arrayVar: string[] = ['a', 'b']; +>arrayVar : Symbol(arrayVar, Decl(withExportDecl.ts, 20, 3)) + +export var exportedArrayVar: { x: number; y: string; }[] ; +>exportedArrayVar : Symbol(exportedArrayVar, Decl(withExportDecl.ts, 22, 10)) +>x : Symbol(x, Decl(withExportDecl.ts, 22, 30)) +>y : Symbol(y, Decl(withExportDecl.ts, 22, 41)) + +exportedArrayVar.push({ x: 30, y : 'hello world' }); +>exportedArrayVar.push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>exportedArrayVar : Symbol(exportedArrayVar, Decl(withExportDecl.ts, 22, 10)) +>push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(withExportDecl.ts, 23, 23)) +>y : Symbol(y, Decl(withExportDecl.ts, 23, 30)) + +function simpleFunction() { +>simpleFunction : Symbol(simpleFunction, Decl(withExportDecl.ts, 23, 52)) + + return { + x: "Hello", +>x : Symbol(x, Decl(withExportDecl.ts, 26, 12)) + + y: "word", +>y : Symbol(y, Decl(withExportDecl.ts, 27, 19)) + + n: 2 +>n : Symbol(n, Decl(withExportDecl.ts, 28, 18)) + + }; +} + +export function exportedFunction() { +>exportedFunction : Symbol(exportedFunction, Decl(withExportDecl.ts, 31, 1)) + + return simpleFunction(); +>simpleFunction : Symbol(simpleFunction, Decl(withExportDecl.ts, 23, 52)) +} + +module m1 { +>m1 : Symbol(m1, Decl(withExportDecl.ts, 35, 1)) + + export function foo() { +>foo : Symbol(foo, Decl(withExportDecl.ts, 37, 11)) + + return "Hello"; + } +} +export declare module m2 { +>m2 : Symbol(m2, Decl(withExportDecl.ts, 41, 1)) + + export var a: number; +>a : Symbol(a, Decl(withExportDecl.ts, 44, 14)) +} + + +export module m3 { +>m3 : Symbol(m3, Decl(withExportDecl.ts, 45, 1)) + + export function foo() { +>foo : Symbol(foo, Decl(withExportDecl.ts, 48, 18)) + + return m1.foo(); +>m1.foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 11)) +>m1 : Symbol(m1, Decl(withExportDecl.ts, 35, 1)) +>foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 11)) + } +} + +export var eVar1, eVar2 = 10; +>eVar1 : Symbol(eVar1, Decl(withExportDecl.ts, 55, 10)) +>eVar2 : Symbol(eVar2, Decl(withExportDecl.ts, 55, 17)) + +var eVar22; +>eVar22 : Symbol(eVar22, Decl(withExportDecl.ts, 56, 3)) + +export var eVar3 = 10, eVar4, eVar5; +>eVar3 : Symbol(eVar3, Decl(withExportDecl.ts, 57, 10)) +>eVar4 : Symbol(eVar4, Decl(withExportDecl.ts, 57, 22)) +>eVar5 : Symbol(eVar5, Decl(withExportDecl.ts, 57, 29)) + diff --git a/tests/baselines/reference/withExportDecl.types b/tests/baselines/reference/withExportDecl.types new file mode 100644 index 0000000000000..099a6241f4475 --- /dev/null +++ b/tests/baselines/reference/withExportDecl.types @@ -0,0 +1,156 @@ +=== tests/cases/compiler/withExportDecl.ts === +var simpleVar; +>simpleVar : any + +export var exportedSimpleVar; +>exportedSimpleVar : any + +var anotherVar: any; +>anotherVar : any + +var varWithSimpleType: number; +>varWithSimpleType : number + +var varWithArrayType: number[]; +>varWithArrayType : number[] + +var varWithInitialValue = 30; +>varWithInitialValue : number +>30 : number + +export var exportedVarWithInitialValue = 70; +>exportedVarWithInitialValue : number +>70 : number + +var withComplicatedValue = { x: 30, y: 70, desc: "position" }; +>withComplicatedValue : { x: number; y: number; desc: string; } +>{ x: 30, y: 70, desc: "position" } : { x: number; y: number; desc: string; } +>x : number +>30 : number +>y : number +>70 : number +>desc : string +>"position" : string + +export var exportedWithComplicatedValue = { x: 30, y: 70, desc: "position" }; +>exportedWithComplicatedValue : { x: number; y: number; desc: string; } +>{ x: 30, y: 70, desc: "position" } : { x: number; y: number; desc: string; } +>x : number +>30 : number +>y : number +>70 : number +>desc : string +>"position" : string + +declare var declaredVar; +>declaredVar : any + +declare var declareVar2 +>declareVar2 : any + +declare var declaredVar; +>declaredVar : any + +declare var deckareVarWithType: number; +>deckareVarWithType : number + +export declare var exportedDeclaredVar: number; +>exportedDeclaredVar : number + +var arrayVar: string[] = ['a', 'b']; +>arrayVar : string[] +>['a', 'b'] : string[] +>'a' : string +>'b' : string + +export var exportedArrayVar: { x: number; y: string; }[] ; +>exportedArrayVar : { x: number; y: string; }[] +>x : number +>y : string + +exportedArrayVar.push({ x: 30, y : 'hello world' }); +>exportedArrayVar.push({ x: 30, y : 'hello world' }) : number +>exportedArrayVar.push : (...items: { x: number; y: string; }[]) => number +>exportedArrayVar : { x: number; y: string; }[] +>push : (...items: { x: number; y: string; }[]) => number +>{ x: 30, y : 'hello world' } : { x: number; y: string; } +>x : number +>30 : number +>y : string +>'hello world' : string + +function simpleFunction() { +>simpleFunction : () => { x: string; y: string; n: number; } + + return { +>{ x: "Hello", y: "word", n: 2 } : { x: string; y: string; n: number; } + + x: "Hello", +>x : string +>"Hello" : string + + y: "word", +>y : string +>"word" : string + + n: 2 +>n : number +>2 : number + + }; +} + +export function exportedFunction() { +>exportedFunction : () => { x: string; y: string; n: number; } + + return simpleFunction(); +>simpleFunction() : { x: string; y: string; n: number; } +>simpleFunction : () => { x: string; y: string; n: number; } +} + +module m1 { +>m1 : typeof m1 + + export function foo() { +>foo : () => string + + return "Hello"; +>"Hello" : string + } +} +export declare module m2 { +>m2 : typeof m2 + + export var a: number; +>a : number +} + + +export module m3 { +>m3 : typeof m3 + + export function foo() { +>foo : () => string + + return m1.foo(); +>m1.foo() : string +>m1.foo : () => string +>m1 : typeof m1 +>foo : () => string + } +} + +export var eVar1, eVar2 = 10; +>eVar1 : any +>eVar2 : number +>10 : number + +var eVar22; +>eVar22 : any + +export var eVar3 = 10, eVar4, eVar5; +>eVar3 : number +>10 : number +>eVar4 : any +>eVar5 : any + diff --git a/tests/cases/compiler/classdecl.ts b/tests/cases/compiler/classdecl.ts index 785faf82865e3..2b9a55a1f3ec0 100644 --- a/tests/cases/compiler/classdecl.ts +++ b/tests/cases/compiler/classdecl.ts @@ -1,4 +1,5 @@ // @declaration: true +// @target: es5 class a { //constructor (); constructor (n: number); @@ -13,7 +14,7 @@ class a { public get d() { return 30; } - public set d() { + public set d(a: number) { } public static get p2() { diff --git a/tests/cases/compiler/declFileObjectLiteralWithAccessors.ts b/tests/cases/compiler/declFileObjectLiteralWithAccessors.ts index 4d424e75d23f7..24b094b602d87 100644 --- a/tests/cases/compiler/declFileObjectLiteralWithAccessors.ts +++ b/tests/cases/compiler/declFileObjectLiteralWithAccessors.ts @@ -1,4 +1,5 @@ // @declaration: true +// @target: es5 function /*1*/makePoint(x: number) { return { diff --git a/tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts b/tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts index 545018c5a7f21..79c9b581e5f77 100644 --- a/tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts +++ b/tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts @@ -1,4 +1,5 @@ // @declaration: true +// @target: es5 function /*1*/makePoint(x: number) { return { diff --git a/tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts b/tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts index b82cebc553fc8..de11cec9fe8dc 100644 --- a/tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts +++ b/tests/cases/compiler/declFileObjectLiteralWithOnlySetter.ts @@ -1,4 +1,5 @@ // @declaration: true +// @target: es5 function /*1*/makePoint(x: number) { return { diff --git a/tests/cases/compiler/declFilePrivateStatic.ts b/tests/cases/compiler/declFilePrivateStatic.ts index 77edf963b697e..0d64844ff99d2 100644 --- a/tests/cases/compiler/declFilePrivateStatic.ts +++ b/tests/cases/compiler/declFilePrivateStatic.ts @@ -1,4 +1,5 @@ // @declaration: true +// @target: es5 class C { private static x = 1; diff --git a/tests/cases/compiler/moduledecl.ts b/tests/cases/compiler/moduledecl.ts index 0997f00eab407..eac2e9ff78c2a 100644 --- a/tests/cases/compiler/moduledecl.ts +++ b/tests/cases/compiler/moduledecl.ts @@ -1,4 +1,6 @@ // @declaration: true +// @target: es5 + module a { } diff --git a/tests/cases/compiler/withExportDecl.ts b/tests/cases/compiler/withExportDecl.ts index c7ae2f1bf38c7..f3c926ad7071a 100644 --- a/tests/cases/compiler/withExportDecl.ts +++ b/tests/cases/compiler/withExportDecl.ts @@ -42,7 +42,7 @@ module m1 { return "Hello"; } } -declare export module m2 { +export declare module m2 { export var a: number; } diff --git a/tests/cases/fourslash/getEmitOutputTsxFile_React.ts b/tests/cases/fourslash/getEmitOutputTsxFile_React.ts index ccfa3bcc0c2b5..0620f6d83ef7f 100644 --- a/tests/cases/fourslash/getEmitOutputTsxFile_React.ts +++ b/tests/cases/fourslash/getEmitOutputTsxFile_React.ts @@ -13,10 +13,18 @@ //// x : string; //// y : number //// } +//// /*1*/ // @Filename: inputFile2.tsx // @emitThisFile: true +//// declare var React: any; //// var y = "my div"; //// var x =
+//// /*2*/ + +goTo.marker("1"); +verify.numberOfErrorsInCurrentFile(0); +goTo.marker("2"); +verify.numberOfErrorsInCurrentFile(0); verify.baselineGetEmitOutput(); \ No newline at end of file diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts index cbc83bb9c414d..6ac9defb7d5ab 100644 --- a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts @@ -16,8 +16,7 @@ verify.getSemanticDiagnostics('[]'); goTo.marker("2"); verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); verify.verifyGetEmitOutputContentsForCurrentFile([ - { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }, - { fileName: "out.d.ts", content: "" }]); + { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }]); goTo.marker("2"); verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); goTo.marker("1"); From c26d2da5726ab16b738fa4a7da2166d42a878bb7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 11:50:27 -0700 Subject: [PATCH 097/353] Do not emit declarations file if we reported error about inaccessible This type --- src/compiler/declarationEmitter.ts | 1 + tests/baselines/reference/declarationFiles.js | 45 ------------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 8b4e1500a1c67..efd5183ca6a30 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -263,6 +263,7 @@ namespace ts { function reportInaccessibleThisError() { if (errorNameNode) { + reportedDeclarationError = true; diagnostics.push(createDiagnosticForNode(errorNameNode, Diagnostics.The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary, declarationNameToString(errorNameNode))); } diff --git a/tests/baselines/reference/declarationFiles.js b/tests/baselines/reference/declarationFiles.js index d7ed9bde8c7c0..7ef41a630cba3 100644 --- a/tests/baselines/reference/declarationFiles.js +++ b/tests/baselines/reference/declarationFiles.js @@ -88,48 +88,3 @@ var C4 = (function () { }; return C4; })(); - - -//// [declarationFiles.d.ts] -declare class C1 { - x: this; - f(x: this): this; - constructor(x: this); -} -declare class C2 { - [x: string]: this; -} -interface Foo { - x: T; - y: this; -} -declare class C3 { - a: this[]; - b: [this, this]; - c: this | Date; - d: this & Date; - e: (((this))); - f: (x: this) => this; - g: new (x: this) => this; - h: Foo; - i: Foo this)>; - j: (x: any) => x is this; -} -declare class C4 { - x1: { - a: this; - }; - x2: this[]; - x3: { - a: this; - }[]; - x4: () => this; - f1(): { - a: this; - }; - f2(): this[]; - f3(): { - a: this; - }[]; - f4(): () => this; -} From 93cc1e530bcb4f9881a8cf955790638f7c65b205 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 13:40:34 -0700 Subject: [PATCH 098/353] Check source map files are being overwritten --- src/compiler/emitter.ts | 20 ++-- src/compiler/program.ts | 5 +- src/compiler/utilities.ts | 8 ++ .../reference/inlineSourceMap.sourcemap.txt | 2 +- .../reference/inlineSourceMap2.sourcemap.txt | 2 +- .../reference/inlineSources2.sourcemap.txt | 2 +- ...sFileCompilationWithMapFileAsJs.errors.txt | 18 +++ .../jsFileCompilationWithMapFileAsJs.js | 25 ++++ .../jsFileCompilationWithMapFileAsJs.js.map | 3 + ...leCompilationWithMapFileAsJs.sourcemap.txt | 84 +++++++++++++ ...hMapFileAsJsWithInlineSourceMap.errors.txt | 16 +++ ...ationWithMapFileAsJsWithInlineSourceMap.js | 25 ++++ ...pFileAsJsWithInlineSourceMap.sourcemap.txt | 84 +++++++++++++ ...ileCompilationWithMapFileAsJsWithOutDir.js | 28 +++++ ...ompilationWithMapFileAsJsWithOutDir.js.map | 4 + ...ionWithMapFileAsJsWithOutDir.sourcemap.txt | 110 ++++++++++++++++++ ...mpilationWithMapFileAsJsWithOutDir.symbols | 15 +++ ...CompilationWithMapFileAsJsWithOutDir.types | 15 +++ .../jsFileCompilationWithMapFileAsJs.ts | 14 +++ ...ationWithMapFileAsJsWithInlineSourceMap.ts | 14 +++ ...ileCompilationWithMapFileAsJsWithOutDir.ts | 15 +++ 21 files changed, 495 insertions(+), 14 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types create mode 100644 tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts create mode 100644 tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 3f7414376095c..29c7629e207e7 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -376,7 +376,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return true; } - function emitJavaScript(jsFilePath: string, root?: SourceFile) { + function emitJavaScript(jsFilePath: string, sourceMapFilePath: string, root?: SourceFile) { let writer = createTextWriter(newLine); let { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer; @@ -872,24 +872,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if (compilerOptions.inlineSourceMap) { // Encode the sourceMap into the sourceMap url let base64SourceMapText = convertToBase64(sourceMapText); - sourceMapUrl = `//# sourceMappingURL=data:application/json;base64,${base64SourceMapText}`; + sourceMapData.jsSourceMappingURL = `data:application/json;base64,${base64SourceMapText}`; } else { // Write source map file writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, /*writeByteOrderMark*/ false); - sourceMapUrl = `//# sourceMappingURL=${sourceMapData.jsSourceMappingURL}`; } + sourceMapUrl = `//# sourceMappingURL=${sourceMapData.jsSourceMappingURL}`; // Write sourcemap url to the js file and write the js file writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark); } // Initialize source map data - let sourceMapJsFile = getBaseFileName(normalizeSlashes(jsFilePath)); sourceMapData = { - sourceMapFilePath: jsFilePath + ".map", - jsSourceMappingURL: sourceMapJsFile + ".map", - sourceMapFile: sourceMapJsFile, + sourceMapFilePath: sourceMapFilePath, + jsSourceMappingURL: !compilerOptions.inlineSourceMap ? getBaseFileName(normalizeSlashes(sourceMapFilePath)) : undefined, + sourceMapFile: getBaseFileName(normalizeSlashes(jsFilePath)), sourceMapSourceRoot: compilerOptions.sourceRoot || "", sourceMapSources: [], inputSourceFileNames: [], @@ -7596,9 +7595,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitFile({ jsFilePath, declarationFilePath}: { jsFilePath: string, declarationFilePath: string }, sourceFile?: SourceFile) { - if (!host.isEmitBlocked(jsFilePath)) { - emitJavaScript(jsFilePath, sourceFile); + function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string }, sourceFile?: SourceFile) { + // Make sure not to write js File and source map file if any of them cannot be written + if (!host.isEmitBlocked(jsFilePath) && (!sourceMapFilePath || !host.isEmitBlocked(sourceMapFilePath))) { + emitJavaScript(jsFilePath, sourceMapFilePath, sourceFile); } if (compilerOptions.declaration) { diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 4ab0bf4cceab6..b4c9bc2eea7b0 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1292,11 +1292,14 @@ namespace ts { // Build map of files seen for (let file of files) { - let { jsFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); + let { jsFilePath, sourceMapFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); if (jsFilePath) { let filesEmittingJsFilePath = lookUp(emitFilesSeen, jsFilePath); if (!filesEmittingJsFilePath) { emitFilesSeen[jsFilePath] = [file]; + if (sourceMapFilePath) { + emitFilesSeen[sourceMapFilePath] = [file]; + } if (options.declaration) { emitFilesSeen[declarationFilePath] = [file]; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 0b0c9f2db33da..b889e8b119d84 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1786,6 +1786,7 @@ namespace ts { sourceFile.languageVariant === LanguageVariant.JSX && options.jsx === JsxEmit.Preserve ? ".jsx" : ".js"); return { jsFilePath, + sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) }; } @@ -1795,18 +1796,25 @@ namespace ts { } return { jsFilePath: undefined, + sourceMapFilePath: undefined, declarationFilePath: undefined }; } export function getBundledEmitFileNames(options: CompilerOptions) { let jsFilePath = options.outFile || options.out; + return { jsFilePath, + sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) }; } + function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) { + return options.sourceMap ? jsFilePath + ".map" : undefined; + } + function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) { return options.declaration ? removeFileExtension(jsFilePath, getExtensionsToRemoveForEmitPath(options)) + ".d.ts" : undefined; } diff --git a/tests/baselines/reference/inlineSourceMap.sourcemap.txt b/tests/baselines/reference/inlineSourceMap.sourcemap.txt index 6625cc46b21c7..35bee4f1d4a95 100644 --- a/tests/baselines/reference/inlineSourceMap.sourcemap.txt +++ b/tests/baselines/reference/inlineSourceMap.sourcemap.txt @@ -1,6 +1,6 @@ =================================================================== JsFile: inlineSourceMap.js -mapUrl: inlineSourceMap.js.map +mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5saW5lU291cmNlTWFwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5saW5lU291cmNlTWFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMifQ== sourceRoot: sources: inlineSourceMap.ts =================================================================== diff --git a/tests/baselines/reference/inlineSourceMap2.sourcemap.txt b/tests/baselines/reference/inlineSourceMap2.sourcemap.txt index 4d7f499b55a4b..e292a9b96b2a4 100644 --- a/tests/baselines/reference/inlineSourceMap2.sourcemap.txt +++ b/tests/baselines/reference/inlineSourceMap2.sourcemap.txt @@ -1,6 +1,6 @@ =================================================================== JsFile: outfile.js -mapUrl: file:///folder/outfile.js.map +mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0ZmlsZS5qcyIsInNvdXJjZVJvb3QiOiJmaWxlOi8vL2ZvbGRlci8iLCJzb3VyY2VzIjpbImlubGluZVNvdXJjZU1hcDIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsdUJBQXVCO0FBRXZCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMifQ== sourceRoot: file:///folder/ sources: inlineSourceMap2.ts =================================================================== diff --git a/tests/baselines/reference/inlineSources2.sourcemap.txt b/tests/baselines/reference/inlineSources2.sourcemap.txt index e3e14d01e9ee7..e09af2f4221b6 100644 --- a/tests/baselines/reference/inlineSources2.sourcemap.txt +++ b/tests/baselines/reference/inlineSources2.sourcemap.txt @@ -1,6 +1,6 @@ =================================================================== JsFile: out.js -mapUrl: out.js.map +mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvYS50cyIsInRlc3RzL2Nhc2VzL2NvbXBpbGVyL2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0ZmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJcbnZhciBhID0gMDtcbmNvbnNvbGUubG9nKGEpO1xuIiwidmFyIGIgPSAwO1xuY29uc29sZS5sb2coYik7Il19 sourceRoot: sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts sourcesContent: ["\nvar a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);"] diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt new file mode 100644 index 0000000000000..2fdce65a6ab3d --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt @@ -0,0 +1,18 @@ +error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js.map' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js.map' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + + class c { + } + +==== tests/cases/compiler/b.js.map (0 errors) ==== + function foo() { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js new file mode 100644 index 0000000000000..ce13bf9d3f1c9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts] //// + +//// [a.ts] + +class c { +} + +//// [b.js.map] +function foo() { +} + +//// [b.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//# sourceMappingURL=a.js.map//// [b.js.js] +function foo() { +} +//# sourceMappingURL=b.js.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map new file mode 100644 index 0000000000000..54e54c5044a61 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map @@ -0,0 +1,3 @@ +//// [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"}//// [b.js.js.map] +{"version":3,"file":"b.js.js","sourceRoot":"","sources":["b.js.map"],"names":["foo"],"mappings":"AAAA;AACAA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt new file mode 100644 index 0000000000000..edb8c42874411 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt @@ -0,0 +1,84 @@ +=================================================================== +JsFile: a.js +mapUrl: a.js.map +sourceRoot: +sources: a.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/a.js +sourceFile:a.ts +------------------------------------------------------------------- +>>>var c = (function () { +1 > +2 >^^^^^^^^^^^^^^^^^^^-> +1 > + > +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +--- +>>> function c() { +1->^^^^ +2 > ^^-> +1-> +1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c) +--- +>>> } +1->^^^^ +2 > ^ +3 > ^^^^^^^^^-> +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) +--- +>>> 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 > +2 >^ +3 > +4 > ^^^^ +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) +3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=a.js.map=================================================================== +JsFile: b.js.js +mapUrl: b.js.js.map +sourceRoot: +sources: b.js.map +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/b.js.js +sourceFile:b.js.map +------------------------------------------------------------------- +>>>function foo() { +1 > +2 >^^-> +1 > +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +--- +>>>} +1-> +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1->function foo() { + > +2 >} +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) +2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) +--- +>>>//# sourceMappingURL=b.js.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt new file mode 100644 index 0000000000000..35cc5dace16c1 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt @@ -0,0 +1,16 @@ +error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +==== tests/cases/compiler/a.ts (0 errors) ==== + + class c { + } + +==== tests/cases/compiler/b.js.map (0 errors) ==== + function foo() { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js new file mode 100644 index 0000000000000..2c9cc66836a89 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts] //// + +//// [a.ts] + +class c { +} + +//// [b.js.map] +function foo() { +} + +//// [b.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9//// [b.js.js] +function foo() { +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt new file mode 100644 index 0000000000000..972c350c8e755 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt @@ -0,0 +1,84 @@ +=================================================================== +JsFile: a.js +mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9 +sourceRoot: +sources: a.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/a.js +sourceFile:a.ts +------------------------------------------------------------------- +>>>var c = (function () { +1 > +2 >^^^^^^^^^^^^^^^^^^^-> +1 > + > +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +--- +>>> function c() { +1->^^^^ +2 > ^^-> +1-> +1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c) +--- +>>> } +1->^^^^ +2 > ^ +3 > ^^^^^^^^^-> +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) +--- +>>> 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 > +2 >^ +3 > +4 > ^^^^ +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) +3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9=================================================================== +JsFile: b.js.js +mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== +sourceRoot: +sources: b.js.map +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/b.js.js +sourceFile:b.js.map +------------------------------------------------------------------- +>>>function foo() { +1 > +2 >^^-> +1 > +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +--- +>>>} +1-> +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1->function foo() { + > +2 >} +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) +2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) +--- +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js new file mode 100644 index 0000000000000..d0a35eb15f1d9 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts] //// + +//// [a.ts] + +class c { +} + +//// [b.js.map] +function foo() { +} + +//// [b.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//# sourceMappingURL=a.js.map//// [b.js.js] +function foo() { +} +//# sourceMappingURL=b.js.js.map//// [b.js] +function bar() { +} +//# sourceMappingURL=b.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map new file mode 100644 index 0000000000000..ef19d2fc517c6 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map @@ -0,0 +1,4 @@ +//// [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"}//// [b.js.js.map] +{"version":3,"file":"b.js.js","sourceRoot":"","sources":["../tests/cases/compiler/b.js.map"],"names":["foo"],"mappings":"AAAA;AACAA,CAACA"}//// [b.js.map] +{"version":3,"file":"b.js","sourceRoot":"","sources":["../tests/cases/compiler/b.js"],"names":["bar"],"mappings":"AAAA;AACAA,CAACA"} \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt new file mode 100644 index 0000000000000..c3fb335e3741b --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt @@ -0,0 +1,110 @@ +=================================================================== +JsFile: a.js +mapUrl: a.js.map +sourceRoot: +sources: ../tests/cases/compiler/a.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:out/a.js +sourceFile:../tests/cases/compiler/a.ts +------------------------------------------------------------------- +>>>var c = (function () { +1 > +2 >^^^^^^^^^^^^^^^^^^^-> +1 > + > +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +--- +>>> function c() { +1->^^^^ +2 > ^^-> +1-> +1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c) +--- +>>> } +1->^^^^ +2 > ^ +3 > ^^^^^^^^^-> +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) +--- +>>> 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 > +2 >^ +3 > +4 > ^^^^ +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) +3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=a.js.map=================================================================== +JsFile: b.js.js +mapUrl: b.js.js.map +sourceRoot: +sources: ../tests/cases/compiler/b.js.map +=================================================================== +------------------------------------------------------------------- +emittedFile:out/b.js.js +sourceFile:../tests/cases/compiler/b.js.map +------------------------------------------------------------------- +>>>function foo() { +1 > +2 >^^-> +1 > +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +--- +>>>} +1-> +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1->function foo() { + > +2 >} +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) +2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) +--- +>>>//# sourceMappingURL=b.js.js.map=================================================================== +JsFile: b.js +mapUrl: b.js.map +sourceRoot: +sources: ../tests/cases/compiler/b.js +=================================================================== +------------------------------------------------------------------- +emittedFile:out/b.js +sourceFile:../tests/cases/compiler/b.js +------------------------------------------------------------------- +>>>function bar() { +1 > +2 >^^-> +1 > +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +--- +>>>} +1-> +2 >^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1->function bar() { + > +2 >} +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (bar) +2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (bar) +--- +>>>//# sourceMappingURL=b.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols new file mode 100644 index 0000000000000..9974960bd2dbd --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols @@ -0,0 +1,15 @@ +=== tests/cases/compiler/a.ts === + +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.js.map === +function foo() { +>foo : Symbol(foo, Decl(b.js.map, 0, 0)) +} + +=== tests/cases/compiler/b.js === +function bar() { +>bar : Symbol(bar, Decl(b.js, 0, 0)) +} diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types new file mode 100644 index 0000000000000..e4534a4cfd42d --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/a.ts === + +class c { +>c : c +} + +=== tests/cases/compiler/b.js.map === +function foo() { +>foo : () => void +} + +=== tests/cases/compiler/b.js === +function bar() { +>bar : () => void +} diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts new file mode 100644 index 0000000000000..6db2ffa3dc63f --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts @@ -0,0 +1,14 @@ +// @jsExtensions: js,map +// @sourcemap: true + +// @filename: a.ts +class c { +} + +// @filename: b.js.map +function foo() { +} + +// @filename: b.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts new file mode 100644 index 0000000000000..9c209ad1b953b --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts @@ -0,0 +1,14 @@ +// @jsExtensions: js,map +// @inlineSourceMap: true + +// @filename: a.ts +class c { +} + +// @filename: b.js.map +function foo() { +} + +// @filename: b.js +function bar() { +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts new file mode 100644 index 0000000000000..18b30bd5910fd --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts @@ -0,0 +1,15 @@ +// @jsExtensions: js,map +// @sourcemap: true +// @outdir: out + +// @filename: a.ts +class c { +} + +// @filename: b.js.map +function foo() { +} + +// @filename: b.js +function bar() { +} \ No newline at end of file From ff933be5ff251330d212fd5032d481bc65ffc912 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 15:51:37 -0700 Subject: [PATCH 099/353] Populate if emit was skipped correctly as part of emit result --- src/compiler/declarationEmitter.ts | 4 +++- src/compiler/emitter.ts | 18 +++++++++++------- src/compiler/program.ts | 2 +- src/harness/harness.ts | 4 ++-- ...ksWhenEmitBlockingErrorOnOtherFile.baseline | 8 ++++++++ .../getEmitOutputWithEmitterErrors.baseline | 4 +++- .../getEmitOutputWithEmitterErrors2.baseline | 4 +++- .../getEmitOutputWithSemanticErrors2.baseline | 4 +++- ...ithSemanticErrorsForMultipleFiles2.baseline | 4 +++- ...aveWorksWhenEmitBlockingErrorOnOtherFile.ts | 13 +++++++++++++ 10 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline create mode 100644 tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index efd5183ca6a30..86c90ff6f1cab 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1608,12 +1608,14 @@ namespace ts { /* @internal */ export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, declarationFilePath, sourceFile); - if (!emitDeclarationResult.reportedDeclarationError && !host.isDeclarationEmitBlocked(declarationFilePath, sourceFile)) { + let emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isDeclarationEmitBlocked(declarationFilePath, sourceFile); + if (!emitSkipped) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); let compilerOptions = host.getCompilerOptions(); writeFile(host, diagnostics, declarationFilePath, declarationOutput, compilerOptions.emitBOM); } + return emitSkipped; function getDeclarationOutput(synchronousDeclarationOutput: string, moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]) { let appliedSyncOutputPos = 0; diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 29c7629e207e7..84a8eb7c6a6cf 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -323,27 +323,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; let sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined; let diagnostics: Diagnostic[] = []; + let emitSkipped = false; let newLine = host.getNewLine(); if (targetSourceFile === undefined) { forEach(host.getSourceFiles(), sourceFile => { if (shouldEmitToOwnFile(sourceFile, compilerOptions)) { - emitFile(getEmitFileNames(sourceFile, host), sourceFile); + emitSkipped = emitFile(getEmitFileNames(sourceFile, host), sourceFile) || emitSkipped; } }); if (compilerOptions.outFile || compilerOptions.out) { - emitFile(getBundledEmitFileNames(compilerOptions)); + emitSkipped = emitFile(getBundledEmitFileNames(compilerOptions)) || emitSkipped; } } else { // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service) if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) { - emitFile(getEmitFileNames(targetSourceFile, host), targetSourceFile); + emitSkipped = emitFile(getEmitFileNames(targetSourceFile, host), targetSourceFile) || emitSkipped; } else if (!isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(getBundledEmitFileNames(compilerOptions)); + emitSkipped = emitFile(getBundledEmitFileNames(compilerOptions)) || emitSkipped; } } @@ -351,7 +352,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi diagnostics = sortAndDeduplicateDiagnostics(diagnostics); return { - emitSkipped: false, + emitSkipped, diagnostics, sourceMaps: sourceMapDataList }; @@ -7597,13 +7598,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string }, sourceFile?: SourceFile) { // Make sure not to write js File and source map file if any of them cannot be written - if (!host.isEmitBlocked(jsFilePath) && (!sourceMapFilePath || !host.isEmitBlocked(sourceMapFilePath))) { + let emitSkipped = host.isEmitBlocked(jsFilePath) || (sourceMapFilePath && host.isEmitBlocked(sourceMapFilePath)); + if (!emitSkipped) { emitJavaScript(jsFilePath, sourceMapFilePath, sourceFile); } if (compilerOptions.declaration) { - writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics); + emitSkipped = writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics) || emitSkipped; } + + return emitSkipped; } } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index b4c9bc2eea7b0..87ca7fb2a44b8 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -293,7 +293,7 @@ namespace ts { program.getSemanticDiagnostics(sourceFile, cancellationToken)); if (program.getCompilerOptions().declaration) { - diagnostics.concat(program.getDeclarationDiagnostics(sourceFile, cancellationToken)); + diagnostics = diagnostics.concat(program.getDeclarationDiagnostics(sourceFile, cancellationToken)); } return sortAndDeduplicateDiagnostics(diagnostics); diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 4ebc1976217da..fab3f649f2afa 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1121,7 +1121,7 @@ namespace Harness { let emitResult = program.emit(); - let errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics); + let errors = ts.getPreEmitDiagnostics(program); this.lastErrors = errors; let result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps); @@ -1666,7 +1666,7 @@ namespace Harness { let encoded_actual = Utils.encodeString(actual); if (expected != encoded_actual) { // Overwrite & issue error - let errMsg = "The baseline file " + relativeFileName + " has changed.\nExpected:\n" + expected + "\nActual:\n" + encoded_actual; + let errMsg = "The baseline file " + relativeFileName + " has changed."; throw new Error(errMsg); } } diff --git a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline new file mode 100644 index 0000000000000..5db889dc01daa --- /dev/null +++ b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline @@ -0,0 +1,8 @@ +EmitSkipped: true +Diagnostics: + Cannot write file 'tests/cases/fourslash/b.js' which is one of the input files. + +EmitSkipped: false +FileName : tests/cases/fourslash/a.js +function foo2() { return 30; } // no error - should emit a.js + diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline index f854a619a4717..2f27152892b67 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline @@ -1,4 +1,6 @@ -EmitSkipped: false +EmitSkipped: true +Diagnostics: + Exported variable 'foo' has or is using private name 'C'. FileName : tests/cases/fourslash/inputFile.js var M; (function (M) { diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 463dfe6899a4c..a3a9023f75be7 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -1,4 +1,6 @@ -EmitSkipped: false +EmitSkipped: true +Diagnostics: + Exported variable 'foo' has or is using private name 'C'. FileName : tests/cases/fourslash/inputFile.js define(["require", "exports"], function (require, exports) { var C = (function () { diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline index b62498221317c..88bc5c507274f 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline @@ -1,4 +1,6 @@ -EmitSkipped: false +EmitSkipped: true +Diagnostics: + Type 'string' is not assignable to type 'number'. FileName : tests/cases/fourslash/inputFile.js var x = "hello world"; diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline index 38a695301d21b..63747de55ded2 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline @@ -1,4 +1,6 @@ -EmitSkipped: false +EmitSkipped: true +Diagnostics: + Type 'string' is not assignable to type 'boolean'. FileName : out.js // File to emit, does not contain semantic errors, but --out is passed // expected to not generate declarations because of the semantic errors in the other file diff --git a/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts b/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts new file mode 100644 index 0000000000000..138b4de6f46fa --- /dev/null +++ b/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts @@ -0,0 +1,13 @@ +/// + +// @BaselineFile: compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline +// @jsExtensions: js +// @Filename: b.js +// @emitThisFile: true +////function foo() { } // This has error because js file cannot be overwritten - emitSkipped should be true + +// @Filename: a.ts +// @emitThisFile: true +////function foo2() { return 30; } // no error - should emit a.js + +verify.baselineGetEmitOutput(); \ No newline at end of file From bf05ea3b2f714a02440d27ff349e3823af2c3580 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 16:08:07 -0700 Subject: [PATCH 100/353] Some test cases to verify that declaration file overwrite is reported correctly --- .../declarationFileOverwriteError.errors.txt | 12 ++++++++++++ .../reference/declarationFileOverwriteError.js | 17 +++++++++++++++++ ...larationFileOverwriteErrorWithOut.errors.txt | 12 ++++++++++++ .../declarationFileOverwriteErrorWithOut.js | 17 +++++++++++++++++ .../compiler/declarationFileOverwriteError.ts | 9 +++++++++ .../declarationFileOverwriteErrorWithOut.ts | 10 ++++++++++ 6 files changed, 77 insertions(+) create mode 100644 tests/baselines/reference/declarationFileOverwriteError.errors.txt create mode 100644 tests/baselines/reference/declarationFileOverwriteError.js create mode 100644 tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt create mode 100644 tests/baselines/reference/declarationFileOverwriteErrorWithOut.js create mode 100644 tests/cases/compiler/declarationFileOverwriteError.ts create mode 100644 tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts diff --git a/tests/baselines/reference/declarationFileOverwriteError.errors.txt b/tests/baselines/reference/declarationFileOverwriteError.errors.txt new file mode 100644 index 0000000000000..fbf4948c2030f --- /dev/null +++ b/tests/baselines/reference/declarationFileOverwriteError.errors.txt @@ -0,0 +1,12 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' which is one of the input files. + + +!!! error TS5055: Cannot write file 'a.d.ts' which is one of the input files. +==== tests/cases/compiler/a.d.ts (0 errors) ==== + + declare class c { + } + +==== tests/cases/compiler/a.ts (0 errors) ==== + class d { + } \ No newline at end of file diff --git a/tests/baselines/reference/declarationFileOverwriteError.js b/tests/baselines/reference/declarationFileOverwriteError.js new file mode 100644 index 0000000000000..a9ae79f8ed6d8 --- /dev/null +++ b/tests/baselines/reference/declarationFileOverwriteError.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/declarationFileOverwriteError.ts] //// + +//// [a.d.ts] + +declare class c { +} + +//// [a.ts] +class d { +} + +//// [a.js] +var d = (function () { + function d() { + } + return d; +})(); diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt new file mode 100644 index 0000000000000..b90bccbaf94a9 --- /dev/null +++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt @@ -0,0 +1,12 @@ +error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' which is one of the input files. + + +!!! error TS5055: Cannot write file 'out.d.ts' which is one of the input files. +==== tests/cases/compiler/out.d.ts (0 errors) ==== + + declare class c { + } + +==== tests/cases/compiler/a.ts (0 errors) ==== + class d { + } \ No newline at end of file diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js new file mode 100644 index 0000000000000..34d9c95a00519 --- /dev/null +++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts] //// + +//// [out.d.ts] + +declare class c { +} + +//// [a.ts] +class d { +} + +//// [out.js] +var d = (function () { + function d() { + } + return d; +})(); diff --git a/tests/cases/compiler/declarationFileOverwriteError.ts b/tests/cases/compiler/declarationFileOverwriteError.ts new file mode 100644 index 0000000000000..b7ecb6540028c --- /dev/null +++ b/tests/cases/compiler/declarationFileOverwriteError.ts @@ -0,0 +1,9 @@ +// @declaration: true + +// @Filename: a.d.ts +declare class c { +} + +// @FileName: a.ts +class d { +} \ No newline at end of file diff --git a/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts new file mode 100644 index 0000000000000..b43c9a8b2e04f --- /dev/null +++ b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts @@ -0,0 +1,10 @@ +// @declaration: true +// @out: tests/cases/compiler/out.js + +// @Filename: out.d.ts +declare class c { +} + +// @FileName: a.ts +class d { +} \ No newline at end of file From 8f03d00dc0b7d80a16b4b2b3a5465b24583de4f1 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 16:27:13 -0700 Subject: [PATCH 101/353] Test cases to verify that declaration file is not emitted if any of the declaration file in program has error --- ...ithErrorsInInputDeclarationFile.errors.txt | 29 +++++++++++++++++++ ...eclFileWithErrorsInInputDeclarationFile.js | 21 ++++++++++++++ ...rsInInputDeclarationFileWithOut.errors.txt | 29 +++++++++++++++++++ ...WithErrorsInInputDeclarationFileWithOut.js | 21 ++++++++++++++ ...eclFileWithErrorsInInputDeclarationFile.ts | 15 ++++++++++ ...WithErrorsInInputDeclarationFileWithOut.ts | 16 ++++++++++ 6 files changed, 131 insertions(+) create mode 100644 tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt create mode 100644 tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js create mode 100644 tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt create mode 100644 tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js create mode 100644 tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts create mode 100644 tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt new file mode 100644 index 0000000000000..970133016183c --- /dev/null +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(4,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(6,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(8,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + +==== tests/cases/compiler/client.ts (0 errors) ==== + /// + var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + +==== tests/cases/compiler/declFile.d.ts (4 errors) ==== + + declare module M { + declare var x; + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + declare function f(); + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + declare module N { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + declare class C { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + } + \ No newline at end of file diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js new file mode 100644 index 0000000000000..e97312893ad0a --- /dev/null +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts] //// + +//// [declFile.d.ts] + +declare module M { + declare var x; + declare function f(); + + declare module N { } + + declare class C { } +} + +//// [client.ts] +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + + +//// [client.js] +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt new file mode 100644 index 0000000000000..970133016183c --- /dev/null +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(4,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(6,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +tests/cases/compiler/declFile.d.ts(8,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + +==== tests/cases/compiler/client.ts (0 errors) ==== + /// + var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + +==== tests/cases/compiler/declFile.d.ts (4 errors) ==== + + declare module M { + declare var x; + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + declare function f(); + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + declare module N { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + + declare class C { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + } + \ No newline at end of file diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js new file mode 100644 index 0000000000000..11dcc06380cb3 --- /dev/null +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts] //// + +//// [declFile.d.ts] + +declare module M { + declare var x; + declare function f(); + + declare module N { } + + declare class C { } +} + +//// [client.ts] +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + + +//// [out.js] +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts new file mode 100644 index 0000000000000..e7d3b592932ef --- /dev/null +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts @@ -0,0 +1,15 @@ +// @declaration: true + +// @Filename: declFile.d.ts +declare module M { + declare var x; + declare function f(); + + declare module N { } + + declare class C { } +} + +// @Filename: client.ts +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts new file mode 100644 index 0000000000000..005b52d5bc9f6 --- /dev/null +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts @@ -0,0 +1,16 @@ +// @declaration: true +// @out: out.js + +// @Filename: declFile.d.ts +declare module M { + declare var x; + declare function f(); + + declare module N { } + + declare class C { } +} + +// @Filename: client.ts +/// +var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file From 57362f60170528e269968023eab97fb962e43838 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 20 Oct 2015 17:16:39 -0700 Subject: [PATCH 102/353] Some tests to cover transpilation of different syntax --- ...ationClassMethodContainingArrowFunction.js | 18 ++++++++++++++ ...ClassMethodContainingArrowFunction.symbols | 18 ++++++++++++++ ...onClassMethodContainingArrowFunction.types | 20 ++++++++++++++++ .../jsFileCompilationLetBeingRenamed.js | 13 ++++++++++ .../jsFileCompilationLetBeingRenamed.symbols | 14 +++++++++++ .../jsFileCompilationLetBeingRenamed.types | 18 ++++++++++++++ .../jsFileCompilationShortHandProperty.js | 20 ++++++++++++++++ ...jsFileCompilationShortHandProperty.symbols | 20 ++++++++++++++++ .../jsFileCompilationShortHandProperty.types | 24 +++++++++++++++++++ ...ationClassMethodContainingArrowFunction.ts | 9 +++++++ .../jsFileCompilationLetBeingRenamed.ts | 9 +++++++ .../jsFileCompilationShortHandProperty.ts | 12 ++++++++++ 12 files changed, 195 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js create mode 100644 tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols create mode 100644 tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types create mode 100644 tests/baselines/reference/jsFileCompilationLetBeingRenamed.js create mode 100644 tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols create mode 100644 tests/baselines/reference/jsFileCompilationLetBeingRenamed.types create mode 100644 tests/baselines/reference/jsFileCompilationShortHandProperty.js create mode 100644 tests/baselines/reference/jsFileCompilationShortHandProperty.symbols create mode 100644 tests/baselines/reference/jsFileCompilationShortHandProperty.types create mode 100644 tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts create mode 100644 tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts create mode 100644 tests/cases/compiler/jsFileCompilationShortHandProperty.ts diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js new file mode 100644 index 0000000000000..836b39380eafb --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js @@ -0,0 +1,18 @@ +//// [a.js] + +class c { + method(a) { + let x = a => this.method(a); + } +} + +//// [out.js] +var c = (function () { + function c() { + } + c.prototype.method = function (a) { + var _this = this; + var x = function (a) { return _this.method(a); }; + }; + return c; +})(); diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols new file mode 100644 index 0000000000000..8db5aa87a5ba7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.js === + +class c { +>c : Symbol(c, Decl(a.js, 0, 0)) + + method(a) { +>method : Symbol(method, Decl(a.js, 1, 9)) +>a : Symbol(a, Decl(a.js, 2, 11)) + + let x = a => this.method(a); +>x : Symbol(x, Decl(a.js, 3, 11)) +>a : Symbol(a, Decl(a.js, 3, 15)) +>this.method : Symbol(method, Decl(a.js, 1, 9)) +>this : Symbol(c, Decl(a.js, 0, 0)) +>method : Symbol(method, Decl(a.js, 1, 9)) +>a : Symbol(a, Decl(a.js, 3, 15)) + } +} diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types new file mode 100644 index 0000000000000..f429cc8851687 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/a.js === + +class c { +>c : c + + method(a) { +>method : (a: any) => void +>a : any + + let x = a => this.method(a); +>x : (a: any) => void +>a => this.method(a) : (a: any) => void +>a : any +>this.method(a) : void +>this.method : (a: any) => void +>this : this +>method : (a: any) => void +>a : any + } +} diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js new file mode 100644 index 0000000000000..c9e16f359816d --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js @@ -0,0 +1,13 @@ +//// [a.js] + +function foo(a) { + for (let a = 0; a < 10; a++) { + // do something + } +} + +//// [out.js] +function foo(a) { + for (var a_1 = 0; a_1 < 10; a_1++) { + } +} diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols new file mode 100644 index 0000000000000..6b0934c659104 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols @@ -0,0 +1,14 @@ +=== tests/cases/compiler/a.js === + +function foo(a) { +>foo : Symbol(foo, Decl(a.js, 0, 0)) +>a : Symbol(a, Decl(a.js, 1, 13)) + + for (let a = 0; a < 10; a++) { +>a : Symbol(a, Decl(a.js, 2, 12)) +>a : Symbol(a, Decl(a.js, 2, 12)) +>a : Symbol(a, Decl(a.js, 2, 12)) + + // do something + } +} diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types new file mode 100644 index 0000000000000..094f59d20225f --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.js === + +function foo(a) { +>foo : (a: any) => void +>a : any + + for (let a = 0; a < 10; a++) { +>a : number +>0 : number +>a < 10 : boolean +>a : number +>10 : number +>a++ : number +>a : number + + // do something + } +} diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.js b/tests/baselines/reference/jsFileCompilationShortHandProperty.js new file mode 100644 index 0000000000000..1dc269146a63d --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.js @@ -0,0 +1,20 @@ +//// [a.js] + +function foo() { + var a = 10; + var b = "Hello"; + return { + a, + b + }; +} + +//// [out.js] +function foo() { + var a = 10; + var b = "Hello"; + return { + a: a, + b: b + }; +} diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols b/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols new file mode 100644 index 0000000000000..fb42d121c8055 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols @@ -0,0 +1,20 @@ +=== tests/cases/compiler/a.js === + +function foo() { +>foo : Symbol(foo, Decl(a.js, 0, 0)) + + var a = 10; +>a : Symbol(a, Decl(a.js, 2, 7)) + + var b = "Hello"; +>b : Symbol(b, Decl(a.js, 3, 7)) + + return { + a, +>a : Symbol(a, Decl(a.js, 4, 12)) + + b +>b : Symbol(b, Decl(a.js, 5, 10)) + + }; +} diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.types b/tests/baselines/reference/jsFileCompilationShortHandProperty.types new file mode 100644 index 0000000000000..e4dd1755cebb7 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.js === + +function foo() { +>foo : () => { a: number; b: string; } + + var a = 10; +>a : number +>10 : number + + var b = "Hello"; +>b : string +>"Hello" : string + + return { +>{ a, b } : { a: number; b: string; } + + a, +>a : number + + b +>b : string + + }; +} diff --git a/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts new file mode 100644 index 0000000000000..225d73324c749 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts @@ -0,0 +1,9 @@ +// @jsExtensions: js +// @out: out.js + +// @FileName: a.js +class c { + method(a) { + let x = a => this.method(a); + } +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts new file mode 100644 index 0000000000000..6206ee8901b9c --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts @@ -0,0 +1,9 @@ +// @jsExtensions: js +// @out: out.js + +// @FileName: a.js +function foo(a) { + for (let a = 0; a < 10; a++) { + // do something + } +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationShortHandProperty.ts b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts new file mode 100644 index 0000000000000..13871de60d83b --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts @@ -0,0 +1,12 @@ +// @jsExtensions: js +// @out: out.js + +// @FileName: a.js +function foo() { + var a = 10; + var b = "Hello"; + return { + a, + b + }; +} \ No newline at end of file From 062495c426e549ed68b5c75161e94e10be4ed06e Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 28 Oct 2015 13:48:32 -0700 Subject: [PATCH 103/353] naive change and new tests --- src/compiler/checker.ts | 6 +++--- .../expressions/typeGuards/typeGuardNesting.ts | 4 ++++ .../expressions/typeGuards/typeGuardRedundancy.ts | 9 +++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5370e7c4f027d..033614d2b419b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6369,7 +6369,7 @@ namespace ts { // Assumed result is true. If check was not for a primitive type, remove all primitive types if (!typeInfo) { return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean | TypeFlags.ESSymbol, - /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false); + /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ true); } // Check was for a primitive type, return that primitive type if it is a subtype if (isTypeSubtypeOf(typeInfo.type, type)) { @@ -6377,12 +6377,12 @@ namespace ts { } // Otherwise, remove all types that aren't of the primitive type kind. This can happen when the type is // union of enum types and other types. - return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false, /*allowEmptyUnionResult*/ false); + return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false, /*allowEmptyUnionResult*/ true); } else { // Assumed result is false. If check was for a primitive type, remove that primitive type if (typeInfo) { - return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false); + return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ true); } // Otherwise we don't have enough information to do anything. return type; diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts new file mode 100644 index 0000000000000..b06b5880800ec --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts @@ -0,0 +1,4 @@ +let strOrBool: string|boolean; +if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { + var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; +} \ No newline at end of file diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts new file mode 100644 index 0000000000000..4e9e3137d7871 --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts @@ -0,0 +1,9 @@ +var x: string|number; + +var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; + +var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr; + +var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; + +var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr; \ No newline at end of file From ba3d34f9df88f828bfd3a5eef56c62a0e3127769 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 14:02:46 -0700 Subject: [PATCH 104/353] Instead of --jsExtensions support --allowJs with .js and .jsx as supported extensions --- src/compiler/commandLineParser.ts | 8 +++----- src/compiler/core.ts | 4 +++- src/compiler/diagnosticMessages.json | 10 +--------- src/compiler/program.ts | 2 +- src/compiler/types.ts | 2 +- src/services/services.ts | 4 ++-- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 16d7c8c3d93e4..8bc95d4e31bee 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -249,11 +249,9 @@ namespace ts { error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic, }, { - name: "jsExtensions", - type: "string[]", - description: Diagnostics.Specifies_extensions_to_treat_as_javascript_file_To_specify_multiple_extensions_either_use_this_option_multiple_times_or_provide_comma_separated_list, - paramType: Diagnostics.EXTENSION_S, - error: Diagnostics.Argument_for_jsExtensions_option_must_be_either_extension_or_comma_separated_list_of_extensions, + name: "allowJs", + type: "boolean", + description: Diagnostics.Allow_javascript_files_to_be_compiled, } ]; diff --git a/src/compiler/core.ts b/src/compiler/core.ts index de9a93ee6792e..bb07062ec573c 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -729,9 +729,11 @@ namespace ts { * List of supported extensions in order of file resolution precedence. */ export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; + export const supportedJavascriptExtensions = ["js", "jsx"]; + export const supportedExtensionsWhenAllowedJs = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions); export function getSupportedExtensions(options?: CompilerOptions): string[] { - return options && options.jsExtensions ? supportedTypeScriptExtensions.concat(options.jsExtensions) : supportedTypeScriptExtensions; + return options && options.allowJs ? supportedExtensionsWhenAllowedJs : supportedTypeScriptExtensions; } export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions) { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1244105860370..8998294732a07 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2181,10 +2181,6 @@ "category": "Message", "code": 6038 }, - "EXTENSION[S]": { - "category": "Message", - "code": 6039 - }, "Compilation complete. Watching for file changes.": { "category": "Message", "code": 6042 @@ -2269,10 +2265,6 @@ "category": "Error", "code": 6063 }, - "Argument for '--jsExtensions' option must be either extension or comma separated list of extensions.": { - "category": "Error", - "code": 6064 - }, "Specify JSX code generation: 'preserve' or 'react'": { "category": "Message", @@ -2310,7 +2302,7 @@ "category": "Message", "code": 6072 }, - "Specifies extensions to treat as javascript file. To specify multiple extensions, either use this option multiple times or provide comma separated list.": { + "Allow javascript files to be compiled.": { "category": "Message", "code": 6073 }, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 87ca7fb2a44b8..ccb2d2c346e41 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -359,7 +359,7 @@ namespace ts { (oldOptions.target !== options.target) || (oldOptions.noLib !== options.noLib) || (oldOptions.jsx !== options.jsx) || - (oldOptions.jsExtensions !== options.jsExtensions)) { + (oldOptions.allowJs !== options.allowJs)) { oldProgram = undefined; } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index b5451c3311d04..15caa8b529c17 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2089,7 +2089,7 @@ namespace ts { experimentalDecorators?: boolean; emitDecoratorMetadata?: boolean; moduleResolution?: ModuleResolutionKind; - jsExtensions?: string[]; + allowJs?: boolean; /* @internal */ stripInternal?: boolean; // Skip checking lib.d.ts to help speed up tests. diff --git a/src/services/services.ts b/src/services/services.ts index 05295529f71f6..dce341cc035ae 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2002,7 +2002,7 @@ namespace ts { let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { - return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.jsExtensions; + return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.allowJs; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { @@ -2633,7 +2633,7 @@ namespace ts { oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || oldSettings.jsx !== newSettings.jsx || - oldSettings.jsExtensions !== newSettings.jsExtensions); + oldSettings.allowJs !== newSettings.allowJs); // Now create a new compiler let compilerHost: CompilerHost = { From 382b86bd2c4feb423396920c0dc705d22d9dbdf1 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 13:56:47 -0700 Subject: [PATCH 105/353] Test update for using allowJs instead of --jsExtensions --- ...CompilationDifferentNamesNotSpecifiedWithAllowJs.json} | 6 +++--- .../amd/test.d.ts | 0 .../amd/test.js | 0 ...CompilationDifferentNamesNotSpecifiedWithAllowJs.json} | 6 +++--- .../node/test.d.ts | 0 .../node/test.js | 0 ...ileCompilationDifferentNamesSpecifiedWithAllowJs.json} | 6 +++--- .../amd/test.d.ts | 0 .../amd/test.js | 0 ...ileCompilationDifferentNamesSpecifiedWithAllowJs.json} | 6 +++--- .../node/test.d.ts | 0 .../node/test.js | 0 ...jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} | 4 ++-- ...jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} | 4 ++-- ...ileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} | 4 ++-- ...ileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} | 4 ++-- .../amd/SameNameFilesNotSpecifiedWithAllowJs}/a.d.ts | 0 .../amd/SameNameFilesNotSpecifiedWithAllowJs}/a.js | 0 ...eCompilationSameNameFilesNotSpecifiedWithAllowJs.json} | 8 ++++---- .../node/SameNameFilesNotSpecifiedWithAllowJs}/a.d.ts | 0 .../node/SameNameFilesNotSpecifiedWithAllowJs}/a.js | 0 ...eCompilationSameNameFilesNotSpecifiedWithAllowJs.json} | 8 ++++---- .../amd/SameNameTsSpecifiedWithAllowJs}/a.d.ts | 0 .../amd/SameNameTsSpecifiedWithAllowJs}/a.js | 0 ...FileCompilationSameNameFilesSpecifiedWithAllowJs.json} | 8 ++++---- .../node/SameNameTsSpecifiedWithAllowJs}/a.d.ts | 0 .../node/SameNameTsSpecifiedWithAllowJs}/a.js | 0 ...FileCompilationSameNameFilesSpecifiedWithAllowJs.json} | 8 ++++---- .../jsFileCompilationAmbientVarDeclarationSyntax.ts | 2 +- ...jsFileCompilationClassMethodContainingArrowFunction.ts | 2 +- tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts | 2 +- .../jsFileCompilationDuplicateFunctionImplementation.ts | 2 +- ...ionDuplicateFunctionImplementationFileOrderReversed.ts | 2 +- .../cases/compiler/jsFileCompilationDuplicateVariable.ts | 2 +- .../jsFileCompilationDuplicateVariableErrorReported.ts | 2 +- .../compiler/jsFileCompilationEmitBlockedCorrectly.ts | 2 +- tests/cases/compiler/jsFileCompilationEmitDeclarations.ts | 2 +- .../jsFileCompilationEmitTrippleSlashReference.ts | 2 +- tests/cases/compiler/jsFileCompilationEnumSyntax.ts | 2 +- ...tionErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts | 2 +- ...lationErrorOnDeclarationsWithJsFileReferenceWithOut.ts | 2 +- .../compiler/jsFileCompilationExportAssignmentSyntax.ts | 2 +- .../jsFileCompilationHeritageClauseSyntaxOfClass.ts | 2 +- .../cases/compiler/jsFileCompilationImportEqualsSyntax.ts | 2 +- tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts | 2 +- tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts | 2 +- .../compiler/jsFileCompilationLetDeclarationOrder.ts | 2 +- .../compiler/jsFileCompilationLetDeclarationOrder2.ts | 2 +- tests/cases/compiler/jsFileCompilationModuleSyntax.ts | 2 +- ...rrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts | 2 +- ...oErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts | 2 +- .../cases/compiler/jsFileCompilationOptionalParameter.ts | 2 +- .../compiler/jsFileCompilationPropertySyntaxOfClass.ts | 2 +- .../jsFileCompilationPublicMethodSyntaxOfClass.ts | 2 +- .../compiler/jsFileCompilationPublicParameterModifier.ts | 2 +- tests/cases/compiler/jsFileCompilationRestParameter.ts | 2 +- .../jsFileCompilationReturnTypeSyntaxOfFunction.ts | 2 +- .../cases/compiler/jsFileCompilationShortHandProperty.ts | 2 +- tests/cases/compiler/jsFileCompilationSyntaxError.ts | 2 +- tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts | 2 +- .../compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts | 2 +- tests/cases/compiler/jsFileCompilationTypeAssertions.ts | 2 +- tests/cases/compiler/jsFileCompilationTypeOfParameter.ts | 2 +- .../jsFileCompilationTypeParameterSyntaxOfClass.ts | 2 +- .../jsFileCompilationTypeParameterSyntaxOfFunction.ts | 2 +- tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts | 2 +- .../jsFileCompilationWithJsEmitPathSameAsInput.ts | 2 +- tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts | 2 +- ...jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts | 2 +- .../jsFileCompilationWithMapFileAsJsWithOutDir.ts | 2 +- tests/cases/compiler/jsFileCompilationWithOut.ts | 2 +- .../jsFileCompilationWithOutFileNameSameAsInputJsFile.ts | 2 +- tests/cases/compiler/jsFileCompilationWithoutOut.ts | 2 +- .../compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts | 2 +- .../jsFileCompilationDuplicateFunctionImplementation.ts | 2 +- ...CompilationDifferentNamesNotSpecifiedWithAllowJs.json} | 2 +- ...ileCompilationDifferentNamesSpecifiedWithAllowJs.json} | 2 +- ...jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} | 2 +- ...ileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} | 2 +- ...eCompilationSameNameFilesNotSpecifiedWithAllowJs.json} | 2 +- ...FileCompilationSameNameFilesSpecifiedWithAllowJs.json} | 2 +- .../a.ts | 0 .../b.js | 0 .../tsconfig.json | 2 +- .../a.ts | 0 .../b.js | 0 .../tsconfig.json | 2 +- .../a.d.ts | 0 .../a.js | 0 .../SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json | 1 + .../SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json | 1 - .../a.d.ts | 0 .../a.js | 0 .../SameNameDTsSpecifiedWithAllowJs/tsconfig.json | 4 ++++ .../SameNameDTsSpecifiedWithJsExtensions/tsconfig.json | 4 ---- .../a.js | 0 .../a.ts | 0 .../SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json | 1 + .../tsconfig.json | 1 - .../a.js | 0 .../a.ts | 0 .../SameNameTsSpecifiedWithAllowJs/tsconfig.json | 4 ++++ .../SameNameTsSpecifiedWithJsExtensions/tsconfig.json | 4 ---- 103 files changed, 101 insertions(+), 101 deletions(-) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json} (68%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs}/amd/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs}/amd/test.js (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json} (68%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs}/node/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs}/node/test.js (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json} (68%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesSpecifiedWithAllowJs}/amd/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesSpecifiedWithAllowJs}/amd/test.js (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json} (68%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesSpecifiedWithAllowJs}/node/test.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions => jsFileCompilationDifferentNamesSpecifiedWithAllowJs}/node/test.js (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} (76%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} (76%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} (75%) rename tests/baselines/reference/project/{jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} (75%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs}/a.js (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json} (59%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs}/a.js (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json} (59%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs}/a.js (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json} (62%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs}/a.js (100%) rename tests/baselines/reference/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json} (62%) rename tests/cases/project/{jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json} (81%) rename tests/cases/project/{jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json => jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json} (81%) rename tests/cases/project/{jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json} (83%) rename tests/cases/project/{jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json} (82%) rename tests/cases/project/{jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json} (81%) rename tests/cases/project/{jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json => jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json} (83%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithJsExtensions => DifferentNamesNotSpecifiedWithAllowJs}/a.ts (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithJsExtensions => DifferentNamesNotSpecifiedWithAllowJs}/b.js (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesNotSpecifiedWithJsExtensions => DifferentNamesNotSpecifiedWithAllowJs}/tsconfig.json (60%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesSpecifiedWithJsExtensions => DifferentNamesSpecifiedWithAllowJs}/a.ts (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesSpecifiedWithJsExtensions => DifferentNamesSpecifiedWithAllowJs}/b.js (100%) rename tests/cases/projects/jsFileCompilation/{DifferentNamesSpecifiedWithJsExtensions => DifferentNamesSpecifiedWithAllowJs}/tsconfig.json (70%) rename tests/cases/projects/jsFileCompilation/{SameNameDTsNotSpecifiedWithJsExtensions => SameNameDTsNotSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/cases/projects/jsFileCompilation/{SameNameDTsNotSpecifiedWithJsExtensions => SameNameDTsNotSpecifiedWithAllowJs}/a.js (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json rename tests/cases/projects/jsFileCompilation/{SameNameDTsSpecifiedWithJsExtensions => SameNameDTsSpecifiedWithAllowJs}/a.d.ts (100%) rename tests/cases/projects/jsFileCompilation/{SameNameDTsSpecifiedWithJsExtensions => SameNameDTsSpecifiedWithAllowJs}/a.js (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json rename tests/cases/projects/jsFileCompilation/{SameNameFilesNotSpecifiedWithJsExtensions => SameNameFilesNotSpecifiedWithAllowJs}/a.js (100%) rename tests/cases/projects/jsFileCompilation/{SameNameFilesNotSpecifiedWithJsExtensions => SameNameFilesNotSpecifiedWithAllowJs}/a.ts (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json rename tests/cases/projects/jsFileCompilation/{SameNameTsSpecifiedWithJsExtensions => SameNameTsSpecifiedWithAllowJs}/a.js (100%) rename tests/cases/projects/jsFileCompilation/{SameNameTsSpecifiedWithJsExtensions => SameNameTsSpecifiedWithAllowJs}/a.ts (100%) create mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/tsconfig.json delete mode 100644 tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json similarity index 68% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json index eb3813ca14200..4487623500b5c 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json @@ -3,11 +3,11 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithJsExtensions", + "project": "DifferentNamesNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecifiedWithJsExtensions/a.ts", - "DifferentNamesNotSpecifiedWithJsExtensions/b.js" + "DifferentNamesNotSpecifiedWithAllowJs/a.ts", + "DifferentNamesNotSpecifiedWithAllowJs/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/amd/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json similarity index 68% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json index eb3813ca14200..4487623500b5c 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json @@ -3,11 +3,11 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithJsExtensions", + "project": "DifferentNamesNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesNotSpecifiedWithJsExtensions/a.ts", - "DifferentNamesNotSpecifiedWithJsExtensions/b.js" + "DifferentNamesNotSpecifiedWithAllowJs/a.ts", + "DifferentNamesNotSpecifiedWithAllowJs/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions/node/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json similarity index 68% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json index 6c58345617a1a..e77cc5ad6bd28 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json @@ -3,11 +3,11 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesSpecifiedWithJsExtensions", + "project": "DifferentNamesSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesSpecifiedWithJsExtensions/a.ts", - "DifferentNamesSpecifiedWithJsExtensions/b.js" + "DifferentNamesSpecifiedWithAllowJs/a.ts", + "DifferentNamesSpecifiedWithAllowJs/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/amd/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json similarity index 68% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json index 6c58345617a1a..e77cc5ad6bd28 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json @@ -3,11 +3,11 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesSpecifiedWithJsExtensions", + "project": "DifferentNamesSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "DifferentNamesSpecifiedWithJsExtensions/a.ts", - "DifferentNamesSpecifiedWithJsExtensions/b.js" + "DifferentNamesSpecifiedWithAllowJs/a.ts", + "DifferentNamesSpecifiedWithAllowJs/b.js" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.d.ts rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions/node/test.js rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json similarity index 76% rename from tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json index 867227ec4e35a..27ec20feb8d3b 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json @@ -3,10 +3,10 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsSpecifiedWithJsExtensions", + "project": "SameNameDTsSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsSpecifiedWithJsExtensions/a.d.ts" + "SameNameDTsSpecifiedWithAllowJs/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json similarity index 76% rename from tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json index 867227ec4e35a..27ec20feb8d3b 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json @@ -3,10 +3,10 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsSpecifiedWithJsExtensions", + "project": "SameNameDTsSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsSpecifiedWithJsExtensions/a.d.ts" + "SameNameDTsSpecifiedWithAllowJs/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json similarity index 75% rename from tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json index ffdfdf24e3950..77e1f22703002 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json @@ -3,10 +3,10 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithJsExtensions", + "project": "SameNameDTsNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts" + "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json similarity index 75% rename from tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json index ffdfdf24e3950..77e1f22703002 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json @@ -3,10 +3,10 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithJsExtensions", + "project": "SameNameDTsNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts" + "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs/a.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/SameNameFilesNotSpecifiedWithJsExtensions/a.js rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/SameNameFilesNotSpecifiedWithAllowJs/a.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json similarity index 59% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json index 93fee268825c5..34d6768372f6e 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json @@ -3,13 +3,13 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameFilesNotSpecifiedWithJsExtensions", + "project": "SameNameFilesNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameFilesNotSpecifiedWithJsExtensions/a.ts" + "SameNameFilesNotSpecifiedWithAllowJs/a.ts" ], "emittedFiles": [ - "SameNameFilesNotSpecifiedWithJsExtensions/a.js", - "SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts" + "SameNameFilesNotSpecifiedWithAllowJs/a.js", + "SameNameFilesNotSpecifiedWithAllowJs/a.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs/a.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/SameNameFilesNotSpecifiedWithJsExtensions/a.js rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/SameNameFilesNotSpecifiedWithAllowJs/a.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json similarity index 59% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json index 93fee268825c5..34d6768372f6e 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json @@ -3,13 +3,13 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameFilesNotSpecifiedWithJsExtensions", + "project": "SameNameFilesNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameFilesNotSpecifiedWithJsExtensions/a.ts" + "SameNameFilesNotSpecifiedWithAllowJs/a.ts" ], "emittedFiles": [ - "SameNameFilesNotSpecifiedWithJsExtensions/a.js", - "SameNameFilesNotSpecifiedWithJsExtensions/a.d.ts" + "SameNameFilesNotSpecifiedWithAllowJs/a.js", + "SameNameFilesNotSpecifiedWithAllowJs/a.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs/a.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/SameNameTsSpecifiedWithJsExtensions/a.js rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/SameNameTsSpecifiedWithAllowJs/a.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json similarity index 62% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json index 0adbe74627f82..ae68fac44bd60 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/amd/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json @@ -3,13 +3,13 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameTsSpecifiedWithJsExtensions", + "project": "SameNameTsSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameTsSpecifiedWithJsExtensions/a.ts" + "SameNameTsSpecifiedWithAllowJs/a.ts" ], "emittedFiles": [ - "SameNameTsSpecifiedWithJsExtensions/a.js", - "SameNameTsSpecifiedWithJsExtensions/a.d.ts" + "SameNameTsSpecifiedWithAllowJs/a.js", + "SameNameTsSpecifiedWithAllowJs/a.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.d.ts rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs/a.d.ts diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/SameNameTsSpecifiedWithJsExtensions/a.js rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/SameNameTsSpecifiedWithAllowJs/a.js diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json similarity index 62% rename from tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json rename to tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json index 0adbe74627f82..ae68fac44bd60 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions/node/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json @@ -3,13 +3,13 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameTsSpecifiedWithJsExtensions", + "project": "SameNameTsSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameTsSpecifiedWithJsExtensions/a.ts" + "SameNameTsSpecifiedWithAllowJs/a.ts" ], "emittedFiles": [ - "SameNameTsSpecifiedWithJsExtensions/a.js", - "SameNameTsSpecifiedWithJsExtensions/a.d.ts" + "SameNameTsSpecifiedWithAllowJs/a.js", + "SameNameTsSpecifiedWithAllowJs/a.d.ts" ] } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts index 6cb565e4c9fb0..2654dddf2bc60 100644 --- a/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationAmbientVarDeclarationSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js declare var v; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts index 225d73324c749..50adc50388d2f 100644 --- a/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts +++ b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @FileName: a.js diff --git a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts index 1dd1cf453f284..2ef95db01fe1f 100644 --- a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js @internal class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts index 1cc61edaf3270..8517c9dbf8e6d 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: b.js diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts index af1d842d9b2e0..a02b7d9d88a95 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts index f3f69ee5ec316..cf2e27de885e5 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts index 77db6222a9219..05b750fe6082b 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: b.js diff --git a/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts b/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts index 80f9358fb7f68..55f1d0ad933ca 100644 --- a/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts +++ b/tests/cases/compiler/jsFileCompilationEmitBlockedCorrectly.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts index 5e670172c15e9..9d6daeac6fa6c 100644 --- a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts +++ b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts index 2ac1ea3ba519b..8d41ac2ef1336 100644 --- a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts +++ b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationEnumSyntax.ts b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts index 5a466ef57652e..1c607d09cb66f 100644 --- a/tests/cases/compiler/jsFileCompilationEnumSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationEnumSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js enum E { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts index 0b5545741b2de..41d87d5f39b08 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @declaration: true // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts index 22d9e3c269eff..35228678bb72a 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts index cea0dfe700dd6..c6fced0e2d31f 100644 --- a/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationExportAssignmentSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js export = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts index bfebbfd9966f9..5e8587bb2520a 100644 --- a/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationHeritageClauseSyntaxOfClass.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js class C implements D { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts index 3c10227019613..e7a389149310f 100644 --- a/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationImportEqualsSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js import a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts index 172bf01b803dc..205e06395ac0e 100644 --- a/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationInterfaceSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js interface I { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts index 6206ee8901b9c..177b0f55e27dd 100644 --- a/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts +++ b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @FileName: a.js diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts index d3e342a2d4bb4..962267c5cabb3 100644 --- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: b.js diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts index c71d87ac9d94f..8f89c57ade21e 100644 --- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @declaration: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts index c9762553028e5..f7d1a9070f6e7 100644 --- a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js module M { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts index c089979ecbc05..111645d995e34 100644 --- a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts index 83c752f7292c3..8783b722f2a29 100644 --- a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationOptionalParameter.ts b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts index 962c73214752a..541ff041c2a66 100644 --- a/tests/cases/compiler/jsFileCompilationOptionalParameter.ts +++ b/tests/cases/compiler/jsFileCompilationOptionalParameter.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js function F(p?) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts index 24a0f2389ddd7..62a0058bcefa7 100644 --- a/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationPropertySyntaxOfClass.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js class C { v } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts index 8c678eed588ec..2016d4afdbd36 100644 --- a/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationPublicMethodSyntaxOfClass.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js class C { public foo() { diff --git a/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts index 8594e011d3c47..0c17ea98ccc1e 100644 --- a/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts +++ b/tests/cases/compiler/jsFileCompilationPublicParameterModifier.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js class C { constructor(public x) { }} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationRestParameter.ts b/tests/cases/compiler/jsFileCompilationRestParameter.ts index 22ccf24bae334..560fc1ebd1a3b 100644 --- a/tests/cases/compiler/jsFileCompilationRestParameter.ts +++ b/tests/cases/compiler/jsFileCompilationRestParameter.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js // @target: es6 // @out: b.js diff --git a/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts index 183ace7ce10e6..8e9412d489ae0 100644 --- a/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts +++ b/tests/cases/compiler/jsFileCompilationReturnTypeSyntaxOfFunction.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js function F(): number { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationShortHandProperty.ts b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts index 13871de60d83b..476658e0fa116 100644 --- a/tests/cases/compiler/jsFileCompilationShortHandProperty.ts +++ b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @FileName: a.js diff --git a/tests/cases/compiler/jsFileCompilationSyntaxError.ts b/tests/cases/compiler/jsFileCompilationSyntaxError.ts index d6f10ce47c4a7..4d17d6d3aaeae 100644 --- a/tests/cases/compiler/jsFileCompilationSyntaxError.ts +++ b/tests/cases/compiler/jsFileCompilationSyntaxError.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js /** * @type {number} diff --git a/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts index d77d35c011ae6..d849ca5ea4bea 100644 --- a/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationTypeAliasSyntax.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js type a = b; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts index e2aca1007b234..a5bcdae904b61 100644 --- a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts +++ b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js Foo(); \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts index 45f76c78bfb90..15f39b36d01ba 100644 --- a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts +++ b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js var v = undefined; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts index a989a8e2a3058..d9e42c264da88 100644 --- a/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts +++ b/tests/cases/compiler/jsFileCompilationTypeOfParameter.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js function F(a: number) { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts index 5242a2f7e7a23..d0aa85f59939a 100644 --- a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfClass.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js class C { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts index a6f27b787eb9d..19a567fbdb5a6 100644 --- a/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts +++ b/tests/cases/compiler/jsFileCompilationTypeParameterSyntaxOfFunction.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js function F() { } \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts index 1e2641dd8d192..14085ea9dfb35 100644 --- a/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts +++ b/tests/cases/compiler/jsFileCompilationTypeSyntaxOfVar.ts @@ -1,3 +1,3 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.js var v: () => number; \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts b/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts index 27082e9a930a1..82dba88f78568 100644 --- a/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts +++ b/tests/cases/compiler/jsFileCompilationWithJsEmitPathSameAsInput.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts index 6db2ffa3dc63f..4008204cd66e1 100644 --- a/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJs.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js,map +// @allowJs: true // @sourcemap: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts index 9c209ad1b953b..ae510f9eec32f 100644 --- a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js,map +// @allowJs: true // @inlineSourceMap: true // @filename: a.ts diff --git a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts index 18b30bd5910fd..9e39ae274b4fa 100644 --- a/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts +++ b/tests/cases/compiler/jsFileCompilationWithMapFileAsJsWithOutDir.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js,map +// @allowJs: true,map // @sourcemap: true // @outdir: out diff --git a/tests/cases/compiler/jsFileCompilationWithOut.ts b/tests/cases/compiler/jsFileCompilationWithOut.ts index 595cba8ffd3c6..f76605b7fe621 100644 --- a/tests/cases/compiler/jsFileCompilationWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationWithOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: out.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts index ce97a6635c585..1641024400402 100644 --- a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts +++ b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @out: tests/cases/compiler/b.js // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationWithoutOut.ts b/tests/cases/compiler/jsFileCompilationWithoutOut.ts index 6cc6c7b50b1ea..667315a55a9c1 100644 --- a/tests/cases/compiler/jsFileCompilationWithoutOut.ts +++ b/tests/cases/compiler/jsFileCompilationWithoutOut.ts @@ -1,4 +1,4 @@ -// @jsExtensions: js +// @allowJs: true // @filename: a.ts class c { } diff --git a/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts b/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts index 138b4de6f46fa..07f6316e4dd54 100644 --- a/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts +++ b/tests/cases/fourslash/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.ts @@ -1,7 +1,7 @@ /// // @BaselineFile: compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline -// @jsExtensions: js +// @allowJs: true // @Filename: b.js // @emitThisFile: true ////function foo() { } // This has error because js file cannot be overwritten - emitSkipped should be true diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts index 6ac9defb7d5ab..f94e15aee62b7 100644 --- a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts @@ -2,7 +2,7 @@ // @declaration: true // @out: out.js -// @jsExtensions: js +// @allowJs: true // @Filename: b.js // @emitThisFile: true ////function foo() { return 10; }/*1*/ diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json similarity index 81% rename from tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json index 50cd978a7126e..c25902b499e34 100644 --- a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesNotSpecifiedWithJsExtensions" + "project": "DifferentNamesNotSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json similarity index 81% rename from tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json index a15686497c5df..7e48c8b32d1dd 100644 --- a/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "DifferentNamesSpecifiedWithJsExtensions" + "project": "DifferentNamesSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json similarity index 83% rename from tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json index f0341ee905fa0..9990f37cbd6dc 100644 --- a/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsSpecifiedWithJsExtensions" + "project": "SameNameDTsSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json similarity index 82% rename from tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json index 4ce47779ea409..b96d4e758ff58 100644 --- a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameDTsNotSpecifiedWithJsExtensions" + "project": "SameNameDTsNotSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json similarity index 81% rename from tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json index d151f7d499f4d..badca871288b4 100644 --- a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameFilesNotSpecifiedWithJsExtensions" + "project": "SameNameFilesNotSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json b/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json similarity index 83% rename from tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json rename to tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json index da24d83de8473..d3176d3f60700 100644 --- a/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithJsExtensions.json +++ b/tests/cases/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.json @@ -3,5 +3,5 @@ "projectRoot": "tests/cases/projects/jsFileCompilation", "baselineCheck": true, "declaration": true, - "project": "SameNameTsSpecifiedWithJsExtensions" + "project": "SameNameTsSpecifiedWithAllowJs" } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/a.ts rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/a.ts diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/b.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/b.js rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/b.js diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json similarity index 60% rename from tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json rename to tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json index b3fb530a291c9..167eaebec3ad9 100644 --- a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithJsExtensions/tsconfig.json +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { "out": "test.js", - "jsExtensions": [ "js" ] + "allowJs": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/a.ts rename to tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/a.ts diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/b.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/b.js rename to tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/b.js diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json similarity index 70% rename from tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json rename to tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json index f52029d734ee8..1a5a6f6189fc0 100644 --- a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithJsExtensions/tsconfig.json +++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "out": "test.js", - "jsExtensions": [ "js" ] + "allowJs": true }, "files": [ "a.ts", "b.js" ] } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.d.ts rename to tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/a.d.ts diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/a.js rename to tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json new file mode 100644 index 0000000000000..05e6c95dddf65 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "allowJs": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index e14243307e2f2..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDTsNotSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/a.d.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.d.ts rename to tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/a.d.ts diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/a.js rename to tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/tsconfig.json new file mode 100644 index 0000000000000..44fcccf5b22bd --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithAllowJs/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": { "allowJs": true }, + "files": [ "a.d.ts" ] +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index de14c20c66291..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameDTsSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "compilerOptions": { "jsExtensions": [ "js" ] }, - "files": [ "a.d.ts" ] -} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.js rename to tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/a.ts rename to tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/a.ts diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json new file mode 100644 index 0000000000000..05e6c95dddf65 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json @@ -0,0 +1 @@ +{ "compilerOptions": { "allowJs": true } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index e14243307e2f2..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{ "compilerOptions": { "jsExtensions": [ "js" ] } } \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/a.js similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.js rename to tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/a.js diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/a.ts similarity index 100% rename from tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/a.ts rename to tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/a.ts diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/tsconfig.json new file mode 100644 index 0000000000000..cbc35e9b9dbc8 --- /dev/null +++ b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithAllowJs/tsconfig.json @@ -0,0 +1,4 @@ +{ + "compilerOptions": { "allowJs": true }, + "files": [ "a.ts" ] +} \ No newline at end of file diff --git a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json deleted file mode 100644 index 8f3028a8ad177..0000000000000 --- a/tests/cases/projects/jsFileCompilation/SameNameTsSpecifiedWithJsExtensions/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "compilerOptions": { "jsExtensions": [ "js" ] }, - "files": [ "a.ts" ] -} \ No newline at end of file From ea57efa430f06c3ee439af4a7dd011897ac9cc51 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 14:09:03 -0700 Subject: [PATCH 106/353] Test baseline update because .map cannot be a valid js file anymore --- ...sFileCompilationWithMapFileAsJs.errors.txt | 4 +- .../jsFileCompilationWithMapFileAsJs.js | 5 +- .../jsFileCompilationWithMapFileAsJs.js.map | 3 +- ...leCompilationWithMapFileAsJs.sourcemap.txt | 28 +--------- ...hMapFileAsJsWithInlineSourceMap.errors.txt | 2 + ...ationWithMapFileAsJsWithInlineSourceMap.js | 5 +- ...pFileAsJsWithInlineSourceMap.sourcemap.txt | 28 +--------- ...lationWithMapFileAsJsWithOutDir.errors.txt | 18 +++++++ ...ileCompilationWithMapFileAsJsWithOutDir.js | 8 +-- ...ompilationWithMapFileAsJsWithOutDir.js.map | 4 +- ...ionWithMapFileAsJsWithOutDir.sourcemap.txt | 54 +------------------ ...mpilationWithMapFileAsJsWithOutDir.symbols | 15 ------ ...CompilationWithMapFileAsJsWithOutDir.types | 15 ------ 13 files changed, 30 insertions(+), 159 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt index 2fdce65a6ab3d..aaeb023dbdb22 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt @@ -1,9 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -error TS5055: Cannot write file 'tests/cases/compiler/b.js.map' which is one of the input files. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js.map' which is one of the input files. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js index ce13bf9d3f1c9..a5351de087c7d 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js @@ -19,7 +19,4 @@ var c = (function () { } return c; })(); -//# sourceMappingURL=a.js.map//// [b.js.js] -function foo() { -} -//# sourceMappingURL=b.js.js.map \ No newline at end of file +//# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map index 54e54c5044a61..8692bc0bab3a7 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map @@ -1,3 +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"}//// [b.js.js.map] -{"version":3,"file":"b.js.js","sourceRoot":"","sources":["b.js.map"],"names":["foo"],"mappings":"AAAA;AACAA,CAACA"} \ No newline at end of file +{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["c","c.constructor"],"mappings":"AACA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt index edb8c42874411..bba59e2b1785b 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt @@ -55,30 +55,4 @@ sourceFile:a.ts 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) --- ->>>//# sourceMappingURL=a.js.map=================================================================== -JsFile: b.js.js -mapUrl: b.js.js.map -sourceRoot: -sources: b.js.map -=================================================================== -------------------------------------------------------------------- -emittedFile:tests/cases/compiler/b.js.js -sourceFile:b.js.map -------------------------------------------------------------------- ->>>function foo() { -1 > -2 >^^-> -1 > -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) ---- ->>>} -1-> -2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->function foo() { - > -2 >} -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) -2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) ---- ->>>//# sourceMappingURL=b.js.js.map \ No newline at end of file +>>>//# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt index 35cc5dace16c1..aaeb023dbdb22 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt @@ -1,7 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js index 2c9cc66836a89..e89e5d61e42d1 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js @@ -19,7 +19,4 @@ var c = (function () { } return c; })(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9//// [b.js.js] -function foo() { -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9 \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt index 972c350c8e755..ed64295bcb8b4 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt @@ -55,30 +55,4 @@ sourceFile:a.ts 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) --- ->>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9=================================================================== -JsFile: b.js.js -mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== -sourceRoot: -sources: b.js.map -=================================================================== -------------------------------------------------------------------- -emittedFile:tests/cases/compiler/b.js.js -sourceFile:b.js.map -------------------------------------------------------------------- ->>>function foo() { -1 > -2 >^^-> -1 > -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) ---- ->>>} -1-> -2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->function foo() { - > -2 >} -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) -2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) ---- ->>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYi5qcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImIuanMubWFwIl0sIm5hbWVzIjpbImZvbyJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQUEsQ0FBQ0EifQ== \ No newline at end of file +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9 \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt new file mode 100644 index 0000000000000..81d9b67d33403 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt @@ -0,0 +1,18 @@ +error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. + + +!!! error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +==== tests/cases/compiler/a.ts (0 errors) ==== + + class c { + } + +==== tests/cases/compiler/b.js.map (0 errors) ==== + function foo() { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js index d0a35eb15f1d9..742e7af2799b6 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js @@ -19,10 +19,4 @@ var c = (function () { } return c; })(); -//# sourceMappingURL=a.js.map//// [b.js.js] -function foo() { -} -//# sourceMappingURL=b.js.js.map//// [b.js] -function bar() { -} -//# sourceMappingURL=b.js.map \ No newline at end of file +//# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map index ef19d2fc517c6..9a3b0f30f85e0 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map @@ -1,4 +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"}//// [b.js.js.map] -{"version":3,"file":"b.js.js","sourceRoot":"","sources":["../tests/cases/compiler/b.js.map"],"names":["foo"],"mappings":"AAAA;AACAA,CAACA"}//// [b.js.map] -{"version":3,"file":"b.js","sourceRoot":"","sources":["../tests/cases/compiler/b.js"],"names":["bar"],"mappings":"AAAA;AACAA,CAACA"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt index c3fb335e3741b..32a123d434d73 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt @@ -55,56 +55,4 @@ sourceFile:../tests/cases/compiler/a.ts 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) --- ->>>//# sourceMappingURL=a.js.map=================================================================== -JsFile: b.js.js -mapUrl: b.js.js.map -sourceRoot: -sources: ../tests/cases/compiler/b.js.map -=================================================================== -------------------------------------------------------------------- -emittedFile:out/b.js.js -sourceFile:../tests/cases/compiler/b.js.map -------------------------------------------------------------------- ->>>function foo() { -1 > -2 >^^-> -1 > -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) ---- ->>>} -1-> -2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->function foo() { - > -2 >} -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (foo) -2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (foo) ---- ->>>//# sourceMappingURL=b.js.js.map=================================================================== -JsFile: b.js -mapUrl: b.js.map -sourceRoot: -sources: ../tests/cases/compiler/b.js -=================================================================== -------------------------------------------------------------------- -emittedFile:out/b.js -sourceFile:../tests/cases/compiler/b.js -------------------------------------------------------------------- ->>>function bar() { -1 > -2 >^^-> -1 > -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) ---- ->>>} -1-> -2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->function bar() { - > -2 >} -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) name (bar) -2 >Emitted(2, 2) Source(2, 2) + SourceIndex(0) name (bar) ---- ->>>//# sourceMappingURL=b.js.map \ No newline at end of file +>>>//# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols deleted file mode 100644 index 9974960bd2dbd..0000000000000 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.symbols +++ /dev/null @@ -1,15 +0,0 @@ -=== tests/cases/compiler/a.ts === - -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.js.map === -function foo() { ->foo : Symbol(foo, Decl(b.js.map, 0, 0)) -} - -=== tests/cases/compiler/b.js === -function bar() { ->bar : Symbol(bar, Decl(b.js, 0, 0)) -} diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types deleted file mode 100644 index e4534a4cfd42d..0000000000000 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.types +++ /dev/null @@ -1,15 +0,0 @@ -=== tests/cases/compiler/a.ts === - -class c { ->c : c -} - -=== tests/cases/compiler/b.js.map === -function foo() { ->foo : () => void -} - -=== tests/cases/compiler/b.js === -function bar() { ->bar : () => void -} From a8eb76fde13d15dd0de8a0b670abc6cf2eed95b7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 15:26:48 -0700 Subject: [PATCH 107/353] Remove the logic for parsing compilation of comma seperated list of strings on command line Also removed logic to accept multiple values for the option --- src/compiler/commandLineParser.ts | 154 ++++++++---------------------- src/compiler/tsc.ts | 8 +- src/compiler/types.ts | 6 +- src/harness/harness.ts | 28 +++--- src/harness/projectsRunner.ts | 28 +++--- 5 files changed, 77 insertions(+), 147 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 8bc95d4e31bee..d1a6e56d8184d 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -312,23 +312,31 @@ namespace ts { if (hasProperty(optionNameMap, s)) { let opt = optionNameMap[s]; - if (opt.type === "boolean") { - // This needs to be treated specially since it doesnt accept argument - options[opt.name] = true; + // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). + if (!args[i] && opt.type !== "boolean") { + errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); } - else { - // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). - if (!args[i]) { - errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); - } - let { hasError, value} = parseOption(opt, args[i++], options[opt.name]); - if (hasError) { - errors.push(createCompilerDiagnostic((opt).error)); - } - else { - options[opt.name] = value; - } + switch (opt.type) { + case "number": + options[opt.name] = parseInt(args[i++]); + break; + case "boolean": + options[opt.name] = true; + break; + case "string": + options[opt.name] = args[i++] || ""; + break; + // If not a primitive, the possible types are specified in what is effectively a map of options. + default: + let map = >opt.type; + let key = (args[i++] || "").toLowerCase(); + if (hasProperty(map, key)) { + options[opt.name] = map[key]; + } + else { + errors.push(createCompilerDiagnostic((opt).error)); + } } } else { @@ -375,68 +383,6 @@ namespace ts { } } - /** - * Parses non quoted strings separated by comma e.g. "a,b" would result in string array ["a", "b"] - * @param s - * @param existingValue - */ - function parseMultiValueStringArray(s: string, existingValue: string[]) { - let value: string[] = existingValue || []; - let hasError = false; - let currentString = ""; - if (s) { - for (let i = 0; i < s.length; i++) { - let ch = s.charCodeAt(i); - if (ch === CharacterCodes.comma) { - pushCurrentStringToResult(); - } - else { - currentString += s.charAt(i); - } - } - // push last string - pushCurrentStringToResult(); - } - return { value, hasError }; - - function pushCurrentStringToResult() { - if (currentString) { - value.push(currentString); - currentString = ""; - } - else { - hasError = true; - } - } - } - - /* @internal */ - export function parseOption(option: CommandLineOption, stringValue: string, existingValue: CompilerOptionsValueType) { - let hasError: boolean; - let value: CompilerOptionsValueType; - switch (option.type) { - case "number": - value = parseInt(stringValue); - break; - case "string": - value = stringValue || ""; - break; - case "string[]": - return parseMultiValueStringArray(stringValue, existingValue); - // If not a primitive, the possible types are specified in what is effectively a map of options. - default: - let map = >option.type; - let key = (stringValue || "").toLowerCase(); - if (hasProperty(map, key)) { - value = map[key]; - } - else { - hasError = true; - } - } - return { hasError, value }; - } - /** * Read tsconfig.json file * @param fileName The path to the config file @@ -466,44 +412,11 @@ namespace ts { } } - /* @internal */ - export function parseJsonCompilerOption(opt: CommandLineOption, jsonValue: any, errors: Diagnostic[]) { - let optType = opt.type; - let expectedType = typeof optType === "string" ? optType : "string"; - let hasValidValue = true; - if (typeof jsonValue === expectedType) { - if (typeof optType !== "string") { - let key = jsonValue.toLowerCase(); - if (hasProperty(optType, key)) { - jsonValue = optType[key]; - } - else { - errors.push(createCompilerDiagnostic((opt).error)); - jsonValue = 0; - } - } - } - // Check if the value asked was string[] and value provided was not string[] - else if (expectedType !== "string[]" || - !(jsonValue instanceof Array) || - forEach(jsonValue, individualValue => typeof individualValue !== "string")) { - // Not expectedType - errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType)); - hasValidValue = false; - } - - return { - value: jsonValue, - hasValidValue - }; - } - /** * Parse the contents of a config file (tsconfig.json). * @param json The contents of the config file to parse * @param basePath A root directory to resolve relative path entries in the config * file to. e.g. outDir - * @param existingOptions optional existing options to extend into */ export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}): ParsedCommandLine { let errors: Diagnostic[] = []; @@ -526,16 +439,31 @@ namespace ts { for (let id in jsonOptions) { if (hasProperty(optionNameMap, id)) { let opt = optionNameMap[id]; - let { hasValidValue, value } = parseJsonCompilerOption(opt, jsonOptions[id], errors); - if (hasValidValue) { + let optType = opt.type; + let value = jsonOptions[id]; + let expectedType = typeof optType === "string" ? optType : "string"; + if (typeof value === expectedType) { + if (typeof optType !== "string") { + let key = value.toLowerCase(); + if (hasProperty(optType, key)) { + value = optType[key]; + } + else { + errors.push(createCompilerDiagnostic((opt).error)); + value = 0; + } + } if (opt.isFilePath) { - value = normalizePath(combinePaths(basePath, value)); + value = normalizePath(combinePaths(basePath, value)); if (value === "") { value = "."; } } options[opt.name] = value; } + else { + errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType)); + } } else { errors.push(createCompilerDiagnostic(Diagnostics.Unknown_compiler_option_0, id)); diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index e05f4f3f5dbd4..90e15d61c46db 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -588,8 +588,8 @@ namespace ts { return; - function serializeCompilerOptions(options: CompilerOptions): Map { - let result: Map = {}; + function serializeCompilerOptions(options: CompilerOptions): Map { + let result: Map = {}; let optionsNameMap = getOptionNameMap().optionNameMap; for (let name in options) { @@ -606,8 +606,8 @@ namespace ts { let optionDefinition = optionsNameMap[name.toLowerCase()]; if (optionDefinition) { if (typeof optionDefinition.type === "string") { - // string, number, boolean or string[] - result[name] = value; + // string, number or boolean + result[name] = value; } else { // Enum diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 15caa8b529c17..5d41a60526a6f 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2095,11 +2095,9 @@ namespace ts { // Skip checking lib.d.ts to help speed up tests. /* @internal */ skipDefaultLibCheck?: boolean; - [option: string]: CompilerOptionsValueType; + [option: string]: string | number | boolean; } - export type CompilerOptionsValueType = string | number | boolean | string[]; - export const enum ModuleKind { None = 0, CommonJS = 1, @@ -2166,7 +2164,7 @@ namespace ts { /* @internal */ export interface CommandLineOptionOfCustomType extends CommandLineOptionBase { - type: Map | string; // an object literal mapping named values to actual values | string if it is string[] + type: Map; // an object literal mapping named values to actual values error: DiagnosticMessage; // The error given when the argument does not fit a customized 'type' } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index fab3f649f2afa..7fac374c09cb4 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1006,17 +1006,23 @@ namespace Harness { } let option = getCommandLineOption(name); if (option) { - if (option.type === "boolean") { - options[option.name] = value.toLowerCase() === "true"; - } - else { - let { hasError, value: parsedValue } = ts.parseOption(option, value, options[option.name]); - if (hasError) { - throw new Error(`Unknown value '${value}' for compiler option '${name}'.`); - } - else { - options[option.name] = parsedValue; - } + switch (option.type) { + case "boolean": + options[option.name] = value.toLowerCase() === "true"; + break; + case "string": + options[option.name] = value; + break; + // If not a primitive, the possible types are specified in what is effectively a map of options. + default: + let map = >option.type; + let key = value.toLowerCase(); + if (ts.hasProperty(map, key)) { + options[option.name] = map[key]; + } + else { + throw new Error(`Unknown value '${value}' for compiler option '${name}'.`); + } } } else { diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 51b8ddbf86eeb..f596b421e183f 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -3,7 +3,7 @@ /* tslint:disable:no-null */ // Test case is json of below type in tests/cases/project/ -interface ProjectRunnerTestCase extends ts.CompilerOptions { +interface ProjectRunnerTestCase { scenario: string; projectRoot: string; // project where it lives - this also is the current directory when compiling inputFiles: string[]; // list of input files to be given to program @@ -51,7 +51,7 @@ class ProjectRunner extends RunnerBase { } private runProjectTestCase(testCaseFileName: string) { - let testCase: ProjectRunnerTestCase; + let testCase: ProjectRunnerTestCase & ts.CompilerOptions; let testFileText: string = null; try { @@ -62,7 +62,7 @@ class ProjectRunner extends RunnerBase { } try { - testCase = JSON.parse(testFileText); + testCase = JSON.parse(testFileText); } catch (e) { assert(false, "Testcase: " + testCaseFileName + " does not contain valid json format: " + e.message); @@ -183,13 +183,7 @@ class ProjectRunner extends RunnerBase { let outputFiles: BatchCompileProjectTestCaseEmittedFile[] = []; let inputFiles = testCase.inputFiles; - let { errors, compilerOptions } = createCompilerOptions(); - if (errors.length) { - return { - moduleKind, - errors - }; - } + let compilerOptions = createCompilerOptions(); let configFileName: string; if (compilerOptions.project) { @@ -240,7 +234,6 @@ class ProjectRunner extends RunnerBase { module: moduleKind, moduleResolution: ts.ModuleResolutionKind.Classic, // currently all tests use classic module resolution kind, this will change in the future }; - let errors: ts.Diagnostic[] = []; // Set the values specified using json let optionNameMap: ts.Map = {}; ts.forEach(ts.optionDeclarations, option => { @@ -249,14 +242,19 @@ class ProjectRunner extends RunnerBase { for (let name in testCase) { if (name !== "mapRoot" && name !== "sourceRoot" && ts.hasProperty(optionNameMap, name)) { let option = optionNameMap[name]; - let { hasValidValue, value } = ts.parseJsonCompilerOption(option, testCase[name], errors); - if (hasValidValue) { - compilerOptions[option.name] = value; + let optType = option.type; + let value = testCase[name]; + if (typeof optType !== "string") { + let key = value.toLowerCase(); + if (ts.hasProperty(optType, key)) { + value = optType[key]; + } } + compilerOptions[option.name] = value; } } - return { errors, compilerOptions }; + return compilerOptions; } function getFileNameInTheProjectTest(fileName: string): string { From 45b995d03083e1624f07e300cd29bb66ef8edb5b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 15:45:00 -0700 Subject: [PATCH 108/353] Remove extensions doesnt need to depend on compiler options any more --- src/compiler/binder.ts | 8 ++++---- src/compiler/checker.ts | 2 +- src/compiler/core.ts | 6 ++---- src/compiler/utilities.ts | 13 ++++--------- src/harness/harness.ts | 2 +- src/harness/projectsRunner.ts | 6 +++--- src/harness/test262Runner.ts | 2 +- src/services/navigationBar.ts | 2 +- tests/cases/unittests/transpile.ts | 2 +- 9 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 2b9183e711578..c12a9afad62ae 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -77,13 +77,13 @@ namespace ts { IsContainerWithLocals = IsContainer | HasLocals } - export function bindSourceFile(file: SourceFile, compilerOptions: CompilerOptions) { + export function bindSourceFile(file: SourceFile) { let start = new Date().getTime(); - bindSourceFileWorker(file, compilerOptions); + bindSourceFileWorker(file); bindTime += new Date().getTime() - start; } - function bindSourceFileWorker(file: SourceFile, compilerOptions: CompilerOptions) { + function bindSourceFileWorker(file: SourceFile) { let parent: Node; let container: Node; let blockScopeContainer: Node; @@ -949,7 +949,7 @@ namespace ts { function bindSourceFileIfExternalModule() { setExportContextFlag(file); if (isExternalModule(file)) { - bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName, getSupportedExtensions(compilerOptions))}"`); + bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName)}"`); } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ec9a8e67f2fe1..c329ff729f95f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14871,7 +14871,7 @@ namespace ts { function initializeTypeChecker() { // Bind all source files and propagate errors forEach(host.getSourceFiles(), file => { - bindSourceFile(file, compilerOptions); + bindSourceFile(file); }); // Initialize global symbol table diff --git a/src/compiler/core.ts b/src/compiler/core.ts index bb07062ec573c..26e53aebab1ba 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -747,10 +747,8 @@ namespace ts { return false; } - export function removeFileExtension(path: string, supportedExtensions: string[]): string { - // Sort the extensions in descending order of their length - let extensionsToRemove = supportedExtensions.slice(0, supportedExtensions.length) // Get duplicate array - .sort((ext1, ext2) => compareValues(ext2.length, ext1.length)); // Sort in descending order of extension length + export const extensionsToRemove = ["d.ts", "ts", "js", "tsx", "jsx"]; + export function removeFileExtension(path: string): string { for (let ext of extensionsToRemove) { if (fileExtensionIs(path, ext)) { return path.substr(0, path.length - ext.length - 1); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index b889e8b119d84..7c88e1a941796 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1759,19 +1759,14 @@ namespace ts { }; } - export function getExtensionsToRemoveForEmitPath(compilerOptons: CompilerOptions) { - return getSupportedExtensions(compilerOptons).concat("jsx", "js"); - } - export function getOwnEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost, extension: string) { let compilerOptions = host.getCompilerOptions(); let emitOutputFilePathWithoutExtension: string; if (compilerOptions.outDir) { - emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir), - getExtensionsToRemoveForEmitPath(compilerOptions)); + emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir)); } else { - emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName, getExtensionsToRemoveForEmitPath(compilerOptions)); + emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName); } return emitOutputFilePathWithoutExtension + extension; @@ -1816,7 +1811,7 @@ namespace ts { } function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) { - return options.declaration ? removeFileExtension(jsFilePath, getExtensionsToRemoveForEmitPath(options)) + ".d.ts" : undefined; + return options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined; } export function hasFile(sourceFiles: SourceFile[], fileName: string) { @@ -2144,7 +2139,7 @@ namespace ts { export function isJavaScript(fileName: string) { // Treat file as typescript if the extension is not supportedTypeScript - return hasExtension(fileName) && !forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension)); + return hasExtension(fileName) && forEach(supportedJavascriptExtensions, extension => fileExtensionIs(fileName, extension)); } export function isTsx(fileName: string) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 7fac374c09cb4..f19ed70b40d9a 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1193,7 +1193,7 @@ namespace Harness { sourceFileName = outFile; } - let dTsFileName = ts.removeFileExtension(sourceFileName, ts.getExtensionsToRemoveForEmitPath(options)) + ".d.ts"; + let dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts"; return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); } diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index f596b421e183f..286409672d0f7 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -354,17 +354,17 @@ class ProjectRunner extends RunnerBase { if (compilerOptions.outDir) { let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, compilerResult.program.getCurrentDirectory()); sourceFilePath = sourceFilePath.replace(compilerResult.program.getCommonSourceDirectory(), ""); - emitOutputFilePathWithoutExtension = ts.removeFileExtension(ts.combinePaths(compilerOptions.outDir, sourceFilePath), ts.getExtensionsToRemoveForEmitPath(compilerOptions)); + emitOutputFilePathWithoutExtension = ts.removeFileExtension(ts.combinePaths(compilerOptions.outDir, sourceFilePath)); } else { - emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName, ts.getExtensionsToRemoveForEmitPath(compilerOptions)); + emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName); } let outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts"; allInputFiles.unshift(findOutpuDtsFile(outputDtsFileName)); } else { - let outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out, ts.getExtensionsToRemoveForEmitPath(compilerOptions)) + ".d.ts"; + let outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts"; let outputDtsFile = findOutpuDtsFile(outputDtsFileName); if (!ts.contains(allInputFiles, outputDtsFile)) { allInputFiles.unshift(outputDtsFile); diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts index 1e95fc4ae74f1..491c71a5839e4 100644 --- a/src/harness/test262Runner.ts +++ b/src/harness/test262Runner.ts @@ -37,7 +37,7 @@ class Test262BaselineRunner extends RunnerBase { before(() => { let content = Harness.IO.readFile(filePath); - let testFilename = ts.removeFileExtension(filePath, ["js"]).replace(/\//g, "_") + ".test"; + let testFilename = ts.removeFileExtension(filePath).replace(/\//g, "_") + ".test"; let testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, testFilename); let inputFiles = testCaseContent.testUnitData.map(unit => { diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index 5dbc514d46205..46ec807a881dd 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -442,7 +442,7 @@ namespace ts.NavigationBar { hasGlobalNode = true; let rootName = isExternalModule(node) - ? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName), getSupportedExtensions(compilerOptions)))) + "\"" + ? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName)))) + "\"" : "" return getNavigationBarItem(rootName, diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index 06949e174c17a..1d688f091a467 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -64,7 +64,7 @@ module ts { let transpileModuleResultWithSourceMap = transpileModule(input, transpileOptions); assert.isTrue(transpileModuleResultWithSourceMap.sourceMapText !== undefined); - let expectedSourceMapFileName = removeFileExtension(getBaseFileName(normalizeSlashes(transpileOptions.fileName)), ts.getExtensionsToRemoveForEmitPath(transpileOptions.compilerOptions)) + ".js.map"; + let expectedSourceMapFileName = removeFileExtension(getBaseFileName(normalizeSlashes(transpileOptions.fileName))) + ".js.map"; let expectedSourceMappingUrlLine = `//# sourceMappingURL=${expectedSourceMapFileName}`; if (testSettings.expectedOutput !== undefined) { From febda00f1b430761df7e0e90bbb99cf8c99e4653 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 28 Oct 2015 16:06:40 -0700 Subject: [PATCH 109/353] Improve type narrowing algorithm with typeof --- src/compiler/checker.ts | 35 +++---- tests/baselines/reference/symbolType18.types | 2 +- tests/baselines/reference/typeGuardNesting.js | 11 +++ .../reference/typeGuardNesting.symbols | 14 +++ .../reference/typeGuardNesting.types | 30 ++++++ .../typeGuardOfFormTypeOfOther.types | 12 +-- .../reference/typeGuardRedundancy.js | 17 ++++ .../reference/typeGuardRedundancy.symbols | 48 ++++++++++ .../reference/typeGuardRedundancy.types | 84 ++++++++++++++++ .../reference/typeGuardsWithAny.errors.txt | 49 ---------- .../reference/typeGuardsWithAny.symbols | 61 ++++++++++++ .../reference/typeGuardsWithAny.types | 96 +++++++++++++++++++ 12 files changed, 382 insertions(+), 77 deletions(-) create mode 100644 tests/baselines/reference/typeGuardNesting.js create mode 100644 tests/baselines/reference/typeGuardNesting.symbols create mode 100644 tests/baselines/reference/typeGuardNesting.types create mode 100644 tests/baselines/reference/typeGuardRedundancy.js create mode 100644 tests/baselines/reference/typeGuardRedundancy.symbols create mode 100644 tests/baselines/reference/typeGuardRedundancy.types delete mode 100644 tests/baselines/reference/typeGuardsWithAny.errors.txt create mode 100644 tests/baselines/reference/typeGuardsWithAny.symbols create mode 100644 tests/baselines/reference/typeGuardsWithAny.types diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 033614d2b419b..ad6e72d68bdd9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6338,6 +6338,10 @@ namespace ts { // Stop at the first containing function or module declaration break loop; } + // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type + if (narrowedType === getUnionType(emptyArray)) { + narrowedType = type; + } // Use narrowed type if construct contains no assignments to variable if (narrowedType !== type) { if (isVariableAssignedWithin(symbol, node)) { @@ -6352,6 +6356,9 @@ namespace ts { return type; function narrowTypeByEquality(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type { + if (!(type.flags & TypeFlags.Union)) { + return type; + } // Check that we have 'typeof ' on the left and string literal on the right if (expr.left.kind !== SyntaxKind.TypeOfExpression || expr.right.kind !== SyntaxKind.StringLiteral) { return type; @@ -6361,31 +6368,17 @@ namespace ts { if (left.expression.kind !== SyntaxKind.Identifier || getResolvedSymbol(left.expression) !== symbol) { return type; } - let typeInfo = primitiveTypeInfo[right.text]; if (expr.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken) { assumeTrue = !assumeTrue; } + let typeInfo = primitiveTypeInfo[right.text]; + let flags = typeInfo ? typeInfo.flags : (assumeTrue = !assumeTrue, TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.ESSymbol | TypeFlags.Boolean); + let union = type as UnionType; if (assumeTrue) { - // Assumed result is true. If check was not for a primitive type, remove all primitive types - if (!typeInfo) { - return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean | TypeFlags.ESSymbol, - /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ true); - } - // Check was for a primitive type, return that primitive type if it is a subtype - if (isTypeSubtypeOf(typeInfo.type, type)) { - return typeInfo.type; - } - // Otherwise, remove all types that aren't of the primitive type kind. This can happen when the type is - // union of enum types and other types. - return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false, /*allowEmptyUnionResult*/ true); + return getUnionType(filter(union.types, t => !!(t.flags & flags))); } else { - // Assumed result is false. If check was for a primitive type, remove that primitive type - if (typeInfo) { - return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ true); - } - // Otherwise we don't have enough information to do anything. - return type; + return getUnionType(filter(union.types, t => !(t.flags & flags))); } } @@ -6399,7 +6392,7 @@ namespace ts { // and the second operand was false. We narrow with those assumptions and union the two resulting types. return getUnionType([ narrowType(type, expr.left, /*assumeTrue*/ false), - narrowType(narrowType(type, expr.left, /*assumeTrue*/ true), expr.right, /*assumeTrue*/ false) + narrowType(type, expr.right, /*assumeTrue*/ false) ]); } } @@ -6410,7 +6403,7 @@ namespace ts { // and the second operand was true. We narrow with those assumptions and union the two resulting types. return getUnionType([ narrowType(type, expr.left, /*assumeTrue*/ true), - narrowType(narrowType(type, expr.left, /*assumeTrue*/ false), expr.right, /*assumeTrue*/ true) + narrowType(type, expr.right, /*assumeTrue*/ true) ]); } else { diff --git a/tests/baselines/reference/symbolType18.types b/tests/baselines/reference/symbolType18.types index db4fb30378fca..68c43215136fa 100644 --- a/tests/baselines/reference/symbolType18.types +++ b/tests/baselines/reference/symbolType18.types @@ -21,5 +21,5 @@ if (typeof x === "object") { } else { x; ->x : symbol | Foo +>x : symbol } diff --git a/tests/baselines/reference/typeGuardNesting.js b/tests/baselines/reference/typeGuardNesting.js new file mode 100644 index 0000000000000..4c9a64c2851f5 --- /dev/null +++ b/tests/baselines/reference/typeGuardNesting.js @@ -0,0 +1,11 @@ +//// [typeGuardNesting.ts] +let strOrBool: string|boolean; +if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { + var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; +} + +//// [typeGuardNesting.js] +var strOrBool; +if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { + var label = (typeof strOrBool === 'string') ? strOrBool : "other string"; +} diff --git a/tests/baselines/reference/typeGuardNesting.symbols b/tests/baselines/reference/typeGuardNesting.symbols new file mode 100644 index 0000000000000..f0cfb1f1eed6f --- /dev/null +++ b/tests/baselines/reference/typeGuardNesting.symbols @@ -0,0 +1,14 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts === +let strOrBool: string|boolean; +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + +if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; +>label : Symbol(label, Decl(typeGuardNesting.ts, 2, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +} diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types new file mode 100644 index 0000000000000..9f79974635dff --- /dev/null +++ b/tests/baselines/reference/typeGuardNesting.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts === +let strOrBool: string|boolean; +>strOrBool : string | boolean + +if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { +>(typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string' : boolean +>(typeof strOrBool === 'boolean' && !strOrBool) : boolean +>typeof strOrBool === 'boolean' && !strOrBool : boolean +>typeof strOrBool === 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : string | boolean +>'boolean' : string +>!strOrBool : boolean +>strOrBool : boolean +>typeof strOrBool === 'string' : boolean +>typeof strOrBool : string +>strOrBool : string | boolean +>'string' : string + + var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; +>label : string +>(typeof strOrBool === 'string') ? strOrBool : "other string" : string +>(typeof strOrBool === 'string') : boolean +>typeof strOrBool === 'string' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'string' : string +>strOrBool : string +>"other string" : string +} diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types index e0fd443ef6391..8150c3ec25d5a 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types @@ -63,7 +63,7 @@ else { var r2: string | C = strOrC; // string | C >r2 : string | C >C : C ->strOrC : string | C +>strOrC : string } if (typeof numOrC === "Object") { >typeof numOrC === "Object" : boolean @@ -80,7 +80,7 @@ else { var r3: number | C = numOrC; // number | C >r3 : number | C >C : C ->numOrC : number | C +>numOrC : number } if (typeof boolOrC === "Object") { >typeof boolOrC === "Object" : boolean @@ -97,7 +97,7 @@ else { var r4: boolean | C = boolOrC; // boolean | C >r4 : boolean | C >C : C ->boolOrC : boolean | C +>boolOrC : boolean } // Narrowing occurs only if target type is a subtype of variable type @@ -129,7 +129,7 @@ if (typeof strOrC !== "Object") { var r2: string | C = strOrC; // string | C >r2 : string | C >C : C ->strOrC : string | C +>strOrC : string } else { c = strOrC; // C @@ -146,7 +146,7 @@ if (typeof numOrC !== "Object") { var r3: number | C = numOrC; // number | C >r3 : number | C >C : C ->numOrC : number | C +>numOrC : number } else { c = numOrC; // C @@ -163,7 +163,7 @@ if (typeof boolOrC !== "Object") { var r4: boolean | C = boolOrC; // boolean | C >r4 : boolean | C >C : C ->boolOrC : boolean | C +>boolOrC : boolean } else { c = boolOrC; // C diff --git a/tests/baselines/reference/typeGuardRedundancy.js b/tests/baselines/reference/typeGuardRedundancy.js new file mode 100644 index 0000000000000..1dfa964cbc981 --- /dev/null +++ b/tests/baselines/reference/typeGuardRedundancy.js @@ -0,0 +1,17 @@ +//// [typeGuardRedundancy.ts] +var x: string|number; + +var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; + +var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr; + +var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; + +var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr; + +//// [typeGuardRedundancy.js] +var x; +var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; +var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr; +var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; +var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr; diff --git a/tests/baselines/reference/typeGuardRedundancy.symbols b/tests/baselines/reference/typeGuardRedundancy.symbols new file mode 100644 index 0000000000000..356061407ad6c --- /dev/null +++ b/tests/baselines/reference/typeGuardRedundancy.symbols @@ -0,0 +1,48 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts === +var x: string|number; +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) + +var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; +>r1 : Symbol(r1, Decl(typeGuardRedundancy.ts, 2, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr; +>r2 : Symbol(r2, Decl(typeGuardRedundancy.ts, 4, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) + +var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; +>r3 : Symbol(r3, Decl(typeGuardRedundancy.ts, 6, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr; +>r4 : Symbol(r4, Decl(typeGuardRedundancy.ts, 8, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x.substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(typeGuardRedundancy.ts, 0, 3)) +>substr : Symbol(String.substr, Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/typeGuardRedundancy.types b/tests/baselines/reference/typeGuardRedundancy.types new file mode 100644 index 0000000000000..1507ceb850ef3 --- /dev/null +++ b/tests/baselines/reference/typeGuardRedundancy.types @@ -0,0 +1,84 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardRedundancy.ts === +var x: string|number; +>x : string | number + +var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; +>r1 : (from: number, length?: number) => string +>typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string +>typeof x === "string" && typeof x === "string" : boolean +>typeof x === "string" : boolean +>typeof x : string +>x : string | number +>"string" : string +>typeof x === "string" : boolean +>typeof x : string +>x : string +>"string" : string +>x.substr : (from: number, length?: number) => string +>x : string +>substr : (from: number, length?: number) => string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string + +var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr; +>r2 : (fractionDigits?: number) => string +>!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : (fractionDigits?: number) => string +>!(typeof x === "string" && typeof x === "string") : boolean +>(typeof x === "string" && typeof x === "string") : boolean +>typeof x === "string" && typeof x === "string" : boolean +>typeof x === "string" : boolean +>typeof x : string +>x : string | number +>"string" : string +>typeof x === "string" : boolean +>typeof x : string +>x : string +>"string" : string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string +>x.substr : (from: number, length?: number) => string +>x : string +>substr : (from: number, length?: number) => string + +var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; +>r3 : (from: number, length?: number) => string +>typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string +>typeof x === "string" || typeof x === "string" : boolean +>typeof x === "string" : boolean +>typeof x : string +>x : string | number +>"string" : string +>typeof x === "string" : boolean +>typeof x : string +>x : number +>"string" : string +>x.substr : (from: number, length?: number) => string +>x : string +>substr : (from: number, length?: number) => string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string + +var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr; +>r4 : (fractionDigits?: number) => string +>!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : (fractionDigits?: number) => string +>!(typeof x === "string" || typeof x === "string") : boolean +>(typeof x === "string" || typeof x === "string") : boolean +>typeof x === "string" || typeof x === "string" : boolean +>typeof x === "string" : boolean +>typeof x : string +>x : string | number +>"string" : string +>typeof x === "string" : boolean +>typeof x : string +>x : number +>"string" : string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string +>x.substr : (from: number, length?: number) => string +>x : string +>substr : (from: number, length?: number) => string + diff --git a/tests/baselines/reference/typeGuardsWithAny.errors.txt b/tests/baselines/reference/typeGuardsWithAny.errors.txt deleted file mode 100644 index 653c89c7554ad..0000000000000 --- a/tests/baselines/reference/typeGuardsWithAny.errors.txt +++ /dev/null @@ -1,49 +0,0 @@ -tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(11,7): error TS2339: Property 'p' does not exist on type 'string'. -tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(18,7): error TS2339: Property 'p' does not exist on type 'number'. -tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(25,7): error TS2339: Property 'p' does not exist on type 'boolean'. - - -==== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts (3 errors) ==== - var x: any = { p: 0 }; - - if (x instanceof Object) { - x.p; // No error, type any unaffected by instanceof type guard - } - else { - x.p; // No error, type any unaffected by instanceof type guard - } - - if (typeof x === "string") { - x.p; // Error, type any narrowed by primitive type check - ~ -!!! error TS2339: Property 'p' does not exist on type 'string'. - } - else { - x.p; // No error, type unaffected in this branch - } - - if (typeof x === "number") { - x.p; // Error, type any narrowed by primitive type check - ~ -!!! error TS2339: Property 'p' does not exist on type 'number'. - } - else { - x.p; // No error, type unaffected in this branch - } - - if (typeof x === "boolean") { - x.p; // Error, type any narrowed by primitive type check - ~ -!!! error TS2339: Property 'p' does not exist on type 'boolean'. - } - else { - x.p; // No error, type unaffected in this branch - } - - if (typeof x === "object") { - x.p; // No error, type any only affected by primitive type check - } - else { - x.p; // No error, type unaffected in this branch - } - \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardsWithAny.symbols b/tests/baselines/reference/typeGuardsWithAny.symbols new file mode 100644 index 0000000000000..90405d762a1d1 --- /dev/null +++ b/tests/baselines/reference/typeGuardsWithAny.symbols @@ -0,0 +1,61 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts === +var x: any = { p: 0 }; +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +>p : Symbol(p, Decl(typeGuardsWithAny.ts, 0, 14)) + +if (x instanceof Object) { +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + x.p; // No error, type any unaffected by instanceof type guard +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} +else { + x.p; // No error, type any unaffected by instanceof type guard +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} + +if (typeof x === "string") { +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) + + x.p; // Error, type any narrowed by primitive type check +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} +else { + x.p; // No error, type unaffected in this branch +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} + +if (typeof x === "number") { +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) + + x.p; // Error, type any narrowed by primitive type check +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} +else { + x.p; // No error, type unaffected in this branch +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} + +if (typeof x === "boolean") { +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) + + x.p; // Error, type any narrowed by primitive type check +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} +else { + x.p; // No error, type unaffected in this branch +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} + +if (typeof x === "object") { +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) + + x.p; // No error, type any only affected by primitive type check +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} +else { + x.p; // No error, type unaffected in this branch +>x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) +} + diff --git a/tests/baselines/reference/typeGuardsWithAny.types b/tests/baselines/reference/typeGuardsWithAny.types new file mode 100644 index 0000000000000..12a4326e99db8 --- /dev/null +++ b/tests/baselines/reference/typeGuardsWithAny.types @@ -0,0 +1,96 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts === +var x: any = { p: 0 }; +>x : any +>{ p: 0 } : { p: number; } +>p : number +>0 : number + +if (x instanceof Object) { +>x instanceof Object : boolean +>x : any +>Object : ObjectConstructor + + x.p; // No error, type any unaffected by instanceof type guard +>x.p : any +>x : any +>p : any +} +else { + x.p; // No error, type any unaffected by instanceof type guard +>x.p : any +>x : any +>p : any +} + +if (typeof x === "string") { +>typeof x === "string" : boolean +>typeof x : string +>x : any +>"string" : string + + x.p; // Error, type any narrowed by primitive type check +>x.p : any +>x : any +>p : any +} +else { + x.p; // No error, type unaffected in this branch +>x.p : any +>x : any +>p : any +} + +if (typeof x === "number") { +>typeof x === "number" : boolean +>typeof x : string +>x : any +>"number" : string + + x.p; // Error, type any narrowed by primitive type check +>x.p : any +>x : any +>p : any +} +else { + x.p; // No error, type unaffected in this branch +>x.p : any +>x : any +>p : any +} + +if (typeof x === "boolean") { +>typeof x === "boolean" : boolean +>typeof x : string +>x : any +>"boolean" : string + + x.p; // Error, type any narrowed by primitive type check +>x.p : any +>x : any +>p : any +} +else { + x.p; // No error, type unaffected in this branch +>x.p : any +>x : any +>p : any +} + +if (typeof x === "object") { +>typeof x === "object" : boolean +>typeof x : string +>x : any +>"object" : string + + x.p; // No error, type any only affected by primitive type check +>x.p : any +>x : any +>p : any +} +else { + x.p; // No error, type unaffected in this branch +>x.p : any +>x : any +>p : any +} + From 2d3a345fd3a5aa26e0e6a9d5788d807b8edcca67 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 16:24:53 -0700 Subject: [PATCH 110/353] Since there arent any user given extensions, have extensions start with "." like before --- src/compiler/commandLineParser.ts | 2 +- src/compiler/core.ts | 12 ++++++------ src/compiler/parser.ts | 2 +- src/compiler/program.ts | 10 +++++----- src/compiler/utilities.ts | 2 +- src/harness/compilerRunner.ts | 2 +- src/services/services.ts | 2 +- .../jsFileCompilationWithMapFileAsJs.errors.txt | 4 ++-- ...tionWithMapFileAsJsWithInlineSourceMap.errors.txt | 4 ++-- ...leCompilationWithMapFileAsJsWithOutDir.errors.txt | 8 ++++---- .../jsFileCompilationWithoutJsExtensions.errors.txt | 4 ++-- .../invalidRootFile/amd/invalidRootFile.errors.txt | 4 ++-- .../invalidRootFile/node/invalidRootFile.errors.txt | 4 ++-- ...FileCompilationDifferentNamesSpecified.errors.txt | 4 ++-- ...FileCompilationDifferentNamesSpecified.errors.txt | 4 ++-- tests/cases/unittests/moduleResolution.ts | 4 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index d1a6e56d8184d..fb58384c46952 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -515,7 +515,7 @@ namespace ts { if (!hasConflictingExtension) { // Add the file only if there is no higher priority extension file already included // eg. when a.d.ts and a.js are present in the folder, include only a.d.ts not a.js - const baseName = fileName.substr(0, fileName.length - currentExtension.length - 1); + const baseName = fileName.substr(0, fileName.length - currentExtension.length); if (!hasProperty(filesSeen, baseName)) { filesSeen[baseName] = true; fileNames.push(fileName); diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 26e53aebab1ba..018f302219143 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -721,15 +721,15 @@ namespace ts { export function fileExtensionIs(path: string, extension: string): boolean { let pathLen = path.length; - let extLen = extension.length + 1; - return pathLen > extLen && path.substr(pathLen - extLen, extLen) === "." + extension; + let extLen = extension.length; + return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension; } /** * List of supported extensions in order of file resolution precedence. */ - export const supportedTypeScriptExtensions = ["ts", "tsx", "d.ts"]; - export const supportedJavascriptExtensions = ["js", "jsx"]; + export const supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"]; + export const supportedJavascriptExtensions = [".js", ".jsx"]; export const supportedExtensionsWhenAllowedJs = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions); export function getSupportedExtensions(options?: CompilerOptions): string[] { @@ -747,11 +747,11 @@ namespace ts { return false; } - export const extensionsToRemove = ["d.ts", "ts", "js", "tsx", "jsx"]; + export const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; export function removeFileExtension(path: string): string { for (let ext of extensionsToRemove) { if (fileExtensionIs(path, ext)) { - return path.substr(0, path.length - ext.length - 1); + return path.substr(0, path.length - ext.length); } } return path; diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index d8d2b2fdb26f1..a1076464bbd10 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -669,7 +669,7 @@ namespace ts { sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = normalizePath(fileName); - sourceFile.flags = fileExtensionIs(sourceFile.fileName, "d.ts") ? NodeFlags.DeclarationFile : 0; + sourceFile.flags = fileExtensionIs(sourceFile.fileName, ".d.ts") ? NodeFlags.DeclarationFile : 0; sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName); return sourceFile; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index ccb2d2c346e41..db56f86e93bcf 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -73,7 +73,7 @@ namespace ts { return forEach(supportedExtensions, tryLoad); function tryLoad(ext: string): string { - let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + "." + ext; + let fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (host.fileExists(fileName)) { return fileName; } @@ -165,13 +165,13 @@ namespace ts { while (true) { searchName = normalizePath(combinePaths(searchPath, moduleName)); referencedSourceFile = forEach(getSupportedExtensions(compilerOptions), extension => { - if (extension === "tsx" && !compilerOptions.jsx) { + if (extension === ".tsx" && !compilerOptions.jsx) { // resolve .tsx files only if jsx support is enabled // 'logical not' handles both undefined and None cases return undefined; } - let candidate = searchName + "." + extension; + let candidate = searchName + extension; if (host.fileExists(candidate)) { return candidate; } @@ -964,7 +964,7 @@ namespace ts { diagnostic = Diagnostics.File_0_not_found; diagnosticArgument = [fileName]; } - else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + "." + extension, isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) { + else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + extension, isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) { // (TODO: shkamat) Should this message be different given we support multiple extensions diagnostic = Diagnostics.File_0_not_found; fileName += ".ts"; @@ -1077,7 +1077,7 @@ namespace ts { let start = getTokenPosOfNode(file.imports[i], file); fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName)); } - else if (!fileExtensionIs(importedFile.fileName, "d.ts")) { + else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) { let start = getTokenPosOfNode(file.imports[i], file); fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition)); } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 7c88e1a941796..885d529f69e8f 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2143,7 +2143,7 @@ namespace ts { } export function isTsx(fileName: string) { - return fileExtensionIs(fileName, "tsx"); + return fileExtensionIs(fileName, ".tsx"); } /** diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index e3c48e33e5c96..11c1b9a8029a2 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -151,7 +151,7 @@ class CompilerBaselineRunner extends RunnerBase { }); it("Correct JS output for " + fileName, () => { - if (!(units.length === 1 && ts.fileExtensionIs(lastUnit.name, "d.ts")) && this.emit) { + if (!(units.length === 1 && ts.fileExtensionIs(lastUnit.name, ".d.ts")) && this.emit) { if (result.files.length === 0 && result.errors.length === 0) { throw new Error("Expected at least one js file to be emitted or at least one error to be created."); } diff --git a/src/services/services.ts b/src/services/services.ts index dce341cc035ae..d80e60d171bd7 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1875,7 +1875,7 @@ namespace ts { let compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { - if (fileExtensionIs(name, "map")) { + if (fileExtensionIs(name, ".map")) { Debug.assert(sourceMapText === undefined, `Unexpected multiple source map outputs for the file '${name}'`); sourceMapText = text; } diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt index aaeb023dbdb22..a97dc2c3cd659 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt @@ -1,9 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt index aaeb023dbdb22..a97dc2c3cd659 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt @@ -1,9 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. -!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts', 'js', 'jsx'. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt index 81d9b67d33403..c9a4408f4233c 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.errors.txt @@ -1,9 +1,9 @@ -error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. -error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. +error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. -!!! error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. -!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +!!! error TS6054: File 'tests/cases/compiler/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. +!!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt index 4276669ff768a..0b1a757d4fd6f 100644 --- a/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithoutJsExtensions.errors.txt @@ -1,6 +1,6 @@ -error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. -!!! error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +!!! error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. ==== tests/cases/compiler/a.js (0 errors) ==== declare var v; \ No newline at end of file diff --git a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt index 76d5def7b5c48..9cd0dd7b0cf0a 100644 --- a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. \ No newline at end of file diff --git a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt index 76d5def7b5c48..9cd0dd7b0cf0a 100644 --- a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt +++ b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt @@ -1,6 +1,6 @@ error TS6053: File 'a.ts' not found. -error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. !!! error TS6053: File 'a.ts' not found. -!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. \ No newline at end of file +!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt index a7fd60e03d5cf..5fa60d18af99d 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt @@ -1,6 +1,6 @@ -error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. -!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. ==== DifferentNamesSpecified/a.ts (0 errors) ==== var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt index a7fd60e03d5cf..5fa60d18af99d 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt @@ -1,6 +1,6 @@ -error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. -!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are 'ts', 'tsx', 'd.ts'. +!!! error TS6054: File 'DifferentNamesSpecified/b.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. ==== DifferentNamesSpecified/a.ts (0 errors) ==== var test = 10; \ No newline at end of file diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 6f9497fde1d36..a1767f58026c1 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -38,7 +38,7 @@ module ts { function testLoadAsFile(containingFileName: string, moduleFileNameNoExt: string, moduleName: string): void { for (let ext of supportedTypeScriptExtensions) { let containingFile = { name: containingFileName } - let moduleFile = { name: moduleFileNameNoExt + "." + ext } + let moduleFile = { name: moduleFileNameNoExt + ext } let resolution = nodeModuleNameResolver(moduleName, containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); @@ -50,7 +50,7 @@ module ts { break; } else { - failedLookupLocations.push(normalizePath(getRootLength(moduleName) === 0 ? combinePaths(dir, moduleName) : moduleName) + "." + e); + failedLookupLocations.push(normalizePath(getRootLength(moduleName) === 0 ? combinePaths(dir, moduleName) : moduleName) + e); } } From 168c664639a6c7d01439f39b1d3bd3edd58bada3 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 28 Oct 2015 16:29:36 -0700 Subject: [PATCH 111/353] restore any narrowing --- src/compiler/checker.ts | 11 ++- .../reference/typeGuardsWithAny.errors.txt | 49 ++++++++++ .../reference/typeGuardsWithAny.symbols | 61 ------------ .../reference/typeGuardsWithAny.types | 96 ------------------- 4 files changed, 57 insertions(+), 160 deletions(-) create mode 100644 tests/baselines/reference/typeGuardsWithAny.errors.txt delete mode 100644 tests/baselines/reference/typeGuardsWithAny.symbols delete mode 100644 tests/baselines/reference/typeGuardsWithAny.types diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ad6e72d68bdd9..93b644b07a4b0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6356,9 +6356,6 @@ namespace ts { return type; function narrowTypeByEquality(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type { - if (!(type.flags & TypeFlags.Union)) { - return type; - } // Check that we have 'typeof ' on the left and string literal on the right if (expr.left.kind !== SyntaxKind.TypeOfExpression || expr.right.kind !== SyntaxKind.StringLiteral) { return type; @@ -6372,6 +6369,14 @@ namespace ts { assumeTrue = !assumeTrue; } let typeInfo = primitiveTypeInfo[right.text]; + // If the type to be narrowed is any and we're affirmatively checking against a primitive, return the primitive + if (!!(type.flags & TypeFlags.Any) && typeInfo && assumeTrue) { + return typeInfo.type; + } + // At this point we can bail if it's not a union + if (!(type.flags & TypeFlags.Union)) { + return type; + } let flags = typeInfo ? typeInfo.flags : (assumeTrue = !assumeTrue, TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.ESSymbol | TypeFlags.Boolean); let union = type as UnionType; if (assumeTrue) { diff --git a/tests/baselines/reference/typeGuardsWithAny.errors.txt b/tests/baselines/reference/typeGuardsWithAny.errors.txt new file mode 100644 index 0000000000000..653c89c7554ad --- /dev/null +++ b/tests/baselines/reference/typeGuardsWithAny.errors.txt @@ -0,0 +1,49 @@ +tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(11,7): error TS2339: Property 'p' does not exist on type 'string'. +tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(18,7): error TS2339: Property 'p' does not exist on type 'number'. +tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts(25,7): error TS2339: Property 'p' does not exist on type 'boolean'. + + +==== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts (3 errors) ==== + var x: any = { p: 0 }; + + if (x instanceof Object) { + x.p; // No error, type any unaffected by instanceof type guard + } + else { + x.p; // No error, type any unaffected by instanceof type guard + } + + if (typeof x === "string") { + x.p; // Error, type any narrowed by primitive type check + ~ +!!! error TS2339: Property 'p' does not exist on type 'string'. + } + else { + x.p; // No error, type unaffected in this branch + } + + if (typeof x === "number") { + x.p; // Error, type any narrowed by primitive type check + ~ +!!! error TS2339: Property 'p' does not exist on type 'number'. + } + else { + x.p; // No error, type unaffected in this branch + } + + if (typeof x === "boolean") { + x.p; // Error, type any narrowed by primitive type check + ~ +!!! error TS2339: Property 'p' does not exist on type 'boolean'. + } + else { + x.p; // No error, type unaffected in this branch + } + + if (typeof x === "object") { + x.p; // No error, type any only affected by primitive type check + } + else { + x.p; // No error, type unaffected in this branch + } + \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardsWithAny.symbols b/tests/baselines/reference/typeGuardsWithAny.symbols deleted file mode 100644 index 90405d762a1d1..0000000000000 --- a/tests/baselines/reference/typeGuardsWithAny.symbols +++ /dev/null @@ -1,61 +0,0 @@ -=== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts === -var x: any = { p: 0 }; ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) ->p : Symbol(p, Decl(typeGuardsWithAny.ts, 0, 14)) - -if (x instanceof Object) { ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) ->Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) - - x.p; // No error, type any unaffected by instanceof type guard ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} -else { - x.p; // No error, type any unaffected by instanceof type guard ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} - -if (typeof x === "string") { ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) - - x.p; // Error, type any narrowed by primitive type check ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} -else { - x.p; // No error, type unaffected in this branch ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} - -if (typeof x === "number") { ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) - - x.p; // Error, type any narrowed by primitive type check ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} -else { - x.p; // No error, type unaffected in this branch ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} - -if (typeof x === "boolean") { ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) - - x.p; // Error, type any narrowed by primitive type check ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} -else { - x.p; // No error, type unaffected in this branch ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} - -if (typeof x === "object") { ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) - - x.p; // No error, type any only affected by primitive type check ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} -else { - x.p; // No error, type unaffected in this branch ->x : Symbol(x, Decl(typeGuardsWithAny.ts, 0, 3)) -} - diff --git a/tests/baselines/reference/typeGuardsWithAny.types b/tests/baselines/reference/typeGuardsWithAny.types deleted file mode 100644 index 12a4326e99db8..0000000000000 --- a/tests/baselines/reference/typeGuardsWithAny.types +++ /dev/null @@ -1,96 +0,0 @@ -=== tests/cases/conformance/expressions/typeGuards/typeGuardsWithAny.ts === -var x: any = { p: 0 }; ->x : any ->{ p: 0 } : { p: number; } ->p : number ->0 : number - -if (x instanceof Object) { ->x instanceof Object : boolean ->x : any ->Object : ObjectConstructor - - x.p; // No error, type any unaffected by instanceof type guard ->x.p : any ->x : any ->p : any -} -else { - x.p; // No error, type any unaffected by instanceof type guard ->x.p : any ->x : any ->p : any -} - -if (typeof x === "string") { ->typeof x === "string" : boolean ->typeof x : string ->x : any ->"string" : string - - x.p; // Error, type any narrowed by primitive type check ->x.p : any ->x : any ->p : any -} -else { - x.p; // No error, type unaffected in this branch ->x.p : any ->x : any ->p : any -} - -if (typeof x === "number") { ->typeof x === "number" : boolean ->typeof x : string ->x : any ->"number" : string - - x.p; // Error, type any narrowed by primitive type check ->x.p : any ->x : any ->p : any -} -else { - x.p; // No error, type unaffected in this branch ->x.p : any ->x : any ->p : any -} - -if (typeof x === "boolean") { ->typeof x === "boolean" : boolean ->typeof x : string ->x : any ->"boolean" : string - - x.p; // Error, type any narrowed by primitive type check ->x.p : any ->x : any ->p : any -} -else { - x.p; // No error, type unaffected in this branch ->x.p : any ->x : any ->p : any -} - -if (typeof x === "object") { ->typeof x === "object" : boolean ->typeof x : string ->x : any ->"object" : string - - x.p; // No error, type any only affected by primitive type check ->x.p : any ->x : any ->p : any -} -else { - x.p; // No error, type unaffected in this branch ->x.p : any ->x : any ->p : any -} - From 0c3c7f1a1bcab95c704d50f2709a2655df133c08 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 16:39:22 -0700 Subject: [PATCH 112/353] Treat the .jsx and .tsx files as jsx when parsing and .js files are parsed in standard mode --- src/compiler/parser.ts | 3 ++- src/compiler/utilities.ts | 4 ---- .../jsFileCompilationTypeAssertions.errors.txt | 6 +++--- .../getJavaScriptSemanticDiagnostics20.ts | 14 +++++++------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index a1076464bbd10..b0a9e02ed7c79 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -537,7 +537,8 @@ namespace ts { } function getLanguageVariant(fileName: string) { - return isTsx(fileName) || isJavaScript(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; + // .tsx and .jsx files are treated as jsx language variant. + return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") ? LanguageVariant.JSX : LanguageVariant.Standard; } function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor) { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 885d529f69e8f..838ff097933d7 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2142,10 +2142,6 @@ namespace ts { return hasExtension(fileName) && forEach(supportedJavascriptExtensions, extension => fileExtensionIs(fileName, extension)); } - export function isTsx(fileName: string) { - return fileExtensionIs(fileName, ".tsx"); - } - /** * Replace each instance of non-ascii characters by one, two, three, or four escape sequences * representing the UTF-8 encoding of the character, and return the expanded char code list. diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index 669e83688ccda..50d6416a62b90 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,9 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. -tests/cases/compiler/a.js(1,27): error TS17002: Expected corresponding JSX closing tag for 'string'. +tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. ==== tests/cases/compiler/a.js (1 errors) ==== var v = undefined; - -!!! error TS17002: Expected corresponding JSX closing tag for 'string'. \ No newline at end of file + ~~~~~~ +!!! error TS8016: 'type assertion expressions' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts index 5172ee7701cc4..c0c519cb24c9c 100644 --- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts +++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts @@ -4,13 +4,13 @@ // @Filename: a.js //// var v = undefined; -verify.getSyntacticDiagnostics(`[ +verify.getSyntacticDiagnostics(`[]`); +verify.getSemanticDiagnostics(`[ { - "message": "Expected corresponding JSX closing tag for 'string'.", - "start": 26, - "length": 0, + "message": "'type assertion expressions' can only be used in a .ts file.", + "start": 9, + "length": 6, "category": "error", - "code": 17002 + "code": 8016 } -]`); -verify.getSemanticDiagnostics(`[]`); \ No newline at end of file +]`); \ No newline at end of file From fdb7a3e452299dbc7159b9c4908d81a6b097b1ea Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 16:52:05 -0700 Subject: [PATCH 113/353] Revert the change to block declaration emit in case of syntax or semantic errors --- src/compiler/core.ts | 2 +- src/compiler/declarationEmitter.ts | 2 +- src/compiler/program.ts | 38 ++---------------------------- src/compiler/types.ts | 1 - src/compiler/utilities.ts | 1 - 5 files changed, 4 insertions(+), 40 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 018f302219143..18b7425e02d39 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -747,7 +747,7 @@ namespace ts { return false; } - export const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; + const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; export function removeFileExtension(path: string): string { for (let ext of extensionsToRemove) { if (fileExtensionIs(path, ext)) { diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 86c90ff6f1cab..eb329c67b0b7e 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1608,7 +1608,7 @@ namespace ts { /* @internal */ export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, declarationFilePath, sourceFile); - let emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isDeclarationEmitBlocked(declarationFilePath, sourceFile); + let emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath); if (!emitSkipped) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); diff --git a/src/compiler/program.ts b/src/compiler/program.ts index db56f86e93bcf..acac0ca4e5fee 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -394,7 +394,6 @@ namespace ts { getDiagnosticsProducingTypeChecker, getCommonSourceDirectory: () => commonSourceDirectory, emit, - isDeclarationEmitBlocked, getCurrentDirectory: () => host.getCurrentDirectory(), getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(), getIdentifierCount: () => getDiagnosticsProducingTypeChecker().getIdentifierCount(), @@ -512,7 +511,7 @@ namespace ts { return true; } - function getEmitHost(writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitHost { + function getEmitHost(writeFileCallback?: WriteFileCallback): EmitHost { return { getCanonicalFileName: fileName => host.getCanonicalFileName(fileName), getCommonSourceDirectory: program.getCommonSourceDirectory, @@ -524,7 +523,6 @@ namespace ts { writeFile: writeFileCallback || ( (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)), isEmitBlocked, - isDeclarationEmitBlocked: (emitFileName, sourceFile) => program.isDeclarationEmitBlocked(emitFileName, sourceFile, cancellationToken), }; } @@ -540,38 +538,6 @@ namespace ts { return runWithCancellationToken(() => emitWorker(this, sourceFile, writeFileCallback, cancellationToken)); } - function isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile, cancellationToken?: CancellationToken): boolean { - if (isEmitBlocked(emitFileName)) { - return true; - } - - // Dont check for emit blocking options diagnostics because that check per emit file is already covered in isEmitBlocked - // We dont want to end up blocking declaration emit of one file because other file results in emit blocking error - if (getOptionsDiagnostics(cancellationToken, /*includeEmitBlockingDiagnostics*/false).length || - getGlobalDiagnostics().length) { - return true; - } - - if (sourceFile) { - // Do not generate declaration file for this if there are any errors in this file or any of the declaration files - return hasSyntaxOrSemanticDiagnostics(sourceFile) || - forEach(files, sourceFile => isDeclarationFile(sourceFile) && hasSyntaxOrSemanticDiagnostics(sourceFile)); - } - - // Check if the bundled emit source files have errors - return forEach(files, sourceFile => { - // Check all the files that will be bundled together as well as all the included declaration files are error free - if (!isExternalModule(sourceFile)) { - return hasSyntaxOrSemanticDiagnostics(sourceFile); - } - }); - - function hasSyntaxOrSemanticDiagnostics(file: SourceFile) { - return !!getSyntacticDiagnostics(file, cancellationToken).length || - !!getSemanticDiagnostics(file, cancellationToken).length; - } - } - function isEmitBlocked(emitFileName: string): boolean { return hasProperty(hasEmitBlockingDiagnostics, emitFileName); } @@ -598,7 +564,7 @@ namespace ts { let emitResult = emitFiles( emitResolver, - getEmitHost(writeFileCallback, cancellationToken), + getEmitHost(writeFileCallback), sourceFile); emitTime += new Date().getTime() - start; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5d41a60526a6f..928524b2ac74b 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1358,7 +1358,6 @@ namespace ts { getTypeChecker(): TypeChecker; /* @internal */ getCommonSourceDirectory(): string; - /* @internal */ isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile, cancellationToken?: CancellationToken): boolean; // For testing purposes only. Should not be used by any other consumers (including the // language service). diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 838ff097933d7..f9489a9ddac13 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -40,7 +40,6 @@ namespace ts { getNewLine(): string; isEmitBlocked(emitFileName: string): boolean; - isDeclarationEmitBlocked(emitFileName: string, sourceFile?: SourceFile): boolean; writeFile: WriteFileCallback; } From 38ebb1d835d007714b25f7496925bbdb3428c032 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 28 Oct 2015 16:59:52 -0700 Subject: [PATCH 114/353] Tests update after declaration file emit revert --- ...mputedPropertyNamesDeclarationEmit3_ES5.js | 5 + ...mputedPropertyNamesDeclarationEmit3_ES6.js | 5 + ...mputedPropertyNamesDeclarationEmit4_ES5.js | 5 + ...mputedPropertyNamesDeclarationEmit4_ES6.js | 5 + tests/baselines/reference/constEnum2.js | 10 + .../reference/constEnumPropertyAccess2.js | 13 + ...eclFileWithErrorsInInputDeclarationFile.js | 5 + ...WithErrorsInInputDeclarationFileWithOut.js | 5 + .../declarationEmitDestructuring2.js | 24 ++ .../declarationEmitDestructuring4.js | 10 + ...clarationEmitDestructuringArrayPattern2.js | 12 + ...onEmitDestructuringObjectLiteralPattern.js | 19 ++ ...nEmitDestructuringObjectLiteralPattern1.js | 9 + ...ionEmitDestructuringParameterProperties.js | 21 ++ ...tructuringWithOptionalBindingParameters.js | 9 + .../declarationEmit_invalidReference2.js | 4 + ...uplicateIdentifiersAcrossFileBoundaries.js | 33 ++ .../emptyObjectBindingPatternParameter04.js | 8 + ...ariableDeclarationBindingPatterns02_ES5.js | 3 + ...ariableDeclarationBindingPatterns02_ES6.js | 3 + tests/baselines/reference/es5ExportEquals.js | 5 + tests/baselines/reference/es6ExportEquals.js | 5 + ...tDefaultBindingFollowedWithNamedImport1.js | 1 + ...ultBindingFollowedWithNamedImport1InEs5.js | 1 + ...ndingFollowedWithNamedImport1WithExport.js | 7 + ...efaultBindingFollowedWithNamedImportDts.js | 12 + ...faultBindingFollowedWithNamedImportDts1.js | 8 + ...aultBindingFollowedWithNamedImportInEs5.js | 1 + ...indingFollowedWithNamedImportWithExport.js | 7 + ...aultBindingFollowedWithNamespaceBinding.js | 1 + ...FollowedWithNamespaceBinding1WithExport.js | 2 + ...tBindingFollowedWithNamespaceBindingDts.js | 3 + ...indingFollowedWithNamespaceBindingInEs5.js | 1 + ...gFollowedWithNamespaceBindingWithExport.js | 2 + .../reference/es6ImportDefaultBindingInEs5.js | 1 + .../es6ImportDefaultBindingWithExport.js | 2 + .../es6ImportNameSpaceImportWithExport.js | 2 + .../es6ImportNamedImportWithExport.js | 13 + .../es6ImportWithoutFromClauseWithExport.js | 2 + .../exportDeclarationInInternalModule.js | 17 + .../reference/exportStarFromEmptyModule.js | 7 + .../getEmitOutputWithSemanticErrors2.baseline | 6 +- ...thSemanticErrorsForMultipleFiles2.baseline | 7 +- tests/baselines/reference/giant.js | 304 ++++++++++++++++++ .../reference/isolatedModulesDeclaration.js | 4 + ...pilationDuplicateFunctionImplementation.js | 3 + ...FunctionImplementationFileOrderReversed.js | 3 + ...mpilationDuplicateVariableErrorReported.js | 5 + ...eclarationsWithJsFileReferenceWithNoOut.js | 10 + .../jsFileCompilationLetDeclarationOrder2.js | 5 + tests/baselines/reference/letAsIdentifier.js | 6 + tests/baselines/reference/out-flag3.js | 8 +- ...ileCompilationDifferentNamesSpecified.json | 3 +- .../amd/test.d.ts | 1 + ...ileCompilationDifferentNamesSpecified.json | 3 +- .../node/test.d.ts | 1 + .../amd/outdir/simple/FolderC/fileC.d.ts | 2 + .../amd/outdir/simple/fileB.d.ts | 4 + .../amd/rootDirectoryErrors.json | 4 +- .../node/outdir/simple/FolderC/fileC.d.ts | 2 + .../node/outdir/simple/fileB.d.ts | 4 + .../node/rootDirectoryErrors.json | 4 +- tests/baselines/reference/widenedTypes.js | 14 + ...pilationDuplicateFunctionImplementation.ts | 3 +- 64 files changed, 702 insertions(+), 12 deletions(-) create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts create mode 100644 tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts create mode 100644 tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts create mode 100644 tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts create mode 100644 tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js index 1f339b36fafcb..c24eaf68a6f6d 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.js @@ -4,3 +4,8 @@ interface I { } //// [computedPropertyNamesDeclarationEmit3_ES5.js] + + +//// [computedPropertyNamesDeclarationEmit3_ES5.d.ts] +interface I { +} diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js index 55e657c2325be..dc54ff2cbb2b6 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.js @@ -4,3 +4,8 @@ interface I { } //// [computedPropertyNamesDeclarationEmit3_ES6.js] + + +//// [computedPropertyNamesDeclarationEmit3_ES6.d.ts] +interface I { +} diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js index bca1ddbfdc7fa..c57c0384afc3a 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.js @@ -5,3 +5,8 @@ var v: { //// [computedPropertyNamesDeclarationEmit4_ES5.js] var v; + + +//// [computedPropertyNamesDeclarationEmit4_ES5.d.ts] +declare var v: { +}; diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js index c3b26b97c9b95..903687d078073 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES6.js @@ -5,3 +5,8 @@ var v: { //// [computedPropertyNamesDeclarationEmit4_ES6.js] var v; + + +//// [computedPropertyNamesDeclarationEmit4_ES6.d.ts] +declare var v: { +}; diff --git a/tests/baselines/reference/constEnum2.js b/tests/baselines/reference/constEnum2.js index 5c46778c7cea1..c0c640b87fda4 100644 --- a/tests/baselines/reference/constEnum2.js +++ b/tests/baselines/reference/constEnum2.js @@ -20,3 +20,13 @@ const enum D { // it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression. // Error : not a constant enum expression var CONST = 9000 % 2; + + +//// [constEnum2.d.ts] +declare const CONST: number; +declare const enum D { + d = 10, + e, + f, + g, +} diff --git a/tests/baselines/reference/constEnumPropertyAccess2.js b/tests/baselines/reference/constEnumPropertyAccess2.js index f2d63ba1389d4..46a1d918b94b3 100644 --- a/tests/baselines/reference/constEnumPropertyAccess2.js +++ b/tests/baselines/reference/constEnumPropertyAccess2.js @@ -31,3 +31,16 @@ var g; g = "string"; function foo(x) { } 2 /* B */ = 3; + + +//// [constEnumPropertyAccess2.d.ts] +declare const enum G { + A = 1, + B = 2, + C = 3, + D = 2, +} +declare var z: typeof G; +declare var z1: any; +declare var g: G; +declare function foo(x: G): void; diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js index e97312893ad0a..30e80ef4e6f2c 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js @@ -19,3 +19,8 @@ var x = new M.C(); // Declaration file wont get emitted because there are errors //// [client.js] /// var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + + +//// [client.d.ts] +/// +declare var x: M.C; diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js index 11dcc06380cb3..99dd625760f07 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js @@ -19,3 +19,8 @@ var x = new M.C(); // Declaration file wont get emitted because there are errors //// [out.js] /// var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + + +//// [out.d.ts] +/// +declare var x: M.C; diff --git a/tests/baselines/reference/declarationEmitDestructuring2.js b/tests/baselines/reference/declarationEmitDestructuring2.js index 31329ded30499..09980c5c9dd11 100644 --- a/tests/baselines/reference/declarationEmitDestructuring2.js +++ b/tests/baselines/reference/declarationEmitDestructuring2.js @@ -17,3 +17,27 @@ function h(_a) { function h1(_a) { var a = _a[0], b = _a[1][0], c = _a[2][0][0], _b = _a[3], _c = _b.x, x = _c === void 0 ? 10 : _c, _d = _b.y, y = _d === void 0 ? [1, 2, 3] : _d, _e = _b.z, a1 = _e.a1, b1 = _e.b1; } + + +//// [declarationEmitDestructuring2.d.ts] +declare function f({x, y: [a, b, c, d]}?: { + x?: number; + y?: [number, number, number, number]; +}): void; +declare function g([a, b, c, d]?: [number, number, number, number]): void; +declare function h([a, [b], [[c]], {x, y: [a, b, c], z: {a1, b1}}]: [any, [any], [[any]], { + x?: number; + y: [any, any, any]; + z: { + a1: any; + b1: any; + }; +}]): void; +declare function h1([a, [b], [[c]], {x, y, z: {a1, b1}}]: [any, [any], [[any]], { + x?: number; + y?: number[]; + z: { + a1: any; + b1: any; + }; +}]): void; diff --git a/tests/baselines/reference/declarationEmitDestructuring4.js b/tests/baselines/reference/declarationEmitDestructuring4.js index 58cf0e0b2f9f6..16e6b49a4cf0a 100644 --- a/tests/baselines/reference/declarationEmitDestructuring4.js +++ b/tests/baselines/reference/declarationEmitDestructuring4.js @@ -26,3 +26,13 @@ function baz3(_a) { } function baz4(_a) { var _a = { x: 10 }; } + + +//// [declarationEmitDestructuring4.d.ts] +declare function baz([]: any[]): void; +declare function baz1([]?: number[]): void; +declare function baz2([[]]?: [number[]]): void; +declare function baz3({}: {}): void; +declare function baz4({}?: { + x: number; +}): void; diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js index cac419605babb..662b4625ec807 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.js @@ -17,3 +17,15 @@ var _f = [], a11 = _f[0], b11 = _f[1], c11 = _f[2]; var _g = [1, ["hello", { x12: 5, y12: true }]], a2 = _g[0], _h = _g[1], _j = _h === void 0 ? ["abc", { x12: 10, y12: false }] : _h, b2 = _j[0], _k = _j[1], x12 = _k.x12, c2 = _k.y12; var _l = [1, "hello"], x13 = _l[0], y13 = _l[1]; var _m = [[x13, y13], { x: x13, y: y13 }], a3 = _m[0], b3 = _m[1]; + + +//// [declarationEmitDestructuringArrayPattern2.d.ts] +declare var x10: number, y10: string, z10: boolean; +declare var x11: number, y11: string; +declare var a11: any, b11: any, c11: any; +declare var a2: number, b2: string, x12: number, c2: boolean; +declare var x13: number, y13: string; +declare var a3: (number | string)[], b3: { + x: number; + y: string; +}; diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js index d102ad301737f..38b0a14af5c97 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js @@ -43,3 +43,22 @@ var m; _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4; var _a; })(m || (m = {})); + + +//// [declarationEmitDestructuringObjectLiteralPattern.d.ts] +declare var x4: number; +declare var y5: string; +declare var x6: number, y6: string; +declare var a1: number; +declare var b1: string; +declare var a2: number, b2: string; +declare var x11: number, y11: string, z11: boolean; +declare function f15(): { + a4: string; + b4: number; + c4: boolean; +}; +declare var a4: string, b4: number, c4: boolean; +declare module m { + var a4: string, b4: number, c4: boolean; +} diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js index 2c7cf979c9c6b..264e56fe58c5c 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.js @@ -16,3 +16,12 @@ var _b = { x6: 5, y6: "hello" }, x6 = _b.x6, y6 = _b.y6; var a1 = { x7: 5, y7: "hello" }.x7; var b1 = { x8: 5, y8: "hello" }.y8; var _c = { x9: 5, y9: "hello" }, a2 = _c.x9, b2 = _c.y9; + + +//// [declarationEmitDestructuringObjectLiteralPattern1.d.ts] +declare var x4: number; +declare var y5: string; +declare var x6: number, y6: string; +declare var a1: number; +declare var b1: string; +declare var a2: number, b2: string; diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js index 9fc1943eae66d..a98620c852902 100644 --- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js +++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js @@ -38,3 +38,24 @@ var C3 = (function () { } return C3; })(); + + +//// [declarationEmitDestructuringParameterProperties.d.ts] +declare class C1 { + x: string, y: string, z: string; + constructor([x, y, z]: string[]); +} +declare type TupleType1 = [string, number, boolean]; +declare class C2 { + x: string, y: number, z: boolean; + constructor([x, y, z]: TupleType1); +} +declare type ObjType1 = { + x: number; + y: string; + z: boolean; +}; +declare class C3 { + x: number, y: string, z: boolean; + constructor({x, y, z}: ObjType1); +} diff --git a/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js b/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js index ab42602a035a4..5c7f4d2cec593 100644 --- a/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js +++ b/tests/baselines/reference/declarationEmitDestructuringWithOptionalBindingParameters.js @@ -11,3 +11,12 @@ function foo(_a) { function foo1(_a) { var x = _a.x, y = _a.y, z = _a.z; } + + +//// [declarationEmitDestructuringWithOptionalBindingParameters.d.ts] +declare function foo([x, y, z]?: [string, number, boolean]): void; +declare function foo1({x, y, z}?: { + x: string; + y: number; + z: boolean; +}): void; diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.js b/tests/baselines/reference/declarationEmit_invalidReference2.js index 0f8d5d4c07d7d..78fb232cca78e 100644 --- a/tests/baselines/reference/declarationEmit_invalidReference2.js +++ b/tests/baselines/reference/declarationEmit_invalidReference2.js @@ -5,3 +5,7 @@ var x = 0; //// [declarationEmit_invalidReference2.js] /// var x = 0; + + +//// [declarationEmit_invalidReference2.d.ts] +declare var x: number; diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index bdb7a1148f09c..a2509ea97f462 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -75,3 +75,36 @@ var v = 3; var Foo; (function (Foo) { })(Foo || (Foo = {})); + + +//// [file1.d.ts] +interface I { +} +declare class C1 { +} +declare class C2 { +} +declare function f(): void; +declare var v: number; +declare class Foo { + static x: number; +} +declare module N { + module F { + } +} +//// [file2.d.ts] +declare class I { +} +interface C1 { +} +declare function C2(): void; +declare class f { +} +declare var v: number; +declare module Foo { + var x: number; +} +declare module N { + function F(): any; +} diff --git a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js index d9b0e6bc40225..8c128bb806eda 100644 --- a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js +++ b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js @@ -9,3 +9,11 @@ function f(_a) { var _a = { a: 1, b: "2", c: true }; var x, y, z; } + + +//// [emptyObjectBindingPatternParameter04.d.ts] +declare function f({}?: { + a: number; + b: string; + c: boolean; +}): void; diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js index 9b26893b42498..7710b5e26c1c9 100644 --- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js +++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES5.js @@ -19,3 +19,6 @@ var _e = void 0; var _f = void 0; })(); + + +//// [emptyVariableDeclarationBindingPatterns02_ES5.d.ts] diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js index 9fbdd26991296..8b2df68ed709d 100644 --- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js +++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js @@ -19,3 +19,6 @@ let []; const []; })(); + + +//// [emptyVariableDeclarationBindingPatterns02_ES6.d.ts] diff --git a/tests/baselines/reference/es5ExportEquals.js b/tests/baselines/reference/es5ExportEquals.js index d392979240908..88d1da4201d34 100644 --- a/tests/baselines/reference/es5ExportEquals.js +++ b/tests/baselines/reference/es5ExportEquals.js @@ -9,3 +9,8 @@ export = f; function f() { } exports.f = f; module.exports = f; + + +//// [es5ExportEquals.d.ts] +export declare function f(): void; +export = f; diff --git a/tests/baselines/reference/es6ExportEquals.js b/tests/baselines/reference/es6ExportEquals.js index ba838296f9d75..e4cf13758ffd2 100644 --- a/tests/baselines/reference/es6ExportEquals.js +++ b/tests/baselines/reference/es6ExportEquals.js @@ -7,3 +7,8 @@ export = f; //// [es6ExportEquals.js] export function f() { } + + +//// [es6ExportEquals.d.ts] +export declare function f(): void; +export = f; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js index a733eba1045b8..755af6f4fdb85 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js @@ -41,3 +41,4 @@ var x1 = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1_0.d.ts] declare var a: number; export default a; +//// [es6ImportDefaultBindingFollowedWithNamedImport1_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 53f701cb0c13a..7eda76622defc 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -42,3 +42,4 @@ var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts] declare var a: number; export default a; +//// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index c724eade06c66..b83571066f051 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -42,3 +42,10 @@ exports.x1 = server_6.default; //// [server.d.ts] declare var a: number; export default a; +//// [client.d.ts] +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 1dc0013ecbe60..9314190e786e2 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -88,3 +88,15 @@ export declare class a12 { } export declare class x11 { } +//// [client.d.ts] +import { a } from "./server"; +export declare var x1: a; +import { a11 as b } from "./server"; +export declare var x2: b; +import { x, a12 as y } from "./server"; +export declare var x4: x; +export declare var x5: y; +import { x11 as z } from "./server"; +export declare var x3: z; +import { m } from "./server"; +export declare var x6: m; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index 3451176bdb2cf..71d35fd85a176 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -46,3 +46,11 @@ exports.x6 = new server_6.default(); declare class a { } export default a; +//// [client.d.ts] +import defaultBinding1 from "./server"; +export declare var x1: defaultBinding1; +export declare var x2: defaultBinding1; +export declare var x3: defaultBinding1; +export declare var x4: defaultBinding1; +export declare var x5: defaultBinding1; +export declare var x6: defaultBinding1; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index d4b1b45d5a7b9..9674f8c12f432 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -43,3 +43,4 @@ var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m; export declare var a: number; export declare var x: number; export declare var m: number; +//// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index 2d8be87a3d1e0..b7da05d7dbbb9 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -47,3 +47,10 @@ export declare var x: number; export declare var m: number; declare var _default: {}; export default _default; +//// [client.d.ts] +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js index f6607da3397b1..2b24fda075559 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js @@ -17,3 +17,4 @@ var x = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.d.ts] export declare var a: number; +//// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index caeaa76ab4a9a..a032325fbb446 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -25,3 +25,5 @@ define(["require", "exports", "server"], function (require, exports, server_1) { //// [server.d.ts] declare var a: number; export default a; +//// [client.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 86514091f6c47..93918f6171a64 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -23,3 +23,6 @@ exports.x = new nameSpaceBinding.a(); //// [server.d.ts] export declare class a { } +//// [client.d.ts] +import * as nameSpaceBinding from "./server"; +export declare var x: nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 35811288691e6..49717c588b707 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -17,3 +17,4 @@ var x = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] export declare var a: number; +//// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index 9a02028e43189..dec9b8cfebe0e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -17,3 +17,5 @@ exports.x = nameSpaceBinding.a; //// [server.d.ts] export declare var a: number; +//// [client.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js index 4420397ac61f6..34323b2752bc3 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js @@ -17,3 +17,4 @@ module.exports = a; //// [es6ImportDefaultBindingInEs5_0.d.ts] declare var a: number; export = a; +//// [es6ImportDefaultBindingInEs5_1.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index c3a7315929db0..2fb7f0644b9ca 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -25,3 +25,5 @@ define(["require", "exports", "server"], function (require, exports, server_1) { //// [server.d.ts] declare var a: number; export default a; +//// [client.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index 9da18ee7d0c4e..84f6936d4b0f1 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -22,3 +22,5 @@ define(["require", "exports", "server"], function (require, exports, nameSpaceBi //// [server.d.ts] export declare var a: number; +//// [client.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index d51e677381a66..5175554f0f916 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -82,3 +82,16 @@ export declare var x1: number; export declare var z1: number; export declare var z2: number; export declare var aaaa: number; +//// [client.d.ts] +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var xxxx: number; +export declare var z111: number; +export declare var z2: number; diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 0089dd2b3dfde..208f71bcbfe9f 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -15,3 +15,5 @@ require("server"); //// [server.d.ts] export declare var a: number; +//// [client.d.ts] +export import "server"; diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index bcfb7d8347d52..4a1ee9b739f2b 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -56,3 +56,20 @@ var Bbb; __export(require()); // this line causes the nullref })(Bbb || (Bbb = {})); var a; + + +//// [exportDeclarationInInternalModule.d.ts] +declare class Bbb { +} +declare class Aaa extends Bbb { +} +declare module Aaa { + class SomeType { + } +} +declare module Bbb { + class SomeType { + } + export * from Aaa; +} +declare var a: Bbb.SomeType; diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index e6db992f8f84b..d433e7b3682c8 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -56,3 +56,10 @@ export declare class A { static r: any; } //// [exportStarFromEmptyModule_module2.d.ts] +//// [exportStarFromEmptyModule_module3.d.ts] +export * from "./exportStarFromEmptyModule_module2"; +export * from "./exportStarFromEmptyModule_module1"; +export declare class A { + static q: any; +} +//// [exportStarFromEmptyModule_module4.d.ts] diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline index 88bc5c507274f..396e220bdb653 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline @@ -1,6 +1,6 @@ -EmitSkipped: true -Diagnostics: - Type 'string' is not assignable to type 'number'. +EmitSkipped: false FileName : tests/cases/fourslash/inputFile.js var x = "hello world"; +FileName : tests/cases/fourslash/inputFile.d.ts +declare var x: number; diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline index 63747de55ded2..6a58015c1b3bc 100644 --- a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline +++ b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline @@ -1,10 +1,11 @@ -EmitSkipped: true -Diagnostics: - Type 'string' is not assignable to type 'boolean'. +EmitSkipped: false FileName : out.js // File to emit, does not contain semantic errors, but --out is passed // expected to not generate declarations because of the semantic errors in the other file var noErrors = true; // File not emitted, and contains semantic errors var semanticError = "string"; +FileName : out.d.ts +declare var noErrors: boolean; +declare var semanticError: boolean; diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 096f1ecd60098..46bdaf827d5c5 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1107,3 +1107,307 @@ define(["require", "exports"], function (require, exports) { })(eM = exports.eM || (exports.eM = {})); ; }); + + +//// [giant.d.ts] +export declare var eV: any; +export declare function eF(): void; +export declare class eC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF(); + pgF(): void; + pgF: any; + psF(param: any): void; + psF: any; + private rgF(); + private rgF; + private rsF(param); + private rsF; + static tV: any; + static tF(): void; + static tsF(param: any): void; + static tsF: any; + static tgF(): void; + static tgF: any; +} +export interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; +} +export declare module eM { + var eV: any; + function eF(): void; + class eC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF(); + pgF(): void; + pgF: any; + psF(param: any): void; + psF: any; + private rgF(); + private rgF; + private rsF(param); + private rsF; + static tV: any; + static tF(): void; + static tsF(param: any): void; + static tsF: any; + static tgF(): void; + static tgF: any; + } + interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + module eM { + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + module eM { + } + var eaV: any; + function eaF(): void; + class eaC { + } + module eaM { + } + } + var eaV: any; + function eaF(): void; + class eaC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF(); + pgF(): void; + pgF: any; + psF(param: any): void; + psF: any; + private rgF(); + private rgF; + private rsF(param); + private rsF; + static tV: any; + static tF(): void; + static tsF(param: any): void; + static tsF: any; + static tgF(): void; + static tgF: any; + } + module eaM { + var V: any; + function F(): void; + class C { + } + interface I { + } + module M { + } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + module eM { + } + } +} +export declare var eaV: any; +export declare function eaF(): void; +export declare class eaC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF(); + pgF(): void; + pgF: any; + psF(param: any): void; + psF: any; + private rgF(); + private rgF; + private rsF(param); + private rsF; + static tV: any; + static tF(): void; + static tsF(param: any): void; + static tsF: any; + static tgF(): void; + static tgF: any; +} +export declare module eaM { + var V: any; + function F(): void; + class C { + constructor(); + pV: any; + private rV; + pF(): void; + static tV: any; + static tF(): void; + } + interface I { + (): any; + (): number; + (p: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + module M { + var V: any; + function F(): void; + class C { + } + interface I { + } + module M { + } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + module eM { + } + var eaV: any; + function eaF(): void; + class eaC { + } + module eaM { + } + } + var eV: any; + function eF(): void; + class eC { + constructor(); + pV: any; + private rV; + pF(): void; + static tV: any; + static tF(): void; + } + interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + module eM { + var V: any; + function F(): void; + class C { + } + module M { + } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + module eM { + } + } +} diff --git a/tests/baselines/reference/isolatedModulesDeclaration.js b/tests/baselines/reference/isolatedModulesDeclaration.js index 4a24f0e201f24..bb3e560a2f83e 100644 --- a/tests/baselines/reference/isolatedModulesDeclaration.js +++ b/tests/baselines/reference/isolatedModulesDeclaration.js @@ -4,3 +4,7 @@ export var x; //// [file1.js] export var x; + + +//// [file1.d.ts] +export declare var x: any; diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js index 2392b461ebfb2..9b64450936186 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.js @@ -18,3 +18,6 @@ function foo() { function foo() { return 30; } + + +//// [out.d.ts] diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js index 807cdbf0925e9..d7965e91be1d3 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.js @@ -19,3 +19,6 @@ function foo() { function foo() { return 10; } + + +//// [out.d.ts] diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js index aab4ba6af81a2..7b2643c13d3eb 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js @@ -9,3 +9,8 @@ var x = 10; // Error reported so no declaration file generated? //// [out.js] var x = "hello"; var x = 10; // Error reported so no declaration file generated? + + +//// [out.d.ts] +declare var x: string; +declare var x: string; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js index fc8c7b441658b..07d6fb812c066 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -25,3 +25,13 @@ var c = (function () { // error on above reference path when emitting declarations function foo() { } + + +//// [a.d.ts] +declare class c { +} +//// [c.d.ts] +declare function bar(): void; +//// [b.d.ts] +/// +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js index 87fccf56d5031..641a89c1c5049 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js @@ -13,3 +13,8 @@ var b = 30; a = 10; var a = 10; b = 30; + + +//// [out.d.ts] +declare let b: number; +declare let a: number; diff --git a/tests/baselines/reference/letAsIdentifier.js b/tests/baselines/reference/letAsIdentifier.js index 9e0bce41c8383..05811ce108890 100644 --- a/tests/baselines/reference/letAsIdentifier.js +++ b/tests/baselines/reference/letAsIdentifier.js @@ -11,3 +11,9 @@ var let = 10; var a = 10; let = 30; var a; + + +//// [letAsIdentifier.d.ts] +declare var let: number; +declare var a: number; +declare let a: any; diff --git a/tests/baselines/reference/out-flag3.js b/tests/baselines/reference/out-flag3.js index 3ec03ecc84192..8327c3429d3ae 100644 --- a/tests/baselines/reference/out-flag3.js +++ b/tests/baselines/reference/out-flag3.js @@ -21,4 +21,10 @@ var B = (function () { } return B; })(); -//# sourceMappingURL=c.js.map \ No newline at end of file +//# sourceMappingURL=c.js.map + +//// [c.d.ts] +declare class A { +} +declare class B { +} diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json index 591a855b5c92f..36eed6a651812 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json @@ -9,6 +9,7 @@ "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ - "test.js" + "test.js", + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json index 591a855b5c92f..36eed6a651812 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json @@ -9,6 +9,7 @@ "DifferentNamesSpecified/a.ts" ], "emittedFiles": [ - "test.js" + "test.js", + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts new file mode 100644 index 0000000000000..4c0b8989316ef --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts @@ -0,0 +1 @@ +declare var test: number; diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts new file mode 100644 index 0000000000000..8147620b2111b --- /dev/null +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.d.ts @@ -0,0 +1,2 @@ +declare class C { +} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts new file mode 100644 index 0000000000000..4ff813c3839e8 --- /dev/null +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.d.ts @@ -0,0 +1,4 @@ +/// +declare class B { + c: C; +} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json index 14f15bd6fdb53..42f348a4b56d6 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json @@ -15,6 +15,8 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/fileB.js" + "outdir/simple/FolderC/fileC.d.ts", + "outdir/simple/fileB.js", + "outdir/simple/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts new file mode 100644 index 0000000000000..8147620b2111b --- /dev/null +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.d.ts @@ -0,0 +1,2 @@ +declare class C { +} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts new file mode 100644 index 0000000000000..4ff813c3839e8 --- /dev/null +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.d.ts @@ -0,0 +1,4 @@ +/// +declare class B { + c: C; +} diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json index 14f15bd6fdb53..42f348a4b56d6 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json @@ -15,6 +15,8 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/fileB.js" + "outdir/simple/FolderC/fileC.d.ts", + "outdir/simple/fileB.js", + "outdir/simple/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/widenedTypes.js b/tests/baselines/reference/widenedTypes.js index 5d48d8f5636e9..a0ff6327f2500 100644 --- a/tests/baselines/reference/widenedTypes.js +++ b/tests/baselines/reference/widenedTypes.js @@ -41,3 +41,17 @@ var ob = { x: "" }; // Highlights the difference between array literals and object literals var arr = [3, null]; // not assignable because null is not widened. BCT is {} var obj = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any + + +//// [widenedTypes.d.ts] +declare var t: number[]; +declare var x: typeof undefined; +declare var y: any; +declare var u: number[]; +declare var ob: { + x: typeof undefined; +}; +declare var arr: string[]; +declare var obj: { + [x: string]: string; +}; diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts index f94e15aee62b7..6ab8ab9ad07bd 100644 --- a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts @@ -16,7 +16,8 @@ verify.getSemanticDiagnostics('[]'); goTo.marker("2"); verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); verify.verifyGetEmitOutputContentsForCurrentFile([ - { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }]); + { fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" }, + { fileName: "out.d.ts", content: "" }]); goTo.marker("2"); verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]'); goTo.marker("1"); From 9f12bc8a1b0d100e87d336d8303fe5cf9fe09045 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 29 Oct 2015 17:51:36 -0700 Subject: [PATCH 115/353] feedback from pr, new tests --- src/compiler/checker.ts | 61 +++++------ tests/baselines/reference/typeGuardEnums.js | 41 +++++++ .../reference/typeGuardEnums.symbols | 34 ++++++ .../baselines/reference/typeGuardEnums.types | 40 +++++++ tests/baselines/reference/typeGuardNesting.js | 26 ++++- .../reference/typeGuardNesting.symbols | 44 +++++++- .../reference/typeGuardNesting.types | 100 +++++++++++++++++- .../reference/typeGuardOfFormTypeOfOther.js | 24 ++--- .../typeGuardOfFormTypeOfOther.symbols | 18 ++-- .../typeGuardOfFormTypeOfOther.types | 30 +++--- .../typeGuardTautologicalConsistiency.js | 24 +++++ .../typeGuardTautologicalConsistiency.symbols | 23 ++++ .../typeGuardTautologicalConsistiency.types | 36 +++++++ .../expressions/typeGuards/typeGuardEnums.ts | 18 ++++ .../typeGuards/typeGuardNesting.ts | 14 ++- .../typeGuards/typeGuardOfFormTypeOfOther.ts | 12 +-- .../typeGuardTautologicalConsistiency.ts | 11 ++ 17 files changed, 463 insertions(+), 93 deletions(-) create mode 100644 tests/baselines/reference/typeGuardEnums.js create mode 100644 tests/baselines/reference/typeGuardEnums.symbols create mode 100644 tests/baselines/reference/typeGuardEnums.types create mode 100644 tests/baselines/reference/typeGuardTautologicalConsistiency.js create mode 100644 tests/baselines/reference/typeGuardTautologicalConsistiency.symbols create mode 100644 tests/baselines/reference/typeGuardTautologicalConsistiency.types create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 93b644b07a4b0..4e8cb7cc340f6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6177,27 +6177,6 @@ namespace ts { Debug.fail("should not get here"); } - // For a union type, remove all constituent types that are of the given type kind (when isOfTypeKind is true) - // or not of the given type kind (when isOfTypeKind is false) - function removeTypesFromUnionType(type: Type, typeKind: TypeFlags, isOfTypeKind: boolean, allowEmptyUnionResult: boolean): Type { - if (type.flags & TypeFlags.Union) { - let types = (type).types; - if (forEach(types, t => !!(t.flags & typeKind) === isOfTypeKind)) { - // Above we checked if we have anything to remove, now use the opposite test to do the removal - let narrowedType = getUnionType(filter(types, t => !(t.flags & typeKind) === isOfTypeKind)); - if (allowEmptyUnionResult || narrowedType !== emptyObjectType) { - return narrowedType; - } - } - } - else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) { - // Use getUnionType(emptyArray) instead of emptyObjectType in case the way empty union types - // are represented ever changes. - return getUnionType(emptyArray); - } - return type; - } - function hasInitializer(node: VariableLikeDeclaration): boolean { return !!(node.initializer || isBindingPattern(node.parent) && hasInitializer(node.parent.parent)); } @@ -6296,6 +6275,7 @@ namespace ts { // Get the narrowed type of a given symbol at a given location function getNarrowedTypeOfSymbol(symbol: Symbol, node: Node) { let type = getTypeOfSymbol(symbol); + let originalType = type; // Only narrow when symbol is variable of type any or an object, union, or type parameter type if (node && symbol.flags & SymbolFlags.Variable) { if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) { @@ -6338,10 +6318,6 @@ namespace ts { // Stop at the first containing function or module declaration break loop; } - // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type - if (narrowedType === getUnionType(emptyArray)) { - narrowedType = type; - } // Use narrowed type if construct contains no assignments to variable if (narrowedType !== type) { if (isVariableAssignedWithin(symbol, node)) { @@ -6350,6 +6326,11 @@ namespace ts { type = narrowedType; } } + + // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type + if (type === getUnionType(emptyArray)) { + type = originalType; + } } } @@ -6369,22 +6350,24 @@ namespace ts { assumeTrue = !assumeTrue; } let typeInfo = primitiveTypeInfo[right.text]; - // If the type to be narrowed is any and we're affirmatively checking against a primitive, return the primitive + // If the type to be narrowed is any and we're checking a primitive with assumeTrue=true, return the primitive if (!!(type.flags & TypeFlags.Any) && typeInfo && assumeTrue) { return typeInfo.type; } - // At this point we can bail if it's not a union - if (!(type.flags & TypeFlags.Union)) { - return type; - } - let flags = typeInfo ? typeInfo.flags : (assumeTrue = !assumeTrue, TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.ESSymbol | TypeFlags.Boolean); - let union = type as UnionType; - if (assumeTrue) { - return getUnionType(filter(union.types, t => !!(t.flags & flags))); + let flags: TypeFlags; + if (typeInfo) { + flags = typeInfo.flags; } else { - return getUnionType(filter(union.types, t => !(t.flags & flags))); + assumeTrue = !assumeTrue; + flags = TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.ESSymbol | TypeFlags.Boolean; } + // At this point we can bail if it's not a union + if (!(type.flags & TypeFlags.Union)) { + // If the active non-union type would be removed from a union by this type guard, return an empty union + return (assumeTrue === !!(type.flags & flags)) ? type : getUnionType(emptyArray); + } + return getUnionType(filter((type as UnionType).types, t => assumeTrue === !!(t.flags & flags)), /*noSubtypeReduction*/ true); } function narrowTypeByAnd(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type { @@ -12554,7 +12537,13 @@ namespace ts { // After we remove all types that are StringLike, we will know if there was a string constituent // based on whether the remaining type is the same as the initial type. - let arrayType = removeTypesFromUnionType(arrayOrStringType, TypeFlags.StringLike, /*isTypeOfKind*/ true, /*allowEmptyUnionResult*/ true); + let arrayType = arrayOrStringType; + if (arrayOrStringType.flags & TypeFlags.Union) { + arrayType = getUnionType(filter((arrayOrStringType as UnionType).types, t => !(t.flags & TypeFlags.StringLike))); + } + else if (arrayOrStringType.flags & TypeFlags.StringLike) { + arrayType = getUnionType(emptyArray); + } let hasStringConstituent = arrayOrStringType !== arrayType; let reportedError = false; diff --git a/tests/baselines/reference/typeGuardEnums.js b/tests/baselines/reference/typeGuardEnums.js new file mode 100644 index 0000000000000..1eb4b7552c4c9 --- /dev/null +++ b/tests/baselines/reference/typeGuardEnums.js @@ -0,0 +1,41 @@ +//// [typeGuardEnums.ts] +enum E {} +enum V {} + +let x: number|string|E|V; + +if (typeof x === "number") { + x; // number|E|V +} +else { + x; // string +} + +if (typeof x !== "number") { + x; // string +} +else { + x; // number|E|V +} + + +//// [typeGuardEnums.js] +var E; +(function (E) { +})(E || (E = {})); +var V; +(function (V) { +})(V || (V = {})); +var x; +if (typeof x === "number") { + x; // number|E|V +} +else { + x; // string +} +if (typeof x !== "number") { + x; // string +} +else { + x; // number|E|V +} diff --git a/tests/baselines/reference/typeGuardEnums.symbols b/tests/baselines/reference/typeGuardEnums.symbols new file mode 100644 index 0000000000000..8f1a396c481a1 --- /dev/null +++ b/tests/baselines/reference/typeGuardEnums.symbols @@ -0,0 +1,34 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts === +enum E {} +>E : Symbol(E, Decl(typeGuardEnums.ts, 0, 0)) + +enum V {} +>V : Symbol(V, Decl(typeGuardEnums.ts, 0, 9)) + +let x: number|string|E|V; +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) +>E : Symbol(E, Decl(typeGuardEnums.ts, 0, 0)) +>V : Symbol(V, Decl(typeGuardEnums.ts, 0, 9)) + +if (typeof x === "number") { +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) + + x; // number|E|V +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) +} +else { + x; // string +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) +} + +if (typeof x !== "number") { +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) + + x; // string +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) +} +else { + x; // number|E|V +>x : Symbol(x, Decl(typeGuardEnums.ts, 3, 3)) +} + diff --git a/tests/baselines/reference/typeGuardEnums.types b/tests/baselines/reference/typeGuardEnums.types new file mode 100644 index 0000000000000..1d39a81d78acd --- /dev/null +++ b/tests/baselines/reference/typeGuardEnums.types @@ -0,0 +1,40 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts === +enum E {} +>E : E + +enum V {} +>V : V + +let x: number|string|E|V; +>x : number | string | E | V +>E : E +>V : V + +if (typeof x === "number") { +>typeof x === "number" : boolean +>typeof x : string +>x : number | string | E | V +>"number" : string + + x; // number|E|V +>x : number | E | V +} +else { + x; // string +>x : string +} + +if (typeof x !== "number") { +>typeof x !== "number" : boolean +>typeof x : string +>x : number | string | E | V +>"number" : string + + x; // string +>x : string +} +else { + x; // number|E|V +>x : number | E | V +} + diff --git a/tests/baselines/reference/typeGuardNesting.js b/tests/baselines/reference/typeGuardNesting.js index 4c9a64c2851f5..364653d02738c 100644 --- a/tests/baselines/reference/typeGuardNesting.js +++ b/tests/baselines/reference/typeGuardNesting.js @@ -1,11 +1,31 @@ //// [typeGuardNesting.ts] let strOrBool: string|boolean; if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { - var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; -} + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +} + +if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') { + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +} + //// [typeGuardNesting.js] var strOrBool; if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { - var label = (typeof strOrBool === 'string') ? strOrBool : "other string"; + var label = (typeof strOrBool === 'string') ? strOrBool : "string"; + var bool = (typeof strOrBool === 'boolean') ? strOrBool : false; + var label2 = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + var bool2 = (typeof strOrBool !== 'string') ? strOrBool : false; +} +if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') { + var label = (typeof strOrBool === 'string') ? strOrBool : "string"; + var bool = (typeof strOrBool === 'boolean') ? strOrBool : false; + var label2 = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + var bool2 = (typeof strOrBool !== 'string') ? strOrBool : false; } diff --git a/tests/baselines/reference/typeGuardNesting.symbols b/tests/baselines/reference/typeGuardNesting.symbols index f0cfb1f1eed6f..427db81f3ed56 100644 --- a/tests/baselines/reference/typeGuardNesting.symbols +++ b/tests/baselines/reference/typeGuardNesting.symbols @@ -7,8 +7,50 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) >strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) - var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; >label : Symbol(label, Decl(typeGuardNesting.ts, 2, 4)) >strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; +>bool : Symbol(bool, Decl(typeGuardNesting.ts, 3, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; +>label2 : Symbol(label2, Decl(typeGuardNesting.ts, 4, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +>bool2 : Symbol(bool2, Decl(typeGuardNesting.ts, 5, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) >strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) } + +if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') { +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; +>label : Symbol(label, Decl(typeGuardNesting.ts, 9, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; +>bool : Symbol(bool, Decl(typeGuardNesting.ts, 10, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; +>label2 : Symbol(label2, Decl(typeGuardNesting.ts, 11, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) + + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +>bool2 : Symbol(bool2, Decl(typeGuardNesting.ts, 12, 4)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +>strOrBool : Symbol(strOrBool, Decl(typeGuardNesting.ts, 0, 3)) +} + diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types index 9f79974635dff..255e96da89eb8 100644 --- a/tests/baselines/reference/typeGuardNesting.types +++ b/tests/baselines/reference/typeGuardNesting.types @@ -17,14 +17,108 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >strOrBool : string | boolean >'string' : string - var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; >label : string ->(typeof strOrBool === 'string') ? strOrBool : "other string" : string +>(typeof strOrBool === 'string') ? strOrBool : "string" : string >(typeof strOrBool === 'string') : boolean >typeof strOrBool === 'string' : boolean >typeof strOrBool : string >strOrBool : boolean | string >'string' : string >strOrBool : string ->"other string" : string +>"string" : string + + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; +>bool : boolean +>(typeof strOrBool === 'boolean') ? strOrBool : false : boolean +>(typeof strOrBool === 'boolean') : boolean +>typeof strOrBool === 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'boolean' : string +>strOrBool : boolean +>false : boolean + + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; +>label2 : string +>(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string +>(typeof strOrBool !== 'boolean') : boolean +>typeof strOrBool !== 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'boolean' : string +>strOrBool : string +>"string" : string + + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +>bool2 : boolean +>(typeof strOrBool !== 'string') ? strOrBool : false : boolean +>(typeof strOrBool !== 'string') : boolean +>typeof strOrBool !== 'string' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'string' : string +>strOrBool : boolean +>false : boolean } + +if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') { +>(typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean' : boolean +>(typeof strOrBool !== 'string' && !strOrBool) : boolean +>typeof strOrBool !== 'string' && !strOrBool : boolean +>typeof strOrBool !== 'string' : boolean +>typeof strOrBool : string +>strOrBool : string | boolean +>'string' : string +>!strOrBool : boolean +>strOrBool : boolean +>typeof strOrBool !== 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : string | boolean +>'boolean' : string + + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; +>label : string +>(typeof strOrBool === 'string') ? strOrBool : "string" : string +>(typeof strOrBool === 'string') : boolean +>typeof strOrBool === 'string' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'string' : string +>strOrBool : string +>"string" : string + + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; +>bool : boolean +>(typeof strOrBool === 'boolean') ? strOrBool : false : boolean +>(typeof strOrBool === 'boolean') : boolean +>typeof strOrBool === 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'boolean' : string +>strOrBool : boolean +>false : boolean + + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; +>label2 : string +>(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string +>(typeof strOrBool !== 'boolean') : boolean +>typeof strOrBool !== 'boolean' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'boolean' : string +>strOrBool : string +>"string" : string + + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +>bool2 : boolean +>(typeof strOrBool !== 'string') ? strOrBool : false : boolean +>(typeof strOrBool !== 'string') : boolean +>typeof strOrBool !== 'string' : boolean +>typeof strOrBool : string +>strOrBool : boolean | string +>'string' : string +>strOrBool : boolean +>false : boolean +} + diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js index 3bb1a2091f6cd..d1cb49941961f 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js @@ -23,19 +23,19 @@ if (typeof strOrC === "Object") { c = strOrC; // C } else { - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string } if (typeof numOrC === "Object") { c = numOrC; // C } else { - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number } if (typeof boolOrC === "Object") { c = boolOrC; // C } else { - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean } // Narrowing occurs only if target type is a subtype of variable type @@ -50,19 +50,19 @@ else { // - when true, narrows the type of x by typeof x === s when false, or // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrC !== "Object") { - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string } else { c = strOrC; // C } if (typeof numOrC !== "Object") { - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number } else { c = numOrC; // C } if (typeof boolOrC !== "Object") { - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean } else { c = boolOrC; // C @@ -104,19 +104,19 @@ if (typeof strOrC === "Object") { c = strOrC; // C } else { - var r2 = strOrC; // string | C + var r2 = strOrC; // string } if (typeof numOrC === "Object") { c = numOrC; // C } else { - var r3 = numOrC; // number | C + var r3 = numOrC; // number } if (typeof boolOrC === "Object") { c = boolOrC; // C } else { - var r4 = boolOrC; // boolean | C + var r4 = boolOrC; // boolean } // Narrowing occurs only if target type is a subtype of variable type if (typeof strOrNumOrBool === "Object") { @@ -129,19 +129,19 @@ else { // - when true, narrows the type of x by typeof x === s when false, or // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrC !== "Object") { - var r2 = strOrC; // string | C + var r2 = strOrC; // string } else { c = strOrC; // C } if (typeof numOrC !== "Object") { - var r3 = numOrC; // number | C + var r3 = numOrC; // number } else { c = numOrC; // C } if (typeof boolOrC !== "Object") { - var r4 = boolOrC; // boolean | C + var r4 = boolOrC; // boolean } else { c = boolOrC; // C diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols index e3ecffdc2e9c2..eb120d468dcb4 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols @@ -56,9 +56,8 @@ if (typeof strOrC === "Object") { >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) } else { - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 51, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) } if (typeof numOrC === "Object") { @@ -69,9 +68,8 @@ if (typeof numOrC === "Object") { >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) } else { - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 57, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) } if (typeof boolOrC === "Object") { @@ -82,9 +80,8 @@ if (typeof boolOrC === "Object") { >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) } else { - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 63, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) } @@ -108,9 +105,8 @@ else { if (typeof strOrC !== "Object") { >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string >r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 51, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) } else { @@ -121,9 +117,8 @@ else { if (typeof numOrC !== "Object") { >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number >r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 57, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) } else { @@ -134,9 +129,8 @@ else { if (typeof boolOrC !== "Object") { >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean >r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 63, 7)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) >boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) } else { diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types index 8150c3ec25d5a..5cec356719493 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types @@ -60,9 +60,8 @@ if (typeof strOrC === "Object") { >strOrC : C } else { - var r2: string | C = strOrC; // string | C ->r2 : string | C ->C : C + var r2: string = strOrC; // string +>r2 : string >strOrC : string } if (typeof numOrC === "Object") { @@ -77,9 +76,8 @@ if (typeof numOrC === "Object") { >numOrC : C } else { - var r3: number | C = numOrC; // number | C ->r3 : number | C ->C : C + var r3: number = numOrC; // number +>r3 : number >numOrC : number } if (typeof boolOrC === "Object") { @@ -94,9 +92,8 @@ if (typeof boolOrC === "Object") { >boolOrC : C } else { - var r4: boolean | C = boolOrC; // boolean | C ->r4 : boolean | C ->C : C + var r4: boolean = boolOrC; // boolean +>r4 : boolean >boolOrC : boolean } @@ -126,9 +123,8 @@ if (typeof strOrC !== "Object") { >strOrC : string | C >"Object" : string - var r2: string | C = strOrC; // string | C ->r2 : string | C ->C : C + var r2: string = strOrC; // string +>r2 : string >strOrC : string } else { @@ -143,9 +139,8 @@ if (typeof numOrC !== "Object") { >numOrC : number | C >"Object" : string - var r3: number | C = numOrC; // number | C ->r3 : number | C ->C : C + var r3: number = numOrC; // number +>r3 : number >numOrC : number } else { @@ -160,9 +155,8 @@ if (typeof boolOrC !== "Object") { >boolOrC : boolean | C >"Object" : string - var r4: boolean | C = boolOrC; // boolean | C ->r4 : boolean | C ->C : C + var r4: boolean = boolOrC; // boolean +>r4 : boolean >boolOrC : boolean } else { diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.js b/tests/baselines/reference/typeGuardTautologicalConsistiency.js new file mode 100644 index 0000000000000..1b7fa2021c534 --- /dev/null +++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.js @@ -0,0 +1,24 @@ +//// [typeGuardTautologicalConsistiency.ts] +let stringOrNumber: string | number; + +if (typeof stringOrNumber === "number") { + if (typeof stringOrNumber !== "number") { + stringOrNumber; + } +} + +if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { + stringOrNumber; +} + + +//// [typeGuardTautologicalConsistiency.js] +var stringOrNumber; +if (typeof stringOrNumber === "number") { + if (typeof stringOrNumber !== "number") { + stringOrNumber; + } +} +if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { + stringOrNumber; +} diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols b/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols new file mode 100644 index 0000000000000..9ee82a5413fe3 --- /dev/null +++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.symbols @@ -0,0 +1,23 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts === +let stringOrNumber: string | number; +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) + +if (typeof stringOrNumber === "number") { +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) + + if (typeof stringOrNumber !== "number") { +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) + + stringOrNumber; +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) + } +} + +if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) + + stringOrNumber; +>stringOrNumber : Symbol(stringOrNumber, Decl(typeGuardTautologicalConsistiency.ts, 0, 3)) +} + diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.types b/tests/baselines/reference/typeGuardTautologicalConsistiency.types new file mode 100644 index 0000000000000..9acb1464761d1 --- /dev/null +++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.types @@ -0,0 +1,36 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts === +let stringOrNumber: string | number; +>stringOrNumber : string | number + +if (typeof stringOrNumber === "number") { +>typeof stringOrNumber === "number" : boolean +>typeof stringOrNumber : string +>stringOrNumber : string | number +>"number" : string + + if (typeof stringOrNumber !== "number") { +>typeof stringOrNumber !== "number" : boolean +>typeof stringOrNumber : string +>stringOrNumber : number +>"number" : string + + stringOrNumber; +>stringOrNumber : string + } +} + +if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { +>typeof stringOrNumber === "number" && typeof stringOrNumber !== "number" : boolean +>typeof stringOrNumber === "number" : boolean +>typeof stringOrNumber : string +>stringOrNumber : string | number +>"number" : string +>typeof stringOrNumber !== "number" : boolean +>typeof stringOrNumber : string +>stringOrNumber : number +>"number" : string + + stringOrNumber; +>stringOrNumber : number +} + diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts new file mode 100644 index 0000000000000..54e9a1bd8fe4b --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardEnums.ts @@ -0,0 +1,18 @@ +enum E {} +enum V {} + +let x: number|string|E|V; + +if (typeof x === "number") { + x; // number|E|V +} +else { + x; // string +} + +if (typeof x !== "number") { + x; // string +} +else { + x; // number|E|V +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts index b06b5880800ec..6423af18a5adc 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardNesting.ts @@ -1,4 +1,14 @@ let strOrBool: string|boolean; if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'string') { - var label: string = (typeof strOrBool === 'string') ? strOrBool : "other string"; -} \ No newline at end of file + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +} + +if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boolean') { + let label: string = (typeof strOrBool === 'string') ? strOrBool : "string"; + let bool: boolean = (typeof strOrBool === 'boolean') ? strOrBool : false; + let label2: string = (typeof strOrBool !== 'boolean') ? strOrBool : "string"; + let bool2: boolean = (typeof strOrBool !== 'string') ? strOrBool : false; +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts index 9d7d555fc1850..ac3403d8151ad 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts @@ -22,19 +22,19 @@ if (typeof strOrC === "Object") { c = strOrC; // C } else { - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string } if (typeof numOrC === "Object") { c = numOrC; // C } else { - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number } if (typeof boolOrC === "Object") { c = boolOrC; // C } else { - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean } // Narrowing occurs only if target type is a subtype of variable type @@ -49,19 +49,19 @@ else { // - when true, narrows the type of x by typeof x === s when false, or // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrC !== "Object") { - var r2: string | C = strOrC; // string | C + var r2: string = strOrC; // string } else { c = strOrC; // C } if (typeof numOrC !== "Object") { - var r3: number | C = numOrC; // number | C + var r3: number = numOrC; // number } else { c = numOrC; // C } if (typeof boolOrC !== "Object") { - var r4: boolean | C = boolOrC; // boolean | C + var r4: boolean = boolOrC; // boolean } else { c = boolOrC; // C diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts new file mode 100644 index 0000000000000..9a44603d2d43b --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardTautologicalConsistiency.ts @@ -0,0 +1,11 @@ +let stringOrNumber: string | number; + +if (typeof stringOrNumber === "number") { + if (typeof stringOrNumber !== "number") { + stringOrNumber; + } +} + +if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { + stringOrNumber; +} From 19e796dcbd61d77601f27c9cb4bd4fea396d633d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 29 Oct 2015 18:46:06 -0700 Subject: [PATCH 116/353] More correctness --- src/compiler/checker.ts | 64 ++++++++++++------- .../typeGuardTautologicalConsistiency.types | 4 +- 2 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4e8cb7cc340f6..30edecf3b40b9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6275,55 +6275,67 @@ namespace ts { // Get the narrowed type of a given symbol at a given location function getNarrowedTypeOfSymbol(symbol: Symbol, node: Node) { let type = getTypeOfSymbol(symbol); - let originalType = type; // Only narrow when symbol is variable of type any or an object, union, or type parameter type if (node && symbol.flags & SymbolFlags.Variable) { if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) { + let originalType = type; + let nodeStack: {node: Node, child: Node}[] = []; loop: while (node.parent) { let child = node; node = node.parent; - let narrowedType = type; + switch (node.kind) { + case SyntaxKind.IfStatement: + case SyntaxKind.ConditionalExpression: + case SyntaxKind.BinaryExpression: + nodeStack.push({node, child}); + break; + case SyntaxKind.SourceFile: + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + case SyntaxKind.Constructor: + // Stop at the first containing function or module declaration + break loop; + } + } + + let nodes: {node: Node, child: Node}; + while (nodes = nodeStack.pop()) { + let {node, child} = nodes; switch (node.kind) { case SyntaxKind.IfStatement: // In a branch of an if statement, narrow based on controlling expression if (child !== (node).expression) { - narrowedType = narrowType(type, (node).expression, /*assumeTrue*/ child === (node).thenStatement); + type = narrowType(type, (node).expression, /*assumeTrue*/ child === (node).thenStatement); } break; case SyntaxKind.ConditionalExpression: // In a branch of a conditional expression, narrow based on controlling condition if (child !== (node).condition) { - narrowedType = narrowType(type, (node).condition, /*assumeTrue*/ child === (node).whenTrue); + type = narrowType(type, (node).condition, /*assumeTrue*/ child === (node).whenTrue); } break; case SyntaxKind.BinaryExpression: // In the right operand of an && or ||, narrow based on left operand if (child === (node).right) { if ((node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken) { - narrowedType = narrowType(type, (node).left, /*assumeTrue*/ true); + type = narrowType(type, (node).left, /*assumeTrue*/ true); } else if ((node).operatorToken.kind === SyntaxKind.BarBarToken) { - narrowedType = narrowType(type, (node).left, /*assumeTrue*/ false); + type = narrowType(type, (node).left, /*assumeTrue*/ false); } } break; - case SyntaxKind.SourceFile: - case SyntaxKind.ModuleDeclaration: - case SyntaxKind.FunctionDeclaration: - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - case SyntaxKind.Constructor: - // Stop at the first containing function or module declaration - break loop; + default: + Debug.fail("Unreachable!"); } - // Use narrowed type if construct contains no assignments to variable - if (narrowedType !== type) { - if (isVariableAssignedWithin(symbol, node)) { - break; - } - type = narrowedType; + + // Use original type if construct contains assignments to variable + if (!nodeStack.length && isVariableAssignedWithin(symbol, node)) { + type = originalType; } } @@ -6365,9 +6377,13 @@ namespace ts { // At this point we can bail if it's not a union if (!(type.flags & TypeFlags.Union)) { // If the active non-union type would be removed from a union by this type guard, return an empty union - return (assumeTrue === !!(type.flags & flags)) ? type : getUnionType(emptyArray); + return filterUnion(type) ? type : getUnionType(emptyArray); + } + return getUnionType(filter((type as UnionType).types, filterUnion), /*noSubtypeReduction*/ true); + + function filterUnion(t: Type) { + return assumeTrue === !!(t.flags & flags); } - return getUnionType(filter((type as UnionType).types, t => assumeTrue === !!(t.flags & flags)), /*noSubtypeReduction*/ true); } function narrowTypeByAnd(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type { diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.types b/tests/baselines/reference/typeGuardTautologicalConsistiency.types index 9acb1464761d1..d758dcde22bc8 100644 --- a/tests/baselines/reference/typeGuardTautologicalConsistiency.types +++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.types @@ -15,7 +15,7 @@ if (typeof stringOrNumber === "number") { >"number" : string stringOrNumber; ->stringOrNumber : string +>stringOrNumber : string | number } } @@ -31,6 +31,6 @@ if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { >"number" : string stringOrNumber; ->stringOrNumber : number +>stringOrNumber : string | number } From 0d0c05d1d3c4ef94fc15d17b5f2602729539ec8e Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 29 Oct 2015 18:50:11 -0700 Subject: [PATCH 117/353] that feling when you ctrl-z 1 too many times --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 30edecf3b40b9..8ae8ab3d54c26 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6334,7 +6334,7 @@ namespace ts { } // Use original type if construct contains assignments to variable - if (!nodeStack.length && isVariableAssignedWithin(symbol, node)) { + if (type != originalType && isVariableAssignedWithin(symbol, node)) { type = originalType; } } From 94a647b72b48609ce752f1f9fd72cd451e3d88cf Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 11:36:39 -0700 Subject: [PATCH 118/353] Do not emit declarations for javascript files --- src/compiler/declarationEmitter.ts | 20 ++++++++++++++----- src/compiler/emitter.ts | 2 +- src/compiler/program.ts | 2 +- src/compiler/utilities.ts | 2 +- .../jsFileCompilationDuplicateVariable.js | 1 - ...mpilationDuplicateVariableErrorReported.js | 1 - .../jsFileCompilationEmitDeclarations.js | 1 - ...ileCompilationEmitTrippleSlashReference.js | 2 -- ...onsWithJsFileReferenceWithNoOut.errors.txt | 2 +- ...eclarationsWithJsFileReferenceWithNoOut.js | 8 +++----- ...nDeclarationsWithJsFileReferenceWithOut.js | 1 - ...tionsWithJsFileReferenceWithOutDir.symbols | 16 +++++++++++++++ ...rationsWithJsFileReferenceWithOutDir.types | 16 +++++++++++++++ .../jsFileCompilationLetDeclarationOrder.js | 1 - .../jsFileCompilationLetDeclarationOrder2.js | 1 - .../amd/test.d.ts | 1 - .../node/test.d.ts | 1 - .../amd/test.d.ts | 1 - .../node/test.d.ts | 1 - ...eclarationsWithJsFileReferenceWithNoOut.ts | 2 +- ...clarationsWithJsFileReferenceWithOutDir.ts | 16 +++++++++++++++ 21 files changed, 71 insertions(+), 27 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types create mode 100644 tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index eb329c67b0b7e..89ab4027ed8b8 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -33,7 +33,9 @@ namespace ts { export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] { let diagnostics: Diagnostic[] = []; let { declarationFilePath } = getEmitFileNames(targetSourceFile, host); - emitDeclarations(host, resolver, diagnostics, declarationFilePath, targetSourceFile); + if (declarationFilePath) { + emitDeclarations(host, resolver, diagnostics, declarationFilePath, targetSourceFile); + } return diagnostics; } @@ -105,7 +107,7 @@ namespace ts { // Emit references corresponding to this file let emittedReferencedFiles: SourceFile[] = []; forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { + if (!isExternalModuleOrDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { // Check what references need to be added if (!compilerOptions.noResolve) { forEach(sourceFile.referencedFiles, fileReference => { @@ -1590,9 +1592,17 @@ namespace ts { } function writeReferencePath(referencedFile: SourceFile) { - let declFileName = referencedFile.flags & NodeFlags.DeclarationFile - ? referencedFile.fileName // Declaration file, use declaration file name - : getEmitFileNames(referencedFile, host).declarationFilePath; // declaration file name + let declFileName: string; + if (referencedFile.flags & NodeFlags.DeclarationFile) { + // Declaration file, use declaration file name + declFileName = referencedFile.fileName; + } + else { + // declaration file name + let { declarationFilePath, jsFilePath } = getEmitFileNames(referencedFile, host); + Debug.assert(!!declarationFilePath || isJavaScript(referencedFile.fileName), "Declaration file is not present only for javascript files"); + declFileName = declarationFilePath || jsFilePath; + } declFileName = getRelativePathToDirectoryOrUrl( getDirectoryPath(normalizeSlashes(declarationFilePath)), diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 872c9c74becda..cd6525a6bc395 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -8158,7 +8158,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitJavaScript(jsFilePath, sourceMapFilePath, sourceFile); } - if (compilerOptions.declaration) { + if (declarationFilePath) { emitSkipped = writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics) || emitSkipped; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index e569c69cccf66..a191c9f3e1caa 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1272,7 +1272,7 @@ namespace ts { if (sourceMapFilePath) { emitFilesSeen[sourceMapFilePath] = [file]; } - if (options.declaration) { + if (declarationFilePath) { emitFilesSeen[declarationFilePath] = [file]; } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 5fe6c8d38a69f..d5c60805d7088 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1797,7 +1797,7 @@ namespace ts { return { jsFilePath, sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), - declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) + declarationFilePath: !isJavaScript(sourceFile.fileName) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined }; } else if (options.outFile || options.out) { diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js index 3e3d0b9802acb..a70637bc7c066 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js @@ -13,4 +13,3 @@ var x = "hello"; // No error is recorded here and declaration file will show thi //// [out.d.ts] declare var x: number; -declare var x: number; diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js index 7b2643c13d3eb..fd9da7c71066b 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.js @@ -13,4 +13,3 @@ var x = 10; // Error reported so no declaration file generated? //// [out.d.ts] declare var x: string; -declare var x: string; diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js index c6711e4e85f42..d45ae325b0a76 100644 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js @@ -22,4 +22,3 @@ function foo() { //// [out.d.ts] declare class c { } -declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js index 04f36213b1bde..2d7d2743805ec 100644 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js @@ -29,5 +29,3 @@ function foo() { //// [out.d.ts] declare class c { } -declare function bar(): void; -declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt index 9be6b3f1ccdbd..273717d151cd4 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -8,7 +8,7 @@ error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the ==== tests/cases/compiler/b.ts (0 errors) ==== /// - // error on above reference path when emitting declarations + // b.d.ts should have c.js as the reference path since we dont emit declarations for js files function foo() { } diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js index 07d6fb812c066..cf2caab36003a 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -6,7 +6,7 @@ class c { //// [b.ts] /// -// error on above reference path when emitting declarations +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files function foo() { } @@ -22,7 +22,7 @@ var c = (function () { })(); //// [b.js] /// -// error on above reference path when emitting declarations +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files function foo() { } @@ -30,8 +30,6 @@ function foo() { //// [a.d.ts] declare class c { } -//// [c.d.ts] -declare function bar(): void; //// [b.d.ts] -/// +/// declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js index 0d1939d720801..67989f3e3e7da 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js @@ -31,5 +31,4 @@ function foo() { //// [out.d.ts] declare class c { } -declare function bar(): void; declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols new file mode 100644 index 0000000000000..424fd85c16587 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : Symbol(c, Decl(a.ts, 0, 0)) +} + +=== tests/cases/compiler/b.ts === +/// +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files +function foo() { +>foo : Symbol(foo, Decl(b.ts, 0, 0)) +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : Symbol(bar, Decl(c.js, 0, 0)) +} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types new file mode 100644 index 0000000000000..f8b82383ac47c --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +class c { +>c : c +} + +=== tests/cases/compiler/b.ts === +/// +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files +function foo() { +>foo : () => void +} + +=== tests/cases/compiler/c.js === +function bar() { +>bar : () => void +} diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js index 15a1e8d753354..16e4b7a3011f2 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.js @@ -17,5 +17,4 @@ a = 10; //// [out.d.ts] -declare let a: number; declare let b: number; diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js index 641a89c1c5049..890b1c22f717e 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.js @@ -17,4 +17,3 @@ b = 30; //// [out.d.ts] declare let b: number; -declare let a: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts index bbae04a30bf94..4c0b8989316ef 100644 --- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts @@ -1,2 +1 @@ declare var test: number; -declare var test2: number; diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts index 41d87d5f39b08..1741e3c280270 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.ts @@ -6,7 +6,7 @@ class c { // @filename: b.ts /// -// error on above reference path when emitting declarations +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files function foo() { } diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts new file mode 100644 index 0000000000000..64e009c251591 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts @@ -0,0 +1,16 @@ +// @allowJs: true +// @declaration: true +// @outDir: outDir +// @filename: a.ts +class c { +} + +// @filename: b.ts +/// +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files +function foo() { +} + +// @filename: c.js +function bar() { +} \ No newline at end of file From daba9016194833bc1a222e15a3ce34e6b78aa0e3 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 11:50:07 -0700 Subject: [PATCH 119/353] Report error if --allowJs option is used along with --declaration --- src/compiler/program.ts | 3 ++ ...DuplicateFunctionImplementation.errors.txt | 2 + ...ImplementationFileOrderReversed.errors.txt | 2 + ...ileCompilationDuplicateVariable.errors.txt | 9 +++++ ...jsFileCompilationDuplicateVariable.symbols | 8 ---- .../jsFileCompilationDuplicateVariable.types | 10 ----- ...nDuplicateVariableErrorReported.errors.txt | 2 + ...FileCompilationEmitDeclarations.errors.txt | 12 ++++++ .../jsFileCompilationEmitDeclarations.symbols | 10 ----- .../jsFileCompilationEmitDeclarations.types | 10 ----- ...lationEmitTrippleSlashReference.errors.txt | 16 ++++++++ ...mpilationEmitTrippleSlashReference.symbols | 15 -------- ...CompilationEmitTrippleSlashReference.types | 15 -------- ...onsWithJsFileReferenceWithNoOut.errors.txt | 2 + ...tionsWithJsFileReferenceWithOut.errors.txt | 17 +++++++++ ...arationsWithJsFileReferenceWithOut.symbols | 16 -------- ...clarationsWithJsFileReferenceWithOut.types | 16 -------- ...nsWithJsFileReferenceWithOutDir.errors.txt | 17 +++++++++ ...clarationsWithJsFileReferenceWithOutDir.js | 38 +++++++++++++++++++ ...tionsWithJsFileReferenceWithOutDir.symbols | 16 -------- ...rationsWithJsFileReferenceWithOutDir.types | 16 -------- ...eCompilationLetDeclarationOrder.errors.txt | 12 ++++++ ...FileCompilationLetDeclarationOrder.symbols | 14 ------- ...jsFileCompilationLetDeclarationOrder.types | 20 ---------- ...CompilationLetDeclarationOrder2.errors.txt | 2 + ...entNamesNotSpecifiedWithAllowJs.errors.txt | 8 ++++ ...entNamesNotSpecifiedWithAllowJs.errors.txt | 8 ++++ ...ferentNamesSpecifiedWithAllowJs.errors.txt | 8 ++++ ...ferentNamesSpecifiedWithAllowJs.errors.txt | 8 ++++ ...SameNameDTsSpecifiedWithAllowJs.errors.txt | 6 +++ ...SameNameDTsSpecifiedWithAllowJs.errors.txt | 6 +++ ...eNameDtsNotSpecifiedWithAllowJs.errors.txt | 6 +++ ...eNameDtsNotSpecifiedWithAllowJs.errors.txt | 6 +++ ...ameFilesNotSpecifiedWithAllowJs.errors.txt | 6 +++ ...ameFilesNotSpecifiedWithAllowJs.errors.txt | 6 +++ ...meNameFilesSpecifiedWithAllowJs.errors.txt | 6 +++ ...meNameFilesSpecifiedWithAllowJs.errors.txt | 6 +++ 37 files changed, 214 insertions(+), 166 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationDuplicateVariable.types create mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationEmitDeclarations.types create mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js delete mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types create mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt delete mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt diff --git a/src/compiler/program.ts b/src/compiler/program.ts index a191c9f3e1caa..a029a481d19a6 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1252,6 +1252,9 @@ namespace ts { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration")); } } + else if (options.allowJs && options.declaration) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration")); + } if (options.emitDecoratorMetadata && !options.experimentalDecorators) { diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt index fb0c214ddf657..b05fc6fa6d944 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt @@ -1,6 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation. +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. ==== tests/cases/compiler/b.js (0 errors) ==== function foo() { return 10; diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt index 78eb22546e8b0..82dbc27db0f40 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt @@ -1,6 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation. +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. ==== tests/cases/compiler/a.ts (1 errors) ==== function foo() { ~~~ diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt new file mode 100644 index 0000000000000..f8ae4a1ba74cd --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt @@ -0,0 +1,9 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/a.ts (0 errors) ==== + var x = 10; + +==== tests/cases/compiler/b.js (0 errors) ==== + var x = "hello"; // No error is recorded here and declaration file will show this as number \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols b/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols deleted file mode 100644 index 9bfc61a64f85a..0000000000000 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols +++ /dev/null @@ -1,8 +0,0 @@ -=== tests/cases/compiler/a.ts === -var x = 10; ->x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) - -=== tests/cases/compiler/b.js === -var x = "hello"; // No error is recorded here and declaration file will show this as number ->x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) - diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.types b/tests/baselines/reference/jsFileCompilationDuplicateVariable.types deleted file mode 100644 index fefad3f6ddaa6..0000000000000 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.types +++ /dev/null @@ -1,10 +0,0 @@ -=== tests/cases/compiler/a.ts === -var x = 10; ->x : number ->10 : number - -=== tests/cases/compiler/b.js === -var x = "hello"; // No error is recorded here and declaration file will show this as number ->x : number ->"hello" : string - diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt index a3abc11411837..f1374d957673f 100644 --- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt @@ -1,6 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. tests/cases/compiler/a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. ==== tests/cases/compiler/b.js (0 errors) ==== var x = "hello"; diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt b/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt new file mode 100644 index 0000000000000..3e89f9c9436f5 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt @@ -0,0 +1,12 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + function foo() { + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols b/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols deleted file mode 100644 index 5260b8d6cf36a..0000000000000 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols +++ /dev/null @@ -1,10 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.types b/tests/baselines/reference/jsFileCompilationEmitDeclarations.types deleted file mode 100644 index dce83eeb8ebb7..0000000000000 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.types +++ /dev/null @@ -1,10 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : c -} - -=== tests/cases/compiler/b.js === -function foo() { ->foo : () => void -} - diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt new file mode 100644 index 0000000000000..0cefa2eedac20 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt @@ -0,0 +1,16 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.js (0 errors) ==== + /// + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols deleted file mode 100644 index 805d202a14c20..0000000000000 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols +++ /dev/null @@ -1,15 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.js === -/// -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types deleted file mode 100644 index b206a486351dc..0000000000000 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types +++ /dev/null @@ -1,15 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : c -} - -=== tests/cases/compiler/b.js === -/// -function foo() { ->foo : () => void -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : () => void -} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt index 273717d151cd4..433a3c6b7be9d 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -1,6 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. !!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt new file mode 100644 index 0000000000000..441514014799d --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt @@ -0,0 +1,17 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (0 errors) ==== + /// + // error on above reference when emitting declarations + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols deleted file mode 100644 index 544fe53f425af..0000000000000 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols +++ /dev/null @@ -1,16 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.ts === -/// -// error on above reference when emitting declarations -function foo() { ->foo : Symbol(foo, Decl(b.ts, 0, 0)) -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types deleted file mode 100644 index 8aafb9f61d034..0000000000000 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types +++ /dev/null @@ -1,16 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : c -} - -=== tests/cases/compiler/b.ts === -/// -// error on above reference when emitting declarations -function foo() { ->foo : () => void -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : () => void -} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.errors.txt new file mode 100644 index 0000000000000..fb6c801b42e7c --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.errors.txt @@ -0,0 +1,17 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/a.ts (0 errors) ==== + class c { + } + +==== tests/cases/compiler/b.ts (0 errors) ==== + /// + // b.d.ts should have c.js as the reference path since we dont emit declarations for js files + function foo() { + } + +==== tests/cases/compiler/c.js (0 errors) ==== + function bar() { + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js new file mode 100644 index 0000000000000..afed8cd42e34e --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts] //// + +//// [a.ts] +class c { +} + +//// [b.ts] +/// +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files +function foo() { +} + +//// [c.js] +function bar() { +} + +//// [a.js] +var c = (function () { + function c() { + } + return c; +})(); +//// [c.js] +function bar() { +} +//// [b.js] +/// +// b.d.ts should have c.js as the reference path since we dont emit declarations for js files +function foo() { +} + + +//// [a.d.ts] +declare class c { +} +//// [b.d.ts] +/// +declare function foo(): void; diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols deleted file mode 100644 index 424fd85c16587..0000000000000 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols +++ /dev/null @@ -1,16 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== tests/cases/compiler/b.ts === -/// -// b.d.ts should have c.js as the reference path since we dont emit declarations for js files -function foo() { ->foo : Symbol(foo, Decl(b.ts, 0, 0)) -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types deleted file mode 100644 index f8b82383ac47c..0000000000000 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types +++ /dev/null @@ -1,16 +0,0 @@ -=== tests/cases/compiler/a.ts === -class c { ->c : c -} - -=== tests/cases/compiler/b.ts === -/// -// b.d.ts should have c.js as the reference path since we dont emit declarations for js files -function foo() { ->foo : () => void -} - -=== tests/cases/compiler/c.js === -function bar() { ->bar : () => void -} diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt new file mode 100644 index 0000000000000..20a9c81ea9c62 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt @@ -0,0 +1,12 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== tests/cases/compiler/b.js (0 errors) ==== + let a = 10; + b = 30; + +==== tests/cases/compiler/a.ts (0 errors) ==== + let b = 30; + a = 10; + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols deleted file mode 100644 index c1e97340dc975..0000000000000 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols +++ /dev/null @@ -1,14 +0,0 @@ -=== tests/cases/compiler/b.js === -let a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - -b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - -=== tests/cases/compiler/a.ts === -let b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - -a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types deleted file mode 100644 index a28c62813deb4..0000000000000 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types +++ /dev/null @@ -1,20 +0,0 @@ -=== tests/cases/compiler/b.js === -let a = 10; ->a : number ->10 : number - -b = 30; ->b = 30 : number ->b : number ->30 : number - -=== tests/cases/compiler/a.ts === -let b = 30; ->b : number ->30 : number - -a = 10; ->a = 10 : number ->a : number ->10 : number - diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt index fb213ec4433f7..b88c73e043918 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt @@ -1,6 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. tests/cases/compiler/a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration. +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. ==== tests/cases/compiler/a.ts (1 errors) ==== let b = 30; a = 10; diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..67b0592c05f1b --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; +==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ==== + var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..67b0592c05f1b --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; +==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ==== + var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..35c913a5835ba --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; +==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ==== + var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..35c913a5835ba --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,8 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; +==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ==== + var test2 = 10; // Should get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..cdec4ffb398f3 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ==== + declare var test: number; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..cdec4ffb398f3 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ==== + declare var test: number; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..8da5b629ca8c9 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== + declare var a: number; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..8da5b629ca8c9 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== + declare var a: number; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..9eb81a5f9f13d --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..9eb81a5f9f13d --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..ddfb63686b402 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt new file mode 100644 index 0000000000000..ddfb63686b402 --- /dev/null +++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt @@ -0,0 +1,6 @@ +error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. + + +!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ==== + var test = 10; \ No newline at end of file From 6ea74ae7f1ee00d49012ef8f65934ecb3b526631 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 11:56:44 -0700 Subject: [PATCH 120/353] Update the error messages as per PR feedback --- src/compiler/diagnosticMessages.json | 4 ++-- src/compiler/program.ts | 6 +++--- ...leOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline | 2 +- .../reference/declarationFileOverwriteError.errors.txt | 4 ++-- .../declarationFileOverwriteErrorWithOut.errors.txt | 4 ++-- .../reference/filesEmittingIntoSameOutput.errors.txt | 4 ++-- .../filesEmittingIntoSameOutputWithOutOption.errors.txt | 4 ++-- ...sFileCompilationAmbientVarDeclarationSyntax.errors.txt | 4 ++-- .../reference/jsFileCompilationDecoratorSyntax.errors.txt | 4 ++-- .../jsFileCompilationEmitBlockedCorrectly.errors.txt | 8 ++++---- .../reference/jsFileCompilationEnumSyntax.errors.txt | 4 ++-- ...rOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt | 4 ++-- .../jsFileCompilationExportAssignmentSyntax.errors.txt | 4 ++-- ...sFileCompilationHeritageClauseSyntaxOfClass.errors.txt | 4 ++-- .../jsFileCompilationImportEqualsSyntax.errors.txt | 4 ++-- .../reference/jsFileCompilationInterfaceSyntax.errors.txt | 4 ++-- .../reference/jsFileCompilationModuleSyntax.errors.txt | 4 ++-- ...outDeclarationsWithJsFileReferenceWithNoOut.errors.txt | 4 ++-- .../jsFileCompilationOptionalParameter.errors.txt | 4 ++-- .../jsFileCompilationPropertySyntaxOfClass.errors.txt | 4 ++-- .../jsFileCompilationPublicMethodSyntaxOfClass.errors.txt | 4 ++-- .../jsFileCompilationPublicParameterModifier.errors.txt | 4 ++-- ...jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt | 4 ++-- .../reference/jsFileCompilationSyntaxError.errors.txt | 4 ++-- .../reference/jsFileCompilationTypeAliasSyntax.errors.txt | 4 ++-- .../jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt | 4 ++-- .../reference/jsFileCompilationTypeAssertions.errors.txt | 4 ++-- .../reference/jsFileCompilationTypeOfParameter.errors.txt | 4 ++-- ...jsFileCompilationTypeParameterSyntaxOfClass.errors.txt | 4 ++-- ...ileCompilationTypeParameterSyntaxOfFunction.errors.txt | 4 ++-- .../reference/jsFileCompilationTypeSyntaxOfVar.errors.txt | 4 ++-- ...mpilationWithDeclarationEmitPathSameAsInput.errors.txt | 4 ++-- .../jsFileCompilationWithJsEmitPathSameAsInput.errors.txt | 8 ++++---- .../reference/jsFileCompilationWithMapFileAsJs.errors.txt | 4 ++-- ...mpilationWithMapFileAsJsWithInlineSourceMap.errors.txt | 4 ++-- ...WithOutDeclarationFileNameSameAsInputJsFile.errors.txt | 4 ++-- ...CompilationWithOutFileNameSameAsInputJsFile.errors.txt | 4 ++-- .../reference/jsFileCompilationWithoutOut.errors.txt | 4 ++-- 38 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 5b57556af009c..6cb5858f8ee5d 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2060,11 +2060,11 @@ "category": "Error", "code": 5054 }, - "Cannot write file '{0}' which is one of the input files.": { + "Cannot write file '{0}' because it would overwrite input file.": { "category": "Error", "code": 5055 }, - "Cannot write file '{0}' since one or more input files would emit into it.": { + "Cannot write file '{0}' because it would be overwritten by multiple input files.": { "category": "Error", "code": 5056 }, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index a029a481d19a6..0fab35dacb3bd 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1289,20 +1289,20 @@ namespace ts { forEachKey(emitFilesSeen, emitFilePath => { // Report error if the output overwrites input file if (hasFile(files, emitFilePath)) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_which_is_one_of_the_input_files); + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); } // Report error if multiple files write into same file (except if specified by --out or --outFile) if (emitFilePath !== (options.outFile || options.out)) { // Not --out or --outFile emit, There should be single file emitting to this file if (emitFilesSeen[emitFilePath].length > 1) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_since_one_or_more_input_files_would_emit_into_it); + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); } } else { // --out or --outFile, error if there exist file emitting to single file colliding with --out if (forEach(emitFilesSeen[emitFilePath], sourceFile => shouldEmitToOwnFile(sourceFile, options))) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_since_one_or_more_input_files_would_emit_into_it); + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); } } }); diff --git a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline index 5db889dc01daa..f9bcca268ec34 100644 --- a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline +++ b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline @@ -1,6 +1,6 @@ EmitSkipped: true Diagnostics: - Cannot write file 'tests/cases/fourslash/b.js' which is one of the input files. + Cannot write file 'tests/cases/fourslash/b.js' because it would overwrite input file. EmitSkipped: false FileName : tests/cases/fourslash/a.js diff --git a/tests/baselines/reference/declarationFileOverwriteError.errors.txt b/tests/baselines/reference/declarationFileOverwriteError.errors.txt index fbf4948c2030f..a12c60482e904 100644 --- a/tests/baselines/reference/declarationFileOverwriteError.errors.txt +++ b/tests/baselines/reference/declarationFileOverwriteError.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file. -!!! error TS5055: Cannot write file 'a.d.ts' which is one of the input files. +!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file. ==== tests/cases/compiler/a.d.ts (0 errors) ==== declare class c { diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt index b90bccbaf94a9..02251900345a4 100644 --- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt +++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file. -!!! error TS5055: Cannot write file 'out.d.ts' which is one of the input files. +!!! error TS5055: Cannot write file 'out.d.ts' because it would overwrite input file. ==== tests/cases/compiler/out.d.ts (0 errors) ==== declare class c { diff --git a/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt index 3a4c7eaad4509..013a1445b0d3e 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt +++ b/tests/baselines/reference/filesEmittingIntoSameOutput.errors.txt @@ -1,7 +1,7 @@ -error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. -!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt index 77cd91b9a7f56..087a159a9bf2e 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt @@ -1,7 +1,7 @@ -error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. -!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. ==== tests/cases/compiler/a.ts (0 errors) ==== export class c { } diff --git a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt index b0732afea729a..19bfd5d1c0205 100644 --- a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== declare var v; ~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt index b7fec2eefc671..a39d2e1665cf9 100644 --- a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== @internal class C { } ~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt index 5861e73f49b22..0aa9d5733d532 100644 --- a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt +++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt @@ -1,9 +1,9 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. -error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. -!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt index e9fd9cc31b759..538dfb38972bc 100644 --- a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== enum E { } ~ diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt index 433a3c6b7be9d..641731936f84a 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -1,9 +1,9 @@ error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. -error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file. !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. -!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt index 27371222dceb3..f537941c55cf1 100644 --- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== export = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt index c7d080404a232..33b8a45f1aab0 100644 --- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== class C implements D { } ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt index 36ab7aab18859..b416136703755 100644 --- a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== import a = b; ~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt index 3089aeecb4994..17fb8fcb18741 100644 --- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== interface I { } ~ diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt index d85819b8588b3..662028c53ed93 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== module M { } ~ diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt index 06bfd61c7ab0e..f2f4142b99380 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt index 6d9e3c5919d9e..295f827dd2d7c 100644 --- a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== function F(p?) { } ~ diff --git a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt index 5a35e68bcec74..fd5ea666459c1 100644 --- a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,11): error TS8014: 'property declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== class C { v } ~ diff --git a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt index a6d47e5fbe372..d67c9baea70e5 100644 --- a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== class C { public foo() { diff --git a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt index fa3e0e34a774b..bc4913f6217b4 100644 --- a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt +++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== class C { constructor(public x) { }} ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt index 8b83a9d1f903c..6dad5a294854c 100644 --- a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== function F(): number { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt index b06375e8a6a26..6e55ff30f04fd 100644 --- a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt +++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(3,6): error TS1223: 'type' tag already specified. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== /** * @type {number} diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt index a0724e452b79d..bc4d8e903ad62 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,1): error TS8008: 'type aliases' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== type a = b; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt index acefc2ff569d7..8ac59196ed960 100644 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== Foo(); ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index 50d6416a62b90..e73ee46fb89c9 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== var v = undefined; ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt index 69fa6251942db..680b32a64f1ad 100644 --- a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== function F(a: number) { } ~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt index f279896c4ed22..161c832ffd5d4 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== class C { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt index 9b056bcae505b..d7626f68564cf 100644 --- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== function F() { } ~ diff --git a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt index 080cb580bf2e5..2c6ac3771bef8 100644 --- a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. ==== tests/cases/compiler/a.js (1 errors) ==== var v: () => number; ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt index a9c60c0748fb4..84900bccc8848 100644 --- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file. -!!! error TS5055: Cannot write file 'a.d.ts' which is one of the input files. +!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt index 134c95dee1553..4cc2cc2ab4547 100644 --- a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt @@ -1,9 +1,9 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. -error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. +error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' which is one of the input files. -!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' since one or more input files would emit into it. +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. +!!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt index a97dc2c3cd659..06186b9f0b2fc 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. -!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. !!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt index a97dc2c3cd659..06186b9f0b2fc 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt @@ -1,8 +1,8 @@ -error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. -!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. !!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'. ==== tests/cases/compiler/a.ts (0 errors) ==== diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt index ed23a30c3faa0..826f906538fd1 100644 --- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file. -!!! error TS5055: Cannot write file 'b.d.ts' which is one of the input files. +!!! error TS5055: Cannot write file 'b.d.ts' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt index 3531296e019cf..0f6852b21a0a2 100644 --- a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt index 3531296e019cf..0f6852b21a0a2 100644 --- a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt @@ -1,7 +1,7 @@ -error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' which is one of the input files. +!!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file. ==== tests/cases/compiler/a.ts (0 errors) ==== class c { } From 67bed265b7f29162aa68a8979efeff6b6f75c633 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 11:57:20 -0700 Subject: [PATCH 121/353] Since js extensions are not user specified, no need to check if source map file will overwrite input file --- src/compiler/program.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 0fab35dacb3bd..2a451b908607e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1267,14 +1267,11 @@ namespace ts { // Build map of files seen for (let file of files) { - let { jsFilePath, sourceMapFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); + let { jsFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); if (jsFilePath) { let filesEmittingJsFilePath = lookUp(emitFilesSeen, jsFilePath); if (!filesEmittingJsFilePath) { emitFilesSeen[jsFilePath] = [file]; - if (sourceMapFilePath) { - emitFilesSeen[sourceMapFilePath] = [file]; - } if (declarationFilePath) { emitFilesSeen[declarationFilePath] = [file]; } From 4d3457ca4d8cc7c87d27a00deedef6a8c0617c9e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 12:03:59 -0700 Subject: [PATCH 122/353] Some refactoring as per PR feedback --- src/compiler/checker.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 78b89cc8ee9cc..2ba61ac713d73 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11854,12 +11854,10 @@ namespace ts { let symbol = getSymbolOfNode(node); let localSymbol = node.localSymbol || symbol; - let firstDeclaration = forEach(symbol.declarations, declaration => { + let firstDeclaration = forEach(symbol.declarations, // Get first non javascript function declaration - if (declaration.kind === node.kind && !isJavaScript(getSourceFile(declaration).fileName)) { - return declaration; - } - }); + declaration => declaration.kind === node.kind && !isJavaScript(getSourceFile(declaration).fileName) ? + declaration : undefined); // Only type check the symbol once if (node === firstDeclaration) { From 3b7213116d324585dc73548dc2289f8513b1884c Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 30 Oct 2015 12:34:56 -0700 Subject: [PATCH 123/353] Inference from JavaScript `prototype` property assignments --- src/compiler/binder.ts | 58 ++++++++++++++----- src/compiler/checker.ts | 31 +++++++--- src/compiler/types.ts | 13 +++++ src/compiler/utilities.ts | 36 ++++++++++++ tests/cases/fourslash/javaScriptPrototype1.ts | 26 ++++++--- tests/cases/fourslash/javaScriptPrototype2.ts | 36 ++++++++++++ tests/cases/fourslash/javaScriptPrototype3.ts | 40 +++++++++++++ tests/cases/fourslash/javaScriptPrototype4.ts | 36 ++++++++++++ 8 files changed, 247 insertions(+), 29 deletions(-) create mode 100644 tests/cases/fourslash/javaScriptPrototype2.ts create mode 100644 tests/cases/fourslash/javaScriptPrototype3.ts create mode 100644 tests/cases/fourslash/javaScriptPrototype4.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 85882c495b680..9bd51f0c7633b 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -167,8 +167,21 @@ namespace ts { case SyntaxKind.ExportAssignment: return (node).isExportEquals ? "export=" : "default"; case SyntaxKind.BinaryExpression: - // Binary expression case is for JS module 'module.exports = expr' - return "export="; + switch (getSpecialPropertyAssignmentKind(node)) { + case SpecialPropertyAssignmentKind.ModuleExports: + // module.exports = ... + return "export="; + case SpecialPropertyAssignmentKind.ExportsProperty: + case SpecialPropertyAssignmentKind.ThisProperty: + // exports.x = ... or this.y = ... + return ((node as BinaryExpression).left as PropertyAccessExpression).name.text; + case SpecialPropertyAssignmentKind.PrototypeProperty: + // className.prototype.methodName = ... + return (((node as BinaryExpression).left as PropertyAccessExpression).expression as PropertyAccessExpression).name.text; + } + Debug.fail("Unknown binary declaration kind"); + break; + case SyntaxKind.FunctionDeclaration: case SyntaxKind.ClassDeclaration: return node.flags & NodeFlags.Default ? "default" : undefined; @@ -862,14 +875,20 @@ namespace ts { return checkStrictModeIdentifier(node); case SyntaxKind.BinaryExpression: if (isJavaScriptFile) { - if (isExportsPropertyAssignment(node)) { - bindExportsPropertyAssignment(node); - } - else if (isModuleExportsAssignment(node)) { - bindModuleExportsAssignment(node); - } - else if (isPrototypePropertyAssignment(node)) { - bindPrototypePropertyAssignment(node); + let specialKind = getSpecialPropertyAssignmentKind(node); + switch (specialKind) { + case SpecialPropertyAssignmentKind.ExportsProperty: + bindExportsPropertyAssignment(node); + break; + case SpecialPropertyAssignmentKind.ModuleExports: + bindModuleExportsAssignment(node); + break; + case SpecialPropertyAssignmentKind.PrototypeProperty: + bindPrototypePropertyAssignment(node); + break; + case SpecialPropertyAssignmentKind.ThisProperty: + bindThisPropertyAssignment(node); + break; } } return checkStrictModeBinaryExpression(node); @@ -1038,6 +1057,13 @@ namespace ts { bindExportAssignment(node); } + function bindThisPropertyAssignment(node: BinaryExpression) { + if (container.kind === SyntaxKind.FunctionExpression || container.kind === SyntaxKind.FunctionDeclaration) { + container.symbol.members = container.symbol.members || {}; + declareClassMember(node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + } + } + function bindPrototypePropertyAssignment(node: BinaryExpression) { // We saw a node of the form 'x.prototype.y = z'. // This does two things: turns 'x' into a constructor function, and @@ -1054,16 +1080,20 @@ namespace ts { // The function is now a constructor rather than a normal function if (!funcSymbol.inferredConstructor) { - funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; + declareSymbol(container.locals, funcSymbol, funcSymbol.valueDeclaration, SymbolFlags.Class, SymbolFlags.None); + // funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; funcSymbol.members = funcSymbol.members || {}; funcSymbol.members["__constructor"] = funcSymbol; funcSymbol.inferredConstructor = true; } - // Get 'y', the property name, and add it to the type of the class - let propertyName = (node.left).name; - let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); + // Declare the 'prototype' member of the function + let prototypeSymbol = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + + // Declare the property on the prototype symbol declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); + // and on the class type + declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Method, SymbolFlags.PropertyExcludes); } function bindCallExpression(node: CallExpression) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f0bdd48afa7a7..fb7040a96ab16 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2576,9 +2576,16 @@ namespace ts { if (declaration.kind === SyntaxKind.BinaryExpression) { return links.type = checkExpression((declaration).right); } - // Handle exports.p = expr if (declaration.kind === SyntaxKind.PropertyAccessExpression) { - return checkExpressionCached((declaration.parent).right); + if (declaration.parent.kind === SyntaxKind.BinaryExpression) { + // Handle exports.p = expr or this.p = expr or className.prototype.method = expr + return links.type = checkExpression((declaration.parent).right); + } + else { + // Declaration for className.prototype in inferred JS class + let type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); + return links.type = type; + } } // Handle variable, parameter or property if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) { @@ -3799,8 +3806,15 @@ namespace ts { default: if (declaration.symbol.inferredConstructor) { kind = SignatureKind.Construct; - let proto = declaration.symbol.members["prototype"]; - returnType = createAnonymousType(createSymbol(SymbolFlags.None, "__jsClass"), proto.members, emptyArray, emptyArray, undefined, undefined); + let members = createSymbolTable(emptyArray); + // Collect methods declared with className.protoype.methodName = ... + let proto = declaration.symbol.exports["prototype"]; + if (proto) { + mergeSymbolTable(members, proto.members); + } + // Collect properties defined in the constructor by this.propName = ... + mergeSymbolTable(members, declaration.symbol.members); + returnType = createAnonymousType(declaration.symbol, members, emptyArray, emptyArray, undefined, undefined); } else { kind = SignatureKind.Call; @@ -3846,8 +3860,8 @@ namespace ts { break; case SyntaxKind.PropertyAccessExpression: - // Class inference from ClassName.prototype.methodName = expr - return getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); + result = getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); + break; } } return result; @@ -6957,7 +6971,10 @@ namespace ts { let operator = binaryExpression.operatorToken.kind; if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) { // In an assignment expression, the right operand is contextually typed by the type of the left operand. - if (node === binaryExpression.right) { + // In JS files where a special assignment is taking place, don't contextually type the RHS to avoid + // incorrectly assuming a circular 'any' (the type of the LHS is determined by the RHS) + if (node === binaryExpression.right && + !(node.parserContextFlags & ParserContextFlags.JavaScriptFile && getSpecialPropertyAssignmentKind(binaryExpression))) { return checkExpression(binaryExpression.left); } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5232209e7d198..00375f8a574d4 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2013,6 +2013,19 @@ namespace ts { // It is optional because in contextual signature instantiation, nothing fails } + /* @internal */ + export const enum SpecialPropertyAssignmentKind { + None, + /// exports.name = expr + ExportsProperty, + /// module.exports = expr + ModuleExports, + /// className.prototype.name = expr + PrototypeProperty, + /// this.name = expr + ThisProperty + } + export interface DiagnosticMessage { key: string; category: DiagnosticCategory; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 05184e29f58c8..cb72e87bb9402 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1057,6 +1057,42 @@ namespace ts { (expression).arguments[0].kind === SyntaxKind.StringLiteral; } + /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property + /// assignments we treat as special in the binder + export function getSpecialPropertyAssignmentKind(expression: Node): SpecialPropertyAssignmentKind { + if (expression.kind !== SyntaxKind.BinaryExpression) { + return SpecialPropertyAssignmentKind.None; + } + const expr = expression; + if (expr.operatorToken.kind !== SyntaxKind.EqualsToken || expr.left.kind !== SyntaxKind.PropertyAccessExpression) { + return SpecialPropertyAssignmentKind.None; + } + const lhs = expr.left; + if (lhs.expression.kind === SyntaxKind.Identifier) { + const lhsId = lhs.expression; + if (lhsId.text === "exports") { + // exports.name = expr + return SpecialPropertyAssignmentKind.ExportsProperty; + } + else if (lhsId.text === "module" && lhs.name.text === "exports") { + // module.exports = expr + return SpecialPropertyAssignmentKind.ModuleExports; + } + } + else if (lhs.expression.kind === SyntaxKind.ThisKeyword) { + return SpecialPropertyAssignmentKind.ThisProperty; + } + else if (lhs.expression.kind === SyntaxKind.PropertyAccessExpression) { + // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part + let innerPropertyAccess = lhs.expression; + if (innerPropertyAccess.expression.kind === SyntaxKind.Identifier && innerPropertyAccess.name.text === "prototype") { + return SpecialPropertyAssignmentKind.PrototypeProperty; + } + } + + return SpecialPropertyAssignmentKind.None; + } + /** * Returns true if the node is an assignment to a property on the identifier 'exports'. * This function does not test if the node is in a JavaScript file or not. diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts index 0dec8d721d6f4..0473d18aae873 100644 --- a/tests/cases/fourslash/javaScriptPrototype1.ts +++ b/tests/cases/fourslash/javaScriptPrototype1.ts @@ -11,26 +11,36 @@ //// //// var m = new myCtor(10); //// m/*1*/ -//// var x = m.foo(); -//// x/*2*/ -//// var y = m.bar(); -//// y/*3*/ +//// var a = m.foo; +//// a/*2*/ +//// var b = a(); +//// b/*3*/ +//// var c = m.bar(); +//// c/*4*/ + +// Members of the class instance goTo.marker('1'); edit.insert('.'); verify.memberListContains('foo', undefined, undefined, 'method'); -edit.insert('foo'); - -edit.backspace(); +verify.memberListContains('bar', undefined, undefined, 'method'); edit.backspace(); +// Members of a class method (1) goTo.marker('2'); edit.insert('.'); +verify.memberListContains('length', undefined, undefined, 'property'); +edit.backspace(); + +// Members of the invocation of a class method (1) +goTo.marker('3'); +edit.insert('.'); verify.memberListContains('toFixed', undefined, undefined, 'method'); verify.not.memberListContains('substr', undefined, undefined, 'method'); edit.backspace(); -goTo.marker('3'); +// Members of the invocation of a class method (2) +goTo.marker('4'); edit.insert('.'); verify.memberListContains('substr', undefined, undefined, 'method'); verify.not.memberListContains('toFixed', undefined, undefined, 'method'); diff --git a/tests/cases/fourslash/javaScriptPrototype2.ts b/tests/cases/fourslash/javaScriptPrototype2.ts new file mode 100644 index 0000000000000..ab6afff3d2ce7 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype2.ts @@ -0,0 +1,36 @@ +/// + +// Assignments to 'this' in the constructorish body create +// properties with those names + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// var m = new myCtor(10); +//// m/*1*/ +//// var x = m.qua; +//// x/*2*/ +//// myCtor/*3*/ + +// Verify the instance property exists +goTo.marker('1'); +edit.insert('.'); +verify.completionListContains('qua', undefined, undefined, 'property'); +edit.backspace(); + +// Verify the type of the instance property +goTo.marker('2'); +edit.insert('.'); +verify.completionListContains('toFixed', undefined, undefined, 'method'); + +goTo.marker('3'); +edit.insert('.'); +// Make sure symbols don't leak out into the constructor +verify.completionListContains('qua', undefined, undefined, 'warning'); +verify.completionListContains('foo', undefined, undefined, 'warning'); +verify.completionListContains('bar', undefined, undefined, 'warning'); diff --git a/tests/cases/fourslash/javaScriptPrototype3.ts b/tests/cases/fourslash/javaScriptPrototype3.ts new file mode 100644 index 0000000000000..900a39ddce9eb --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype3.ts @@ -0,0 +1,40 @@ +/// + +// ES6 classes can extend from JS classes + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// class MyClass extends myCtor { +//// fn() { +//// this/*1*/ +//// let y = super.foo(); +//// y; +//// } +//// } +//// var n = new MyClass(3); +//// n/*2*/; + +goTo.marker('1'); +edit.insert('.'); +// Current class method +verify.completionListContains('fn', undefined, undefined, 'method'); +// Base class method +verify.completionListContains('foo', undefined, undefined, 'method'); +// Base class instance property +verify.completionListContains('qua', undefined, undefined, 'property'); +edit.backspace(); + +// Derived class instance from outside the class +goTo.marker('2'); +edit.insert('.'); +verify.completionListContains('fn', undefined, undefined, 'method'); +// Base class method +verify.completionListContains('foo', undefined, undefined, 'method'); +// Base class instance property +verify.completionListContains('qua', undefined, undefined, 'property'); diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts new file mode 100644 index 0000000000000..78eab19733a49 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -0,0 +1,36 @@ +/// + +// Check for any odd symbol leakage + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// myCtor/*1*/ + +goTo.marker('1'); +edit.insert('.'); + +// Check members of the function +verify.completionListContains('prototype', undefined, undefined, 'property'); +verify.completionListContains('foo', undefined, undefined, 'warning'); +verify.completionListContains('bar', undefined, undefined, 'warning'); +verify.completionListContains('qua', undefined, undefined, 'warning'); + +// Check members of function.prototype +edit.insert('prototype.'); +debugger; +debug.printMemberListMembers(); +verify.completionListContains('foo', undefined, undefined, 'method'); +verify.completionListContains('bar', undefined, undefined, 'method'); +verify.completionListContains('qua', undefined, undefined, 'warning'); +verify.completionListContains('prototype', undefined, undefined, 'warning'); + +// debug.printErrorList(); +// debug.printCurrentQuickInfo(); +// edit.insert('.'); +// verify.completionListContains('toFixed', undefined, undefined, 'method'); From a3a5c1619d6371cd9b093f71ab83abc1d485d856 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 30 Oct 2015 12:35:20 -0700 Subject: [PATCH 124/353] Human-readable fourslash debug output for completion lists / quickinfo --- src/harness/fourslash.ts | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index dd2dde6989c28..8564714801a33 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1265,7 +1265,7 @@ namespace FourSlash { public printCurrentQuickInfo() { let quickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition); - Harness.IO.log(JSON.stringify(quickInfo)); + Harness.IO.log("Quick Info: " + quickInfo.displayParts.map(part => part.text).join("")); } public printErrorList() { @@ -1307,12 +1307,26 @@ namespace FourSlash { public printMemberListMembers() { let members = this.getMemberListAtCaret(); - Harness.IO.log(JSON.stringify(members)); + this.printMembersOrCompletions(members); } public printCompletionListMembers() { let completions = this.getCompletionListAtCaret(); - Harness.IO.log(JSON.stringify(completions)); + this.printMembersOrCompletions(completions); + } + + private printMembersOrCompletions(info: ts.CompletionInfo) { + function pad(s: string, length: number) { + return s + new Array(length - s.length + 1).join(" "); + } + function max(arr: T[], selector: (x: T) => number): number { + return arr.reduce((prev, x) => Math.max(prev, selector(x)), 0); + } + let longestNameLength = max(info.entries, m => m.name.length); + let longestKindLength = max(info.entries, m => m.kind.length); + info.entries.sort((m, n) => m.sortText > n.sortText ? 1 : m.sortText < n.sortText ? -1 : m.name > n.name ? 1 : m.name < n.name ? -1 : 0); + let membersString = info.entries.map(m => `${pad(m.name, longestNameLength)} ${pad(m.kind, longestKindLength)} ${m.kindModifiers}`).join("\n"); + Harness.IO.log(membersString); } public printReferences() { From a0318c7b6333315a7ee9cc26b918036518c68539 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 12:54:30 -0700 Subject: [PATCH 125/353] Create a utility to iterate over each emitFileName and use it in emitter TODO: declaration emitter to use this utility TODO: emit file name compiler option verification to use this utility --- src/compiler/emitter.ts | 57 +++++++++++---------------------------- src/compiler/utilities.ts | 44 ++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index cd6525a6bc395..0be2549b96968 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -326,27 +326,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let emitSkipped = false; let newLine = host.getNewLine(); - if (targetSourceFile === undefined) { - forEach(host.getSourceFiles(), sourceFile => { - if (shouldEmitToOwnFile(sourceFile, compilerOptions)) { - emitSkipped = emitFile(getEmitFileNames(sourceFile, host), sourceFile) || emitSkipped; - } - }); - - if (compilerOptions.outFile || compilerOptions.out) { - emitSkipped = emitFile(getBundledEmitFileNames(compilerOptions)) || emitSkipped; - } - } - else { - // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service) - if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) { - emitSkipped = emitFile(getEmitFileNames(targetSourceFile, host), targetSourceFile) || emitSkipped; - } - else if (!isDeclarationFile(targetSourceFile) && - (compilerOptions.outFile || compilerOptions.out)) { - emitSkipped = emitFile(getBundledEmitFileNames(compilerOptions)) || emitSkipped; - } - } + forEachExpectedEmitFile(host, emitFile, targetSourceFile); // Sort and make the unique list of diagnostics diagnostics = sortAndDeduplicateDiagnostics(diagnostics); @@ -476,7 +456,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitJavaScript(jsFilePath: string, sourceMapFilePath: string, root?: SourceFile) { + function emitJavaScript(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) { let writer = createTextWriter(newLine); let { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer; @@ -557,17 +537,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi initializeEmitterWithSourceMaps(); } - if (root) { - // Do not call emit directly. It does not set the currentSourceFile. - emitSourceFile(root); - } - else { - forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - emitSourceFile(sourceFile); - } - }); - } + // Do not call emit directly. It does not set the currentSourceFile. + forEach(sourceFiles, emitSourceFile); writeLine(); writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM); @@ -1009,10 +980,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if (compilerOptions.mapRoot) { sourceMapDir = normalizeSlashes(compilerOptions.mapRoot); - if (root) { // emitting single module file + 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(root, host, sourceMapDir)); + sourceMapDir = getDirectoryPath(getSourceFilePathInNewDir(sourceFiles[0], host, sourceMapDir)); } if (!isRootedDiskPath(sourceMapDir) && !isUrl(sourceMapDir)) { @@ -8151,18 +8123,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string }, sourceFile?: SourceFile) { + function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string }, + sourceFiles: SourceFile[], isBundledEmit: boolean) { // Make sure not to write js File and source map file if any of them cannot be written - let emitSkipped = host.isEmitBlocked(jsFilePath) || (sourceMapFilePath && host.isEmitBlocked(sourceMapFilePath)); - if (!emitSkipped) { - emitJavaScript(jsFilePath, sourceMapFilePath, sourceFile); + if (!host.isEmitBlocked(jsFilePath)) { + emitJavaScript(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit); + } + else { + emitSkipped = true; } if (declarationFilePath) { - emitSkipped = writeDeclarationFile(declarationFilePath, sourceFile, host, resolver, diagnostics) || emitSkipped; + emitSkipped = writeDeclarationFile(declarationFilePath, isBundledEmit ? undefined : sourceFiles[0], host, resolver, diagnostics) || emitSkipped; } - - return emitSkipped; } } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index f17aa97f7178f..7440a6b548139 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1786,7 +1786,13 @@ namespace ts { return emitOutputFilePathWithoutExtension + extension; } - export function getEmitFileNames(sourceFile: SourceFile, host: EmitHost) { + export interface EmitFileNames { + jsFilePath: string; + sourceMapFilePath: string; + declarationFilePath: string; + } + + export function getEmitFileNames(sourceFile: SourceFile, host: EmitHost): EmitFileNames { if (!isDeclarationFile(sourceFile)) { let options = host.getCompilerOptions(); let jsFilePath: string; @@ -1810,7 +1816,7 @@ namespace ts { }; } - export function getBundledEmitFileNames(options: CompilerOptions) { + function getBundledEmitFileNames(options: CompilerOptions): EmitFileNames { let jsFilePath = options.outFile || options.out; return { @@ -1820,6 +1826,8 @@ namespace ts { }; } + + function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) { return options.sourceMap ? jsFilePath + ".map" : undefined; } @@ -1828,6 +1836,38 @@ namespace ts { return options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined; } + export function forEachExpectedEmitFile(host: EmitHost, + action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean) => void, + targetSourceFile?: SourceFile) { + let options = host.getCompilerOptions(); + if (targetSourceFile === undefined) { + forEach(host.getSourceFiles(), sourceFile => { + if (shouldEmitToOwnFile(sourceFile, options)) { + action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false); + } + }); + + if (options.outFile || options.out) { + action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true); + } + } + else { + // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service) + if (shouldEmitToOwnFile(targetSourceFile, options)) { + action(getEmitFileNames(targetSourceFile, host), [targetSourceFile], /*isBundledEmit*/false); + } + else if (!isDeclarationFile(targetSourceFile) && + (options.outFile || options.out)) { + action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true); + } + } + + function getBundledEmitSourceFiles(host: EmitHost): SourceFile[] { + return filter(host.getSourceFiles(), + sourceFile => !shouldEmitToOwnFile(sourceFile, host.getCompilerOptions()) && !isDeclarationFile(sourceFile)); + } + } + export function hasFile(sourceFiles: SourceFile[], fileName: string) { return forEach(sourceFiles, file => file.fileName === fileName); } From c6d54d6ae6787bb94f15b0ac0667326d6ce8d98c Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 13:22:23 -0700 Subject: [PATCH 126/353] Simplify verification of emit file paths using utility to iterate over each emit file This also makes sure we dont emit --out or --outFile if there are no files that can go in that file(non module and non declaration files) --- src/compiler/program.ts | 47 +++++++------------ src/compiler/utilities.ts | 23 +++++---- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...lutePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...lutePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...tivePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...tivePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...prootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...prootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 8 +--- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...erootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...erootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 0 ...outModuleMultifolderSpecifyOutputFile.json | 4 +- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 0 ...outModuleMultifolderSpecifyOutputFile.json | 4 +- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 0 .../amd/outModuleSimpleSpecifyOutputFile.json | 4 +- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 0 .../outModuleSimpleSpecifyOutputFile.json | 4 +- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 0 .../outModuleSubfolderSpecifyOutputFile.json | 4 +- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 0 .../outModuleSubfolderSpecifyOutputFile.json | 4 +- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...lutePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...lutePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...athModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...tivePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...tivePathModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...ePathModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...mapModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...mapModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...ourcemapModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...ourcemapModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...cemapModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...cemapModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...UrlModuleMultifolderSpecifyOutputFile.json | 5 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...erootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...erootUrlModuleSimpleSpecifyOutputFile.json | 5 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 6 --- .../amd/bin/test.d.ts | 0 .../amd/bin/test.js | 1 - .../amd/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- .../node/bin/test.d.ts | 0 .../node/bin/test.js | 1 - .../node/bin/test.js.map | 1 - ...otUrlModuleSubfolderSpecifyOutputFile.json | 5 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 6 --- 260 files changed, 96 insertions(+), 646 deletions(-) delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map diff --git a/src/compiler/program.ts b/src/compiler/program.ts index b8fbe557101ba..d1e858680c5c2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1258,46 +1258,31 @@ namespace ts { if (!options.noEmit) { let emitHost = getEmitHost(); - let emitFilesSeen: Map = {}; - - // Build map of files seen - for (let file of files) { - let { jsFilePath, declarationFilePath } = getEmitFileNames(file, emitHost); - if (jsFilePath) { - let filesEmittingJsFilePath = lookUp(emitFilesSeen, jsFilePath); - if (!filesEmittingJsFilePath) { - emitFilesSeen[jsFilePath] = [file]; - if (declarationFilePath) { - emitFilesSeen[declarationFilePath] = [file]; - } - } - else { - filesEmittingJsFilePath.push(file); - } - } - } + let emitFilesSeen: Map = {}; + forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => { + verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen); + verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen); + }); + } - // Verify that all the emit files are unique and dont overwrite input files - forEachKey(emitFilesSeen, emitFilePath => { + // Verify that all the emit files are unique and dont overwrite input files + function verifyEmitFilePath(emitFilePath: string, emitFilesSeen: Map) { + if (emitFilePath) { // Report error if the output overwrites input file if (hasFile(files, emitFilePath)) { createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); } - // Report error if multiple files write into same file (except if specified by --out or --outFile) - if (emitFilePath !== (options.outFile || options.out)) { - // Not --out or --outFile emit, There should be single file emitting to this file - if (emitFilesSeen[emitFilePath].length > 1) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); - } + // Report error if multiple files write into same file + let filesEmittingJsFilePath = lookUp(emitFilesSeen, emitFilePath); + if (filesEmittingJsFilePath) { + // Already seen the same emit file - report error + createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); } else { - // --out or --outFile, error if there exist file emitting to single file colliding with --out - if (forEach(emitFilesSeen[emitFilePath], sourceFile => shouldEmitToOwnFile(sourceFile, options))) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); - } + emitFilesSeen[emitFilePath] = true; } - }); + } } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 7440a6b548139..0b22657a694e5 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1826,8 +1826,6 @@ namespace ts { }; } - - function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) { return options.sourceMap ? jsFilePath + ".map" : undefined; } @@ -1841,30 +1839,37 @@ namespace ts { targetSourceFile?: SourceFile) { let options = host.getCompilerOptions(); if (targetSourceFile === undefined) { + // Emit on each source file forEach(host.getSourceFiles(), sourceFile => { if (shouldEmitToOwnFile(sourceFile, options)) { - action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false); + onSingleFileEmit(host, sourceFile); } }); - if (options.outFile || options.out) { - action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true); + onBundledEmit(host); } } else { // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service) if (shouldEmitToOwnFile(targetSourceFile, options)) { - action(getEmitFileNames(targetSourceFile, host), [targetSourceFile], /*isBundledEmit*/false); + onSingleFileEmit(host, targetSourceFile); } else if (!isDeclarationFile(targetSourceFile) && (options.outFile || options.out)) { - action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true); + onBundledEmit(host); } } - function getBundledEmitSourceFiles(host: EmitHost): SourceFile[] { - return filter(host.getSourceFiles(), + function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) { + action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false); + } + + function onBundledEmit(host: EmitHost) { + let bundledSources = filter(host.getSourceFiles(), sourceFile => !shouldEmitToOwnFile(sourceFile, host.getCompilerOptions()) && !isDeclarationFile(sourceFile)); + if (bundledSources.length) { + action(getBundledEmitFileNames(options), bundledSources, /*isBundledEmit*/true); + } } } diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 18e06e5bc506e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 588d2404ef8da..edb521c5e2fda 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index da94013dea396..4b883a84e706d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:../../test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 18e06e5bc506e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 588d2404ef8da..edb521c5e2fda 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index f348cfad93c75..5ab3146b09944 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:../../test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f6e3eb542f45d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 971d1a2aaab6a..c3141a197cd2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 759b9dab302b7..834a5c3a112c1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:../test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index f6e3eb542f45d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 971d1a2aaab6a..c3141a197cd2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 75228e5ea64d7..668c24e25c517 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:../test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 7ff280253f1b4..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index 86f3cf5c9a961..7521c803c2da2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 18b397608e40f..a8488d8a1345c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:../test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 7ff280253f1b4..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index 86f3cf5c9a961..7521c803c2da2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 97c6b8a85e489..f227d9809ada5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:../test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f359cef4be2f8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index 3a1983f88d979..195e9975aced4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index c2eacec3bdc53..12d96900c84c4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index f359cef4be2f8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index 3a1983f88d979..195e9975aced4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 1d6a282976d6c..567b51cfff5f8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 58e831a041d8a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index 0dfc88c1aa5b5..202344863d73a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 410dc94963f5d..76375ce0d0c9b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:../outputdir_module_simple/test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=../mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 58e831a041d8a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index 0dfc88c1aa5b5..202344863d73a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 0af20dc5ef907..aff5583a5e9ac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:../outputdir_module_simple/test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=../mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 58e831a041d8a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index 0eb8315ff9bec..88ce99fdac814 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index fe747e98d9c8a..46af484749055 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:../outputdir_module_subfolder/test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=../mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 58e831a041d8a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index 0eb8315ff9bec..88ce99fdac814 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 8f609cc28d9b6..48f639a7ee2ee 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:../outputdir_module_subfolder/test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=../mapFiles/test.js.map=================================================================== -JsFile: test.js -mapUrl: ../../mapFiles/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json index de091e6dd2861..af446483014fc 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 1fce6af308442..f07b7d9212d5f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json index de091e6dd2861..af446483014fc 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index aaf57c9d05513..e3d905204b2d3 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json index f0c017279578f..133927f3ad084 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 7c3fae4871695..7df7c4142e888 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json index f0c017279578f..133927f3ad084 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 804e4408446fa..ff16dbdb8d68e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json index 00ba79cee2676..232d1814bcc74 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 894bcf6cef4ab..d2d74c7219d48 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json index 00ba79cee2676..232d1814bcc74 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 9a7f754c53455..acf02348d67ec 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 713487cc8d08e..597f77fc2dce2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index deb74d2ae36a5..e8aa1436d988a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 713487cc8d08e..597f77fc2dce2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 5f476cfb8ed9e..a8f4f3bf2385b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file +>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 53aa4866a4103..9cf2fd285ff8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 8b526ff5859d9..06f3e02521d12 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 53aa4866a4103..9cf2fd285ff8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index ff984bf74eecc..2843c88faf5ac 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index 46ba3b1411432..d0e80b6b6a5d6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 67e50350919ed..89ea048e26883 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 52f1b82210026..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index 46ba3b1411432..d0e80b6b6a5d6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index c5bce1a19d54a..bf0333f3d1263 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map=================================================================== -JsFile: test.js -mapUrl: http://www.typescriptlang.org/test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json index 66eced5cc015e..e15d413b28146 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json @@ -19,8 +19,6 @@ "../outputdir_module_multifolder_ref/m2.js", "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json index 66eced5cc015e..e15d413b28146 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json @@ -19,8 +19,6 @@ "../outputdir_module_multifolder_ref/m2.js", "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json index 166aaa982e7ea..a3679b915f8ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json @@ -16,8 +16,6 @@ "m1.js", "m1.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json index 166aaa982e7ea..a3679b915f8ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json @@ -16,8 +16,6 @@ "m1.js", "m1.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json index f11b95edde911..688c076c86516 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json @@ -16,8 +16,6 @@ "ref/m1.js", "ref/m1.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json index f11b95edde911..688c076c86516 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json @@ -16,8 +16,6 @@ "ref/m1.js", "ref/m1.d.ts", "test.js", - "test.d.ts", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index e53f2e0a75582..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index d68d0afc19910..56492a3252a9b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index e1bca270ba083..11b024ba13440 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index e53f2e0a75582..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index d68d0afc19910..56492a3252a9b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -25,9 +25,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 63e22ab64ba22..9072b5c7129d6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index 42e5a82e74be6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 914b6e2d79252..9835726464efc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 0fc6cd6eb2a90..0ff03b640b1a1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_simple/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index 42e5a82e74be6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 914b6e2d79252..9835726464efc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -21,9 +21,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 08491d5015130..55790d252721b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_simple/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index 279042a1a0ff8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index ba9d94f2b0c55..538fb7495af46 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 5e87f2ef555ce..990b84fd4fd97 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index 279042a1a0ff8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index ba9d94f2b0c55..538fb7495af46 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -21,9 +21,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 67fc9030f4186..757d17973aff9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index dafceda24d0d1..e1472a1786b3c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 9c817da60e92d..77e69f9879021 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index dafceda24d0d1..e1472a1786b3c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index e34bffc6f6118..095d4b65fdfbe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index 7d87bfe98f2cb..0f8e4b93f8db8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index c259bb452104e..b4f6ed8c48879 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index 7d87bfe98f2cb..0f8e4b93f8db8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 65bea50d84f1f..82c62b23d3c1c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 9a897de73348f..4ed1c562e5748 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 7be1fe1fb8f8c..a483e0ff9fc60 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index 512eba0e11a92..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 9a897de73348f..4ed1c562e5748 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 5a3d45c196004..4e25047bafc0f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: ../src/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json index 3d2df95ad66d9..fd04b157142eb 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -23,9 +23,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 74ecef4410339..383a66a6e2fb5 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json index 3d2df95ad66d9..fd04b157142eb 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -23,9 +23,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index f8d10678ca06b..0036386e6c44a 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json index 9ff29662d406a..9d5469d80b72f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json @@ -19,9 +19,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index a1646bc14e554..b461163a8b8e4 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json index 9ff29662d406a..9d5469d80b72f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json @@ -19,9 +19,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index 4ff8b4fa8c72c..d5247e7eeb021 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json index 9d200ef685d29..066dba33e1de7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -19,9 +19,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index d0abf20190f03..b6ddd879bc183 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index c1e0281a2ab2d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json index 9d200ef685d29..066dba33e1de7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -19,9 +19,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index 205f70497add1..3319b4e31f9dc 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index dd54871f5637b..7595c86418c02 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 86764c6d57af7..0fa4d7bfa36f5 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index dd54871f5637b..7595c86418c02 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -24,9 +24,6 @@ "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index eb2dff17042bf..625e81c473819 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json index ecfa616be4c46..6180a2c53c3d6 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 3e447368494c4..15f5ae4bc9321 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json index ecfa616be4c46..6180a2c53c3d6 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -20,9 +20,6 @@ "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 4d3c5799e2737..75f6eb8394069 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index fedae84631765..01fd790d6d4d4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 54c26748c78ec..880d55412f825 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -369,10 +369,4 @@ sourceFile:test.ts 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) --- >>>}); ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js deleted file mode 100644 index 6f3fefb949813..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map deleted file mode 100644 index d3e851981ec91..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index fedae84631765..01fd790d6d4d4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -20,9 +20,6 @@ "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", - "bin/test.js.map", - "bin/test.js", - "bin/test.d.ts" + "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index cf41966a8183a..7fc9e0c1f6090 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -390,10 +390,4 @@ sourceFile:test.ts 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) --- ->>>//# sourceMappingURL=test.js.map=================================================================== -JsFile: test.js -mapUrl: test.js.map -sourceRoot: http://typescript.codeplex.com/ -sources: -=================================================================== >>>//# sourceMappingURL=test.js.map \ No newline at end of file From 06bf08c17fa1d07a8ef2e43e7a212123636ba865 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 13:43:52 -0700 Subject: [PATCH 127/353] Simplify logic to get declaration diagnostis --- src/compiler/declarationEmitter.ts | 25 +++++++++++++------------ src/compiler/emitter.ts | 13 +++++-------- src/compiler/utilities.ts | 4 ++-- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 89ab4027ed8b8..e10c4ed8a8c61 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -31,15 +31,16 @@ namespace ts { } export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] { - let diagnostics: Diagnostic[] = []; - let { declarationFilePath } = getEmitFileNames(targetSourceFile, host); - if (declarationFilePath) { - emitDeclarations(host, resolver, diagnostics, declarationFilePath, targetSourceFile); + let declarationDiagnostics = createDiagnosticCollection(); + forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile); + return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName); + + function getDeclarationDiagnosticsFromFile({ declarationFilePath }, sources: SourceFile[], isBundledEmit: boolean) { + emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, !isBundledEmit ? targetSourceFile : undefined); } - return diagnostics; } - function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], declarationFilePath: string, root?: SourceFile): DeclarationEmit { + function emitDeclarations(host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, declarationFilePath: string, root?: SourceFile): DeclarationEmit { let newLine = host.getNewLine(); let compilerOptions = host.getCompilerOptions(); @@ -243,14 +244,14 @@ namespace ts { let errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); if (errorInfo) { if (errorInfo.typeName) { - diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, + emitterDiagnostics.add(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); } else { - diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, + emitterDiagnostics.add(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); @@ -266,7 +267,7 @@ namespace ts { function reportInaccessibleThisError() { if (errorNameNode) { reportedDeclarationError = true; - diagnostics.push(createDiagnosticForNode(errorNameNode, Diagnostics.The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary, + emitterDiagnostics.add(createDiagnosticForNode(errorNameNode, Diagnostics.The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary, declarationNameToString(errorNameNode))); } } @@ -1616,14 +1617,14 @@ namespace ts { } /* @internal */ - export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { - let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, declarationFilePath, sourceFile); + export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection) { + let emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFile); let emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath); if (!emitSkipped) { let declarationOutput = emitDeclarationResult.referencePathsOutput + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); let compilerOptions = host.getCompilerOptions(); - writeFile(host, diagnostics, declarationFilePath, declarationOutput, compilerOptions.emitBOM); + writeFile(host, emitterDiagnostics, declarationFilePath, declarationOutput, compilerOptions.emitBOM); } return emitSkipped; diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 0be2549b96968..b9dad7e151e0a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -322,18 +322,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let languageVersion = compilerOptions.target || ScriptTarget.ES3; let modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; let sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined; - let diagnostics: Diagnostic[] = []; + let emitterDiagnostics = createDiagnosticCollection(); let emitSkipped = false; let newLine = host.getNewLine(); forEachExpectedEmitFile(host, emitFile, targetSourceFile); - // Sort and make the unique list of diagnostics - diagnostics = sortAndDeduplicateDiagnostics(diagnostics); - return { emitSkipped, - diagnostics, + diagnostics: emitterDiagnostics.getDiagnostics(), sourceMaps: sourceMapDataList }; @@ -949,7 +946,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else { // Write source map file - writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, /*writeByteOrderMark*/ false); + writeFile(host, emitterDiagnostics, sourceMapData.sourceMapFilePath, sourceMapText, /*writeByteOrderMark*/ false); } sourceMapUrl = `//# sourceMappingURL=${sourceMapData.jsSourceMappingURL}`; @@ -1037,7 +1034,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function writeJavaScriptFile(emitOutput: string, writeByteOrderMark: boolean) { - writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark); + writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark); } // Create a temporary variable with a unique unused name. @@ -8134,7 +8131,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } if (declarationFilePath) { - emitSkipped = writeDeclarationFile(declarationFilePath, isBundledEmit ? undefined : sourceFiles[0], host, resolver, diagnostics) || emitSkipped; + emitSkipped = writeDeclarationFile(declarationFilePath, isBundledEmit ? undefined : sourceFiles[0], host, resolver, emitterDiagnostics) || emitSkipped; } } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 0b22657a694e5..fea71cfc67e6b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1883,9 +1883,9 @@ namespace ts { return combinePaths(newDirPath, sourceFilePath); } - export function writeFile(host: EmitHost, diagnostics: Diagnostic[], fileName: string, data: string, writeByteOrderMark: boolean) { + export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean) { host.writeFile(fileName, data, writeByteOrderMark, hostErrorMessage => { - diagnostics.push(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage)); + diagnostics.add(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage)); }); } From 2b582a0b7175cee49e9d890f0253eb54d372bdde Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 15:04:46 -0700 Subject: [PATCH 128/353] Simplifty declaration emitter logic by using forEachExpectedEmitFile --- src/compiler/declarationEmitter.ts | 150 ++++++++++++++--------------- src/compiler/emitter.ts | 2 +- src/compiler/utilities.ts | 67 +++++-------- 3 files changed, 99 insertions(+), 120 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index e10c4ed8a8c61..348a22e23e86c 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -36,11 +36,12 @@ namespace ts { return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName); function getDeclarationDiagnosticsFromFile({ declarationFilePath }, sources: SourceFile[], isBundledEmit: boolean) { - emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, !isBundledEmit ? targetSourceFile : undefined); + emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit); } } - function emitDeclarations(host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, declarationFilePath: string, root?: SourceFile): DeclarationEmit { + function emitDeclarations(host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, declarationFilePath: string, + sourceFiles: SourceFile[], isBundledEmit: boolean): DeclarationEmit { let newLine = host.getNewLine(); let compilerOptions = host.getCompilerOptions(); @@ -67,67 +68,48 @@ namespace ts { // and we could be collecting these paths from multiple files into single one with --out option let referencePathsOutput = ""; - if (root) { - // Emitting just a single file, so emit references in this file only - if (!compilerOptions.noResolve) { - let addedGlobalFileReference = false; - forEach(root.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, root, fileReference); - - // All the references that are not going to be part of same file - if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference - shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file - !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added - - writeReferencePath(referencedFile); - if (!isExternalModuleOrDeclarationFile(referencedFile)) { - addedGlobalFileReference = true; - } - } - }); - } - - emitSourceFile(root); - - // create asynchronous output for the importDeclarations - if (moduleElementDeclarationEmitInfo.length) { - let oldWriter = writer; - forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { - if (aliasEmitInfo.isVisible) { - Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration); - createAndSetNewTextWriterWithSymbolWriter(); - Debug.assert(aliasEmitInfo.indent === 0); - writeImportDeclaration(aliasEmitInfo.node); - aliasEmitInfo.asynchronousOutput = writer.getText(); - } - }); - setWriter(oldWriter); - } - } - else { - // Emit references corresponding to this file - let emittedReferencedFiles: SourceFile[] = []; - forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) { - // Check what references need to be added - if (!compilerOptions.noResolve) { - forEach(sourceFile.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); - - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && - !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted - - writeReferencePath(referencedFile); - emittedReferencedFiles.push(referencedFile); + // Emit references corresponding to each file + let emittedReferencedFiles: SourceFile[] = []; + let addedGlobalFileReference = false; + forEach(sourceFiles, sourceFile => { + if (!isJavaScript(sourceFile.fileName)) { + // Check what references need to be added + if (!compilerOptions.noResolve) { + forEach(sourceFile.referencedFiles, fileReference => { + let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); + + // Emit reference in dts, if the file reference was not already emitted + if (referencedFile && !contains(emittedReferencedFiles, referencedFile)) { + // Add a reference to generated dts file, + // global file reference is added only + // - if it is not bundled emit (because otherwise it would be self reference) + // - and it is not already added + if (writeReferencePath(referencedFile, !isBundledEmit && !addedGlobalFileReference)) { + addedGlobalFileReference = true; } - }); - } + emittedReferencedFiles.push(referencedFile); + } + }); + } - emitSourceFile(sourceFile); + emitSourceFile(sourceFile); + + // create asynchronous output for the importDeclarations + if (moduleElementDeclarationEmitInfo.length) { + let oldWriter = writer; + forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { + if (aliasEmitInfo.isVisible) { + Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration); + createAndSetNewTextWriterWithSymbolWriter(); + Debug.assert(aliasEmitInfo.indent === 0); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + } + }); + setWriter(oldWriter); } - }); - } + } + }); return { reportedDeclarationError, @@ -1592,33 +1574,51 @@ namespace ts { } } - function writeReferencePath(referencedFile: SourceFile) { + /** + * Adds the reference to referenced file, returns true if global file reference was emitted + * @param referencedFile + * @param addBundledFileReference Determines if global file reference corresponding to bundled file should be emitted or not + */ + function writeReferencePath(referencedFile: SourceFile, addBundledFileReference: boolean): boolean { let declFileName: string; - if (referencedFile.flags & NodeFlags.DeclarationFile) { + let addedBundledEmitReference = false; + if (isDeclarationFile(referencedFile)) { // Declaration file, use declaration file name declFileName = referencedFile.fileName; } else { - // declaration file name - let { declarationFilePath, jsFilePath } = getEmitFileNames(referencedFile, host); - Debug.assert(!!declarationFilePath || isJavaScript(referencedFile.fileName), "Declaration file is not present only for javascript files"); - declFileName = declarationFilePath || jsFilePath; + // Get the declaration file path + forEachExpectedEmitFile(host, getDeclFileName, referencedFile); } - declFileName = getRelativePathToDirectoryOrUrl( - getDirectoryPath(normalizeSlashes(declarationFilePath)), - declFileName, - host.getCurrentDirectory(), - host.getCanonicalFileName, - /*isAbsolutePathAnUrl*/ false); + if (declFileName) { + declFileName = getRelativePathToDirectoryOrUrl( + getDirectoryPath(normalizeSlashes(declarationFilePath)), + declFileName, + host.getCurrentDirectory(), + host.getCanonicalFileName, + /*isAbsolutePathAnUrl*/ false); - referencePathsOutput += "/// " + newLine; + referencePathsOutput += "/// " + newLine; + } + return addedBundledEmitReference; + + function getDeclFileName(emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean) { + // Dont add reference path to this file if it is a bundled emit and caller asked not emit bundled file path + if (isBundledEmit && !addBundledFileReference) { + return; + } + + Debug.assert(!!emitFileNames.declarationFilePath || isJavaScript(referencedFile.fileName), "Declaration file is not present only for javascript files"); + declFileName = emitFileNames.declarationFilePath || emitFileNames.jsFilePath; + addedBundledEmitReference = isBundledEmit; + } } } /* @internal */ - export function writeDeclarationFile(declarationFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection) { - let emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFile); + export function writeDeclarationFile(declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection) { + let emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit); let emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath); if (!emitSkipped) { let declarationOutput = emitDeclarationResult.referencePathsOutput diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index b9dad7e151e0a..d3fc80a3c5e41 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -8131,7 +8131,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } if (declarationFilePath) { - emitSkipped = writeDeclarationFile(declarationFilePath, isBundledEmit ? undefined : sourceFiles[0], host, resolver, emitterDiagnostics) || emitSkipped; + emitSkipped = writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped; } } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index fea71cfc67e6b..245566c1f32f1 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1792,48 +1792,6 @@ namespace ts { declarationFilePath: string; } - export function getEmitFileNames(sourceFile: SourceFile, host: EmitHost): EmitFileNames { - if (!isDeclarationFile(sourceFile)) { - let options = host.getCompilerOptions(); - let jsFilePath: string; - if (shouldEmitToOwnFile(sourceFile, options)) { - let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, - sourceFile.languageVariant === LanguageVariant.JSX && options.jsx === JsxEmit.Preserve ? ".jsx" : ".js"); - return { - jsFilePath, - sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), - declarationFilePath: !isJavaScript(sourceFile.fileName) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined - }; - } - else if (options.outFile || options.out) { - return getBundledEmitFileNames(options); - } - } - return { - jsFilePath: undefined, - sourceMapFilePath: undefined, - declarationFilePath: undefined - }; - } - - function getBundledEmitFileNames(options: CompilerOptions): EmitFileNames { - let jsFilePath = options.outFile || options.out; - - return { - jsFilePath, - sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), - declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) - }; - } - - function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) { - return options.sourceMap ? jsFilePath + ".map" : undefined; - } - - function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) { - return options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined; - } - export function forEachExpectedEmitFile(host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean) => void, targetSourceFile?: SourceFile) { @@ -1861,16 +1819,37 @@ namespace ts { } function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) { - action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false); + let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, + sourceFile.languageVariant === LanguageVariant.JSX && options.jsx === JsxEmit.Preserve ? ".jsx" : ".js"); + let emitFileNames: EmitFileNames = { + jsFilePath, + sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), + declarationFilePath: !isJavaScript(sourceFile.fileName) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined + }; + action(emitFileNames, [sourceFile], /*isBundledEmit*/false); } function onBundledEmit(host: EmitHost) { let bundledSources = filter(host.getSourceFiles(), sourceFile => !shouldEmitToOwnFile(sourceFile, host.getCompilerOptions()) && !isDeclarationFile(sourceFile)); + let jsFilePath = options.outFile || options.out; + let emitFileNames: EmitFileNames = { + jsFilePath, + sourceMapFilePath: getSourceMapFilePath(jsFilePath, options), + declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options) + }; if (bundledSources.length) { - action(getBundledEmitFileNames(options), bundledSources, /*isBundledEmit*/true); + action(emitFileNames, bundledSources, /*isBundledEmit*/true); } } + + function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) { + return options.sourceMap ? jsFilePath + ".map" : undefined; + } + + function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) { + return options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined; + } } export function hasFile(sourceFiles: SourceFile[], fileName: string) { From 62d4fd6d35efb9453abc638c106723ecd1efd229 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 15:06:23 -0700 Subject: [PATCH 129/353] Take pr feedback into account --- src/compiler/core.ts | 4 ++-- src/compiler/program.ts | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 9336217558b2d..1b19eb5a77b75 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -740,10 +740,10 @@ namespace ts { */ export const supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"]; export const supportedJavascriptExtensions = [".js", ".jsx"]; - export const supportedExtensionsWhenAllowedJs = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions); + const allSupportedExtensions = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions); export function getSupportedExtensions(options?: CompilerOptions): string[] { - return options && options.allowJs ? supportedExtensionsWhenAllowedJs : supportedTypeScriptExtensions; + return options && options.allowJs ? allSupportedExtensions : supportedTypeScriptExtensions; } export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions) { diff --git a/src/compiler/program.ts b/src/compiler/program.ts index d1e858680c5c2..4b0fcc934c2f3 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -832,13 +832,11 @@ namespace ts { }); } - function getOptionsDiagnostics(cancellationToken?: CancellationToken, includeEmitBlockingDiagnostics?: boolean): Diagnostic[] { + function getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[] { let allDiagnostics: Diagnostic[] = []; addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics()); addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics()); - if (!includeEmitBlockingDiagnostics) { - addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics()); - } + addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics()); return sortAndDeduplicateDiagnostics(allDiagnostics); } From 51caf1a9ee50caae49b1454cb545c4b6f4c425d1 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 30 Oct 2015 15:54:31 -0700 Subject: [PATCH 130/353] Use of FileMap instead of Map as per PR feedback --- src/compiler/program.ts | 25 +++++++++++++------------ src/compiler/utilities.ts | 4 ---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 4b0fcc934c2f3..d779e4e066529 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -330,7 +330,6 @@ namespace ts { let fileProcessingDiagnostics = createDiagnosticCollection(); let programDiagnostics = createDiagnosticCollection(); let emitBlockingDiagnostics = createDiagnosticCollection(); - let hasEmitBlockingDiagnostics: Map = {}; // Map storing if there is emit blocking diagnostics for given input let commonSourceDirectory: string; let diagnosticsProducingTypeChecker: TypeChecker; @@ -342,6 +341,8 @@ namespace ts { let start = new Date().getTime(); host = host || createCompilerHost(options); + // Map storing if there is emit blocking diagnostics for given input + let hasEmitBlockingDiagnostics = createFileMap(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined); const currentDirectory = host.getCurrentDirectory(); const resolveModuleNamesWorker = host.resolveModuleNames @@ -547,7 +548,7 @@ namespace ts { } function isEmitBlocked(emitFileName: string): boolean { - return hasProperty(hasEmitBlockingDiagnostics, emitFileName); + return hasEmitBlockingDiagnostics.contains(toPath(emitFileName, currentDirectory, getCanonicalFileName)); } function emitWorker(program: Program, sourceFile: SourceFile, writeFileCallback: WriteFileCallback, cancellationToken: CancellationToken): EmitResult { @@ -1256,7 +1257,7 @@ namespace ts { if (!options.noEmit) { let emitHost = getEmitHost(); - let emitFilesSeen: Map = {}; + let emitFilesSeen = createFileMap(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined); forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => { verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen); verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen); @@ -1264,28 +1265,28 @@ namespace ts { } // Verify that all the emit files are unique and dont overwrite input files - function verifyEmitFilePath(emitFilePath: string, emitFilesSeen: Map) { - if (emitFilePath) { + function verifyEmitFilePath(emitFileName: string, emitFilesSeen: FileMap) { + if (emitFileName) { + let emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName); // Report error if the output overwrites input file - if (hasFile(files, emitFilePath)) { - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); + if (forEach(files, file => toPath(file.fileName, currentDirectory, getCanonicalFileName) === emitFilePath)) { + createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); } // Report error if multiple files write into same file - let filesEmittingJsFilePath = lookUp(emitFilesSeen, emitFilePath); - if (filesEmittingJsFilePath) { + if (emitFilesSeen.contains(emitFilePath)) { // Already seen the same emit file - report error - createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); + createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); } else { - emitFilesSeen[emitFilePath] = true; + emitFilesSeen.set(emitFilePath, true); } } } } function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) { - hasEmitBlockingDiagnostics[emitFileName] = true; + hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true); emitBlockingDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 245566c1f32f1..d7f33a945dd7e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1852,10 +1852,6 @@ namespace ts { } } - export function hasFile(sourceFiles: SourceFile[], fileName: string) { - return forEach(sourceFiles, file => file.fileName === fileName); - } - export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) { let sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory()); sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), ""); From 6d683d2a967165717907a3cf43d78bbccb269309 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 2 Nov 2015 10:44:25 -0800 Subject: [PATCH 131/353] Add initial test --- .../genericClassExpressionInFunction.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts diff --git a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts new file mode 100644 index 0000000000000..ab2155c032483 --- /dev/null +++ b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts @@ -0,0 +1,13 @@ +class A { + genericVar: T +} +function B() { + // class expression can use T + return class extends A { } +} +// extends can call B +class K extends B() { + name: string; +} +var c = new K(); +c.genericVar = 12; From d48a4f0cf184f5ff045d027693282c3b1b03c003 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 2 Nov 2015 10:48:59 -0800 Subject: [PATCH 132/353] fix nits --- src/compiler/checker.ts | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8ae8ab3d54c26..b77faadd01120 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -112,6 +112,7 @@ namespace ts { let circularType = createIntrinsicType(TypeFlags.Any, "__circular__"); let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); + let emptyUnionType = emptyObjectType; let emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); emptyGenericType.instantiations = {}; @@ -4321,7 +4322,7 @@ namespace ts { // a named type that circularly references itself. function getUnionType(types: Type[], noSubtypeReduction?: boolean): Type { if (types.length === 0) { - return emptyObjectType; + return emptyUnionType; } let typeSet: Type[] = []; addTypesToSet(typeSet, types, TypeFlags.Union); @@ -6278,8 +6279,8 @@ namespace ts { // Only narrow when symbol is variable of type any or an object, union, or type parameter type if (node && symbol.flags & SymbolFlags.Variable) { if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) { - let originalType = type; - let nodeStack: {node: Node, child: Node}[] = []; + const originalType = type; + const nodeStack: {node: Node, child: Node}[] = []; loop: while (node.parent) { let child = node; node = node.parent; @@ -6304,7 +6305,7 @@ namespace ts { let nodes: {node: Node, child: Node}; while (nodes = nodeStack.pop()) { - let {node, child} = nodes; + const {node, child} = nodes; switch (node.kind) { case SyntaxKind.IfStatement: // In a branch of an if statement, narrow based on controlling expression @@ -6334,13 +6335,13 @@ namespace ts { } // Use original type if construct contains assignments to variable - if (type != originalType && isVariableAssignedWithin(symbol, node)) { + if (type !== originalType && isVariableAssignedWithin(symbol, node)) { type = originalType; } } // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type - if (type === getUnionType(emptyArray)) { + if (type === emptyUnionType) { type = originalType; } } @@ -6368,7 +6369,7 @@ namespace ts { } let flags: TypeFlags; if (typeInfo) { - flags = typeInfo.flags; + flags = typeInfo.flags; } else { assumeTrue = !assumeTrue; @@ -6377,12 +6378,12 @@ namespace ts { // At this point we can bail if it's not a union if (!(type.flags & TypeFlags.Union)) { // If the active non-union type would be removed from a union by this type guard, return an empty union - return filterUnion(type) ? type : getUnionType(emptyArray); + return filterUnion(type) ? type : emptyUnionType; } return getUnionType(filter((type as UnionType).types, filterUnion), /*noSubtypeReduction*/ true); - function filterUnion(t: Type) { - return assumeTrue === !!(t.flags & flags); + function filterUnion(type: Type) { + return assumeTrue === !!(type.flags & flags); } } @@ -12558,7 +12559,7 @@ namespace ts { arrayType = getUnionType(filter((arrayOrStringType as UnionType).types, t => !(t.flags & TypeFlags.StringLike))); } else if (arrayOrStringType.flags & TypeFlags.StringLike) { - arrayType = getUnionType(emptyArray); + arrayType = emptyUnionType; } let hasStringConstituent = arrayOrStringType !== arrayType; From 2be7f4f27b0e60ea19a83a291f353a4a9238390f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Nov 2015 12:53:31 -0800 Subject: [PATCH 133/353] Skip files with no-default-lib when '--skipDefaultLibCheck' and '--noLib' are used. --- src/compiler/checker.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 65f507c13c0dc..3fd42865c3216 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14058,8 +14058,16 @@ namespace ts { if (!(links.flags & NodeCheckFlags.TypeChecked)) { // Check whether the file has declared it is the default lib, // and whether the user has specifically chosen to avoid checking it. - if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) { - return; + if (compilerOptions.skipDefaultLibCheck) { + if (node.isDefaultLib) { + return; + } + + // If the user specified '--noLib' and a file has a `/// , + // then we should treat that file as a default lib. + if (compilerOptions.noLib && node.hasNoDefaultLib) { + return; + } } // Grammar checking From b9368a955cd43d33e4f1e86c13011f76b8afbce1 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 3 Nov 2015 12:55:18 -0800 Subject: [PATCH 134/353] Fixed comment. --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3fd42865c3216..9b0c5d3468c04 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14063,7 +14063,7 @@ namespace ts { return; } - // If the user specified '--noLib' and a file has a `/// , + // If the user specified '--noLib' and a file has a '/// ', // then we should treat that file as a default lib. if (compilerOptions.noLib && node.hasNoDefaultLib) { return; From 77c69daf2e7d67f8ec54947983ce331e672c454c Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 3 Nov 2015 14:35:11 -0800 Subject: [PATCH 135/353] const all the things --- src/compiler/checker.ts | 101 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b77faadd01120..4bdbebaa50b17 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -33,26 +33,26 @@ namespace ts { // they no longer need the information (for example, if the user started editing again). let cancellationToken: CancellationToken; - let Symbol = objectAllocator.getSymbolConstructor(); - let Type = objectAllocator.getTypeConstructor(); - let Signature = objectAllocator.getSignatureConstructor(); + const Symbol = objectAllocator.getSymbolConstructor(); + const Type = objectAllocator.getTypeConstructor(); + const Signature = objectAllocator.getSignatureConstructor(); let typeCount = 0; let symbolCount = 0; - let emptyArray: any[] = []; - let emptySymbols: SymbolTable = {}; + const emptyArray: any[] = []; + const emptySymbols: SymbolTable = {}; - let compilerOptions = host.getCompilerOptions(); - let languageVersion = compilerOptions.target || ScriptTarget.ES3; - let modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; + const compilerOptions = host.getCompilerOptions(); + const languageVersion = compilerOptions.target || ScriptTarget.ES3; + const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; - let emitResolver = createResolver(); + const emitResolver = createResolver(); - let undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined"); - let argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments"); + const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined"); + const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments"); - let checker: TypeChecker = { + const checker: TypeChecker = { getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"), getIdentifierCount: () => sum(host.getSourceFiles(), "identifierCount"), getSymbolCount: () => sum(host.getSourceFiles(), "symbolCount") + symbolCount, @@ -97,36 +97,35 @@ namespace ts { isOptionalParameter }; - let unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown"); - let resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__"); - - let anyType = createIntrinsicType(TypeFlags.Any, "any"); - let stringType = createIntrinsicType(TypeFlags.String, "string"); - let numberType = createIntrinsicType(TypeFlags.Number, "number"); - let booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean"); - let esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol"); - let voidType = createIntrinsicType(TypeFlags.Void, "void"); - let undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined"); - let nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null"); - let unknownType = createIntrinsicType(TypeFlags.Any, "unknown"); - let circularType = createIntrinsicType(TypeFlags.Any, "__circular__"); - - let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - let emptyUnionType = emptyObjectType; - let emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); + const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown"); + const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__"); + + const anyType = createIntrinsicType(TypeFlags.Any, "any"); + const stringType = createIntrinsicType(TypeFlags.String, "string"); + const numberType = createIntrinsicType(TypeFlags.Number, "number"); + const booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean"); + const esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol"); + const voidType = createIntrinsicType(TypeFlags.Void, "void"); + const undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined"); + const nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null"); + const unknownType = createIntrinsicType(TypeFlags.Any, "unknown"); + + const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); + const emptyUnionType = emptyObjectType; + const emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); emptyGenericType.instantiations = {}; - let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); + const anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes. anyFunctionType.flags |= TypeFlags.ContainsAnyFunctionType; - let noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); + const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - let anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false); - let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false); + const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false); - let globals: SymbolTable = {}; + const globals: SymbolTable = {}; let globalESSymbolConstructorSymbol: Symbol; @@ -161,29 +160,29 @@ namespace ts { let getGlobalPromiseConstructorLikeType: () => ObjectType; let getGlobalThenableType: () => ObjectType; - let tupleTypes: Map = {}; - let unionTypes: Map = {}; - let intersectionTypes: Map = {}; - let stringLiteralTypes: Map = {}; + const tupleTypes: Map = {}; + const unionTypes: Map = {}; + const intersectionTypes: Map = {}; + const stringLiteralTypes: Map = {}; let emitExtends = false; let emitDecorate = false; let emitParam = false; let emitAwaiter = false; let emitGenerator = false; - let resolutionTargets: TypeSystemEntity[] = []; - let resolutionResults: boolean[] = []; - let resolutionPropertyNames: TypeSystemPropertyName[] = []; + const resolutionTargets: TypeSystemEntity[] = []; + const resolutionResults: boolean[] = []; + const resolutionPropertyNames: TypeSystemPropertyName[] = []; - let mergedSymbols: Symbol[] = []; - let symbolLinks: SymbolLinks[] = []; - let nodeLinks: NodeLinks[] = []; - let potentialThisCollisions: Node[] = []; - let awaitedTypeStack: number[] = []; + const mergedSymbols: Symbol[] = []; + const symbolLinks: SymbolLinks[] = []; + const nodeLinks: NodeLinks[] = []; + const potentialThisCollisions: Node[] = []; + const awaitedTypeStack: number[] = []; - let diagnostics = createDiagnosticCollection(); + const diagnostics = createDiagnosticCollection(); - let primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = { + const primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = { "string": { type: stringType, flags: TypeFlags.StringLike @@ -210,9 +209,9 @@ namespace ts { Element: "Element" }; - let subtypeRelation: Map = {}; - let assignableRelation: Map = {}; - let identityRelation: Map = {}; + const subtypeRelation: Map = {}; + const assignableRelation: Map = {}; + const identityRelation: Map = {}; // This is for caching the result of getSymbolDisplayBuilder. Do not access directly. let _displayBuilder: SymbolDisplayBuilder; From 9223b02136f0ede6ebeacf0404a7c8c9a2851486 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 3 Nov 2015 14:42:03 -0800 Subject: [PATCH 136/353] Improve test case and add working comparison --- .../genericClassExpressionInFunction.ts | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts index ab2155c032483..70f63e8a929a5 100644 --- a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts +++ b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts @@ -1,13 +1,25 @@ class A { genericVar: T } -function B() { +class B3 extends A { +} +function B1() { // class expression can use T - return class extends A { } + return class extends A { } +} +class B2 { + anon = class extends A { } } // extends can call B -class K extends B() { +class K extends B1() { + namae: string; +} +class C extends (new B2().anon) { name: string; } -var c = new K(); +var c = new C(); +var k = new K(); +var b3 = new B3(); c.genericVar = 12; +k.genericVar = 12; +b3.genericVar = 12 From db2b23da00b54042b966cd6387fca6d67ba88a42 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 4 Nov 2015 15:35:21 -0800 Subject: [PATCH 137/353] allow computed properties in destructuring, treat computed properties with literal expressions similar to literal named properties --- src/compiler/binder.ts | 5 + src/compiler/checker.ts | 80 +++++++++++++--- src/compiler/emitter.ts | 25 +++-- src/compiler/parser.ts | 9 +- src/compiler/types.ts | 5 +- src/compiler/utilities.ts | 14 ++- src/services/services.ts | 5 +- ...putedPropertiesInDestructuring1.errors.txt | 88 +++++++++++++++++ .../computedPropertiesInDestructuring1.js | 75 +++++++++++++++ ...dPropertiesInDestructuring1_ES6.errors.txt | 87 +++++++++++++++++ .../computedPropertiesInDestructuring1_ES6.js | 64 +++++++++++++ .../computedPropertiesInDestructuring2.js | 7 ++ ...computedPropertiesInDestructuring2.symbols | 8 ++ .../computedPropertiesInDestructuring2.types | 12 +++ .../computedPropertiesInDestructuring2_ES6.js | 8 ++ ...utedPropertiesInDestructuring2_ES6.symbols | 9 ++ ...mputedPropertiesInDestructuring2_ES6.types | 13 +++ .../computedPropertyNames10_ES5.types | 4 +- .../computedPropertyNames10_ES6.types | 4 +- .../reference/computedPropertyNames11_ES5.js | 12 +-- .../computedPropertyNames11_ES5.types | 4 +- .../computedPropertyNames11_ES6.types | 4 +- .../computedPropertyNames12_ES5.errors.txt | 8 +- .../computedPropertyNames12_ES6.errors.txt | 8 +- .../reference/computedPropertyNames16_ES5.js | 10 -- .../reference/computedPropertyNames36_ES5.js | 4 - .../reference/computedPropertyNames37_ES5.js | 4 - .../computedPropertyNames40_ES5.errors.txt | 8 +- .../computedPropertyNames40_ES6.errors.txt | 8 +- .../computedPropertyNames42_ES5.errors.txt | 5 +- .../computedPropertyNames42_ES6.errors.txt | 5 +- .../reference/computedPropertyNames43_ES5.js | 4 - .../computedPropertyNames45_ES5.errors.txt | 5 +- .../computedPropertyNames45_ES6.errors.txt | 5 +- .../computedPropertyNames4_ES5.types | 4 +- .../computedPropertyNames4_ES6.types | 4 +- .../computedPropertyNamesSourceMap2_ES5.types | 4 +- .../computedPropertyNamesSourceMap2_ES6.types | 4 +- ...itClassDeclarationWithGetterSetterInES6.js | 16 ++-- ...ssDeclarationWithGetterSetterInES6.symbols | 12 +-- ...lassDeclarationWithGetterSetterInES6.types | 16 ++-- .../emitClassDeclarationWithMethodInES6.js | 24 ++--- ...mitClassDeclarationWithMethodInES6.symbols | 24 ++--- .../emitClassDeclarationWithMethodInES6.types | 24 ++--- .../literalsInComputedProperties1.errors.txt | 66 +++++++++++++ .../literalsInComputedProperties1.js | 94 +++++++++++++++++++ .../computedPropertiesInDestructuring1.ts | 36 +++++++ .../computedPropertiesInDestructuring1_ES6.ts | 36 +++++++ .../computedPropertiesInDestructuring2.ts | 2 + .../computedPropertiesInDestructuring2_ES6.ts | 4 + .../compiler/literalsInComputedProperties1.ts | 52 ++++++++++ ...itClassDeclarationWithGetterSetterInES6.ts | 8 +- .../emitClassDeclarationWithMethodInES6.ts | 12 +-- 53 files changed, 883 insertions(+), 175 deletions(-) create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring1.js create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2.js create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2.symbols create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2.types create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols create mode 100644 tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types create mode 100644 tests/baselines/reference/literalsInComputedProperties1.errors.txt create mode 100644 tests/baselines/reference/literalsInComputedProperties1.js create mode 100644 tests/cases/compiler/computedPropertiesInDestructuring1.ts create mode 100644 tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts create mode 100644 tests/cases/compiler/computedPropertiesInDestructuring2.ts create mode 100644 tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts create mode 100644 tests/cases/compiler/literalsInComputedProperties1.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 1169e331f1f5c..8a986d4043559 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -188,6 +188,11 @@ namespace ts { } if (node.name.kind === SyntaxKind.ComputedPropertyName) { let nameExpression = (node.name).expression; + // treat computed property names where expression is string/numeric literal as just string/numeric literal + if (isStringOrNumericLiteral(nameExpression.kind)) { + return (nameExpression).text; + } + Debug.assert(isWellKnownSymbolSyntactically(nameExpression)); return getPropertyNameForKnownSymbolName((nameExpression).name.text); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 65f507c13c0dc..dffb360fca8cf 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2337,6 +2337,26 @@ namespace ts { return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node); } + function getTextOfPropertyName(name: PropertyName): string { + switch (name.kind) { + case SyntaxKind.Identifier: + return (name).text; + case SyntaxKind.StringLiteral: + case SyntaxKind.NumericLiteral: + return (name).text; + case SyntaxKind.ComputedPropertyName: + if (isStringOrNumericLiteral((name).expression.kind)) { + return ((name).expression).text; + } + } + + return undefined; + } + + function isComputedNonLiteralName(name: PropertyName): boolean { + return name.kind === SyntaxKind.ComputedPropertyName && !isStringOrNumericLiteral((name).expression.kind); + } + // Return the inferred type for a binding element function getTypeForBindingElement(declaration: BindingElement): Type { let pattern = declaration.parent; @@ -2359,10 +2379,17 @@ namespace ts { if (pattern.kind === SyntaxKind.ObjectBindingPattern) { // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form) let name = declaration.propertyName || declaration.name; + if (isComputedNonLiteralName(name)) { + // computed properties with non-literal names are treated as 'any' + return anyType; + } + // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature, // or otherwise the type of the string index signature. - type = getTypeOfPropertyOfType(parentType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, IndexKind.Number) || + let text = getTextOfPropertyName(name); + + type = getTypeOfPropertyOfType(parentType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(parentType, IndexKind.Number) || getIndexTypeOfType(parentType, IndexKind.String); if (!type) { error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), declarationNameToString(name)); @@ -2474,9 +2501,16 @@ namespace ts { function getTypeFromObjectBindingPattern(pattern: BindingPattern, includePatternInType: boolean): Type { let members: SymbolTable = {}; forEach(pattern.elements, e => { - let flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0); let name = e.propertyName || e.name; - let symbol = createSymbol(flags, name.text); + if (isComputedNonLiteralName(name)) { + // do not include computed properties in the implied type + return; + } + + let text = getTextOfPropertyName(name); + let flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0); + + let symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType); symbol.bindingElement = e; members[symbol.name] = symbol; @@ -9999,19 +10033,27 @@ namespace ts { let properties = node.properties; for (let p of properties) { if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) { - // TODO(andersh): Computed property support - let name = (p).name; + let name = (p).name; + if (name.kind === SyntaxKind.ComputedPropertyName) { + checkComputedPropertyName(name); + } + if (isComputedNonLiteralName(name)) { + continue; + } + + let text = getTextOfPropertyName(name); let type = isTypeAny(sourceType) ? sourceType - : getTypeOfPropertyOfType(sourceType, name.text) || - isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, IndexKind.Number) || + : getTypeOfPropertyOfType(sourceType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(sourceType, IndexKind.Number) || getIndexTypeOfType(sourceType, IndexKind.String); if (type) { if (p.kind === SyntaxKind.ShorthandPropertyAssignment) { checkDestructuringAssignment(p, type); } else { - checkDestructuringAssignment((p).initializer || name, type); + // non-shorthand property assignments should always have initializers + checkDestructuringAssignment((p).initializer, type); } } else { @@ -12130,6 +12172,14 @@ namespace ts { checkExpressionCached(node.initializer); } } + + if (node.kind === SyntaxKind.BindingElement) { + // check computed properties inside property names of binding elements + if (node.propertyName && node.propertyName.kind === SyntaxKind.ComputedPropertyName) { + checkComputedPropertyName(node.propertyName); + } + } + // For a binding pattern, check contained binding elements if (isBindingPattern(node.name)) { forEach((node.name).elements, checkSourceElement); @@ -12147,6 +12197,7 @@ namespace ts { } return; } + let symbol = getSymbolOfNode(node); let type = getTypeOfVariableOrParameterOrProperty(symbol); if (node === symbol.valueDeclaration) { @@ -13234,11 +13285,14 @@ namespace ts { let enumIsConst = isConst(node); for (const member of node.members) { - if (member.name.kind === SyntaxKind.ComputedPropertyName) { + if (isComputedNonLiteralName(member.name)) { error(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums); } - else if (isNumericLiteralName((member.name).text)) { - error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name); + else { + let text = getTextOfPropertyName(member.name); + if (isNumericLiteralName(text)) { + error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name); + } } const previousEnumMemberIsNonConstant = autoValue === undefined; @@ -15682,7 +15736,7 @@ namespace ts { } function checkGrammarForNonSymbolComputedProperty(node: DeclarationName, message: DiagnosticMessage) { - if (node.kind === SyntaxKind.ComputedPropertyName && !isWellKnownSymbolSyntactically((node).expression)) { + if (isDynamicName(node)) { return grammarErrorOnNode(node, message); } } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f0ec75c005c09..f44911a318999 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4167,15 +4167,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return node; } - function createPropertyAccessForDestructuringProperty(object: Expression, propName: Identifier | LiteralExpression): Expression { - // We create a synthetic copy of the identifier in order to avoid the rewriting that might - // otherwise occur when the identifier is emitted. - let syntheticName = createSynthesizedNode(propName.kind); - syntheticName.text = propName.text; - if (syntheticName.kind !== SyntaxKind.Identifier) { - return createElementAccessExpression(object, syntheticName); - } - return createPropertyAccessExpression(object, syntheticName); + function createPropertyAccessForDestructuringProperty(object: Expression, propName: PropertyName): Expression { + let index: Expression; + const nameIsComputed = propName.kind === SyntaxKind.ComputedPropertyName; + if (nameIsComputed) { + index = ensureIdentifier((propName).expression, /* reuseIdentifierExpression */ false); + } + else { + // We create a synthetic copy of the identifier in order to avoid the rewriting that might + // otherwise occur when the identifier is emitted. + index = createSynthesizedNode(propName.kind); + (index).text = (propName).text; + } + + return !nameIsComputed && index.kind === SyntaxKind.Identifier + ? createPropertyAccessExpression(object, index) + : createElementAccessExpression(object, index); } function createSliceCall(value: Expression, sliceIndex: number): CallExpression { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 3e93e31340d40..65f55f14cc6b5 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1069,7 +1069,7 @@ namespace ts { token === SyntaxKind.NumericLiteral; } - function parsePropertyNameWorker(allowComputedPropertyNames: boolean): DeclarationName { + function parsePropertyNameWorker(allowComputedPropertyNames: boolean): PropertyName { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.NumericLiteral) { return parseLiteralNode(/*internName*/ true); } @@ -1079,7 +1079,7 @@ namespace ts { return parseIdentifierName(); } - function parsePropertyName(): DeclarationName { + function parsePropertyName(): PropertyName { return parsePropertyNameWorker(/*allowComputedPropertyNames:*/ true); } @@ -1189,7 +1189,7 @@ namespace ts { case ParsingContext.ObjectLiteralMembers: return token === SyntaxKind.OpenBracketToken || token === SyntaxKind.AsteriskToken || isLiteralPropertyName(); case ParsingContext.ObjectBindingElements: - return isLiteralPropertyName(); + return token === SyntaxKind.OpenBracketToken || isLiteralPropertyName(); case ParsingContext.HeritageClauseElement: // If we see { } then only consume it as an expression if it is followed by , or { // That way we won't consume the body of a class in its heritage clause. @@ -4569,7 +4569,6 @@ namespace ts { function parseObjectBindingElement(): BindingElement { let node = createNode(SyntaxKind.BindingElement); - // TODO(andersh): Handle computed properties let tokenIsIdentifier = isIdentifier(); let propertyName = parsePropertyName(); if (tokenIsIdentifier && token !== SyntaxKind.ColonToken) { @@ -4577,7 +4576,7 @@ namespace ts { } else { parseExpected(SyntaxKind.ColonToken); - node.propertyName = propertyName; + node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } node.initializer = parseBindingElementInitializer(/*inParameter*/ false); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f536a1e469307..af6200ac023cd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -491,6 +491,7 @@ namespace ts { export type EntityName = Identifier | QualifiedName; + export type PropertyName = Identifier | LiteralExpression | ComputedPropertyName; export type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern; export interface Declaration extends Node { @@ -543,7 +544,7 @@ namespace ts { // SyntaxKind.BindingElement export interface BindingElement extends Declaration { - propertyName?: Identifier; // Binding property name (in object binding pattern) + propertyName?: PropertyName; // Binding property name (in object binding pattern) dotDotDotToken?: Node; // Present on rest binding element name: Identifier | BindingPattern; // Declared binding element name initializer?: Expression; // Optional initializer @@ -587,7 +588,7 @@ namespace ts { // SyntaxKind.ShorthandPropertyAssignment // SyntaxKind.EnumMember export interface VariableLikeDeclaration extends Declaration { - propertyName?: Identifier; + propertyName?: PropertyName; dotDotDotToken?: Node; name: DeclarationName; questionToken?: Node; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 10b35ce8a01b5..6764ea20c8167 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1427,6 +1427,10 @@ namespace ts { return isFunctionLike(node) && (node.flags & NodeFlags.Async) !== 0 && !isAccessor(node); } + export function isStringOrNumericLiteral(kind: SyntaxKind): boolean { + return kind === SyntaxKind.StringLiteral || kind === SyntaxKind.NumericLiteral; + } + /** * A declaration has a dynamic name if both of the following are true: * 1. The declaration has a computed property name @@ -1435,9 +1439,13 @@ namespace ts { * Symbol. */ export function hasDynamicName(declaration: Declaration): boolean { - return declaration.name && - declaration.name.kind === SyntaxKind.ComputedPropertyName && - !isWellKnownSymbolSyntactically((declaration.name).expression); + return declaration.name && isDynamicName(declaration.name); + } + + export function isDynamicName(name: DeclarationName): boolean { + return name.kind === SyntaxKind.ComputedPropertyName && + !isStringOrNumericLiteral((name).expression.kind) && + !isWellKnownSymbolSyntactically((name).expression); } /** diff --git a/src/services/services.ts b/src/services/services.ts index 1672e4ad4ff22..a2ffd2d991e74 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3814,7 +3814,10 @@ namespace ts { let existingName: string; if (m.kind === SyntaxKind.BindingElement && (m).propertyName) { - existingName = (m).propertyName.text; + // include only identifiers in completion list + if ((m).propertyName.kind === SyntaxKind.Identifier) { + existingName = ((m).propertyName).text + } } else { // TODO(jfreeman): Account for computed property name diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt new file mode 100644 index 0000000000000..682db92f95f61 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt @@ -0,0 +1,88 @@ +tests/cases/compiler/computedPropertiesInDestructuring1.ts(3,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(8,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(10,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(11,28): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(20,8): error TS2349: Cannot invoke an expression whose type lacks a call signature. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(20,27): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(21,12): error TS2339: Property 'toExponential' does not exist on type 'string'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(21,41): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(24,18): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(28,22): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(30,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(31,24): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(33,4): error TS2349: Cannot invoke an expression whose type lacks a call signature. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(33,23): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,26): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + +==== tests/cases/compiler/computedPropertiesInDestructuring1.ts (16 errors) ==== + // destructuring in variable declarations + let foo = "bar"; + let {[foo]: bar} = {bar: "bar"}; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + let {["bar"]: bar2} = {bar: "bar"}; + + let foo2 = () => "bar"; + let {[foo2()]: bar3} = {bar: "bar"}; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + let [{[foo]: bar4}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + let [{[foo2()]: bar5}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + function f1({["bar"]: x}: { bar: number }) {} + function f2({[foo]: x}: { bar: number }) {} + function f3({[foo2()]: x}: { bar: number }) {} + function f4([{[foo]: x}]: [{ bar: number }]) {} + function f5([{[foo2()]: x}]: [{ bar: number }]) {} + + // report errors on type errors in computed properties used in destructuring + let [{[foo()]: bar6}] = [{bar: "bar"}]; + ~~~~~ +!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + ~~~~~~~~~~~~~ +!!! error TS2339: Property 'toExponential' does not exist on type 'string'. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + // destructuring assignment + ({[foo]: bar} = {bar: "bar"}); + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + ({["bar"]: bar2} = {bar: "bar"}); + + ({[foo2()]: bar3} = {bar: "bar"}); + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + [{[foo]: bar4}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + [{[foo2()]: bar5}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + [{[foo()]: bar4}] = [{bar: "bar"}]; + ~~~~~ +!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + [{[(1 + {})]: bar4}] = [{bar: "bar"}]; + ~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + + \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.js b/tests/baselines/reference/computedPropertiesInDestructuring1.js new file mode 100644 index 0000000000000..0bc4286ed7b79 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring1.js @@ -0,0 +1,75 @@ +//// [computedPropertiesInDestructuring1.ts] +// destructuring in variable declarations +let foo = "bar"; +let {[foo]: bar} = {bar: "bar"}; + +let {["bar"]: bar2} = {bar: "bar"}; + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {bar: "bar"}; + +let [{[foo]: bar4}] = [{bar: "bar"}]; +let [{[foo2()]: bar5}] = [{bar: "bar"}]; + +function f1({["bar"]: x}: { bar: number }) {} +function f2({[foo]: x}: { bar: number }) {} +function f3({[foo2()]: x}: { bar: number }) {} +function f4([{[foo]: x}]: [{ bar: number }]) {} +function f5([{[foo2()]: x}]: [{ bar: number }]) {} + +// report errors on type errors in computed properties used in destructuring +let [{[foo()]: bar6}] = [{bar: "bar"}]; +let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + +// destructuring assignment +({[foo]: bar} = {bar: "bar"}); + +({["bar"]: bar2} = {bar: "bar"}); + +({[foo2()]: bar3} = {bar: "bar"}); + +[{[foo]: bar4}] = [{bar: "bar"}]; +[{[foo2()]: bar5}] = [{bar: "bar"}]; + +[{[foo()]: bar4}] = [{bar: "bar"}]; +[{[(1 + {})]: bar4}] = [{bar: "bar"}]; + + + + +//// [computedPropertiesInDestructuring1.js] +// destructuring in variable declarations +var foo = "bar"; +var _a = foo, bar = { bar: "bar" }[_a]; +var _b = "bar", bar2 = { bar: "bar" }[_b]; +var foo2 = function () { return "bar"; }; +var _c = foo2(), bar3 = { bar: "bar" }[_c]; +var _d = foo, bar4 = [{ bar: "bar" }][0][_d]; +var _e = foo2(), bar5 = [{ bar: "bar" }][0][_e]; +function f1(_a) { + var _b = "bar", x = _a[_b]; +} +function f2(_a) { + var _b = foo, x = _a[_b]; +} +function f3(_a) { + var _b = foo2(), x = _a[_b]; +} +function f4(_a) { + var _b = foo, x = _a[0][_b]; +} +function f5(_a) { + var _b = foo2(), x = _a[0][_b]; +} +// report errors on type errors in computed properties used in destructuring +var _f = foo(), bar6 = [{ bar: "bar" }][0][_f]; +var _g = foo.toExponential(), bar7 = [{ bar: "bar" }][0][_g]; +// destructuring assignment +(_h = { bar: "bar" }, _j = foo, bar = _h[_j], _h); +(_k = { bar: "bar" }, _l = "bar", bar2 = _k[_l], _k); +(_m = { bar: "bar" }, _o = foo2(), bar3 = _m[_o], _m); +_p = foo, bar4 = [{ bar: "bar" }][0][_p]; +_q = foo2(), bar5 = [{ bar: "bar" }][0][_q]; +_r = foo(), bar4 = [{ bar: "bar" }][0][_r]; +_s = (1 + {}), bar4 = [{ bar: "bar" }][0][_s]; +var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s; diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt new file mode 100644 index 0000000000000..1866cf1d54370 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt @@ -0,0 +1,87 @@ +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(3,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(9,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(11,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(12,28): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(21,8): error TS2349: Cannot invoke an expression whose type lacks a call signature. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(21,27): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(22,12): error TS2339: Property 'toExponential' does not exist on type 'string'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(22,41): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(25,18): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(29,22): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(31,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(32,24): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(34,4): error TS2349: Cannot invoke an expression whose type lacks a call signature. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(34,23): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. +tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,26): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + +==== tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts (16 errors) ==== + // destructuring in variable declarations + let foo = "bar"; + let {[foo]: bar} = {bar: "bar"}; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + let {["bar"]: bar2} = {bar: "bar"}; + let {[11]: bar2_1} = {11: "bar"}; + + let foo2 = () => "bar"; + let {[foo2()]: bar3} = {bar: "bar"}; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + let [{[foo]: bar4}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + let [{[foo2()]: bar5}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + function f1({["bar"]: x}: { bar: number }) {} + function f2({[foo]: x}: { bar: number }) {} + function f3({[foo2()]: x}: { bar: number }) {} + function f4([{[foo]: x}]: [{ bar: number }]) {} + function f5([{[foo2()]: x}]: [{ bar: number }]) {} + + // report errors on type errors in computed properties used in destructuring + let [{[foo()]: bar6}] = [{bar: "bar"}]; + ~~~~~ +!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + ~~~~~~~~~~~~~ +!!! error TS2339: Property 'toExponential' does not exist on type 'string'. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + // destructuring assignment + ({[foo]: bar} = {bar: "bar"}); + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + ({["bar"]: bar2} = {bar: "bar"}); + + ({[foo2()]: bar3} = {bar: "bar"}); + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + [{[foo]: bar4}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + [{[foo2()]: bar5}] = [{bar: "bar"}]; + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + + [{[foo()]: bar4}] = [{bar: "bar"}]; + ~~~~~ +!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + [{[(1 + {})]: bar4}] = [{bar: "bar"}]; + ~~~~~~ +!!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. + ~~~ +!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. + \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js new file mode 100644 index 0000000000000..e6e19f93b802d --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.js @@ -0,0 +1,64 @@ +//// [computedPropertiesInDestructuring1_ES6.ts] +// destructuring in variable declarations +let foo = "bar"; +let {[foo]: bar} = {bar: "bar"}; + +let {["bar"]: bar2} = {bar: "bar"}; +let {[11]: bar2_1} = {11: "bar"}; + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {bar: "bar"}; + +let [{[foo]: bar4}] = [{bar: "bar"}]; +let [{[foo2()]: bar5}] = [{bar: "bar"}]; + +function f1({["bar"]: x}: { bar: number }) {} +function f2({[foo]: x}: { bar: number }) {} +function f3({[foo2()]: x}: { bar: number }) {} +function f4([{[foo]: x}]: [{ bar: number }]) {} +function f5([{[foo2()]: x}]: [{ bar: number }]) {} + +// report errors on type errors in computed properties used in destructuring +let [{[foo()]: bar6}] = [{bar: "bar"}]; +let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + +// destructuring assignment +({[foo]: bar} = {bar: "bar"}); + +({["bar"]: bar2} = {bar: "bar"}); + +({[foo2()]: bar3} = {bar: "bar"}); + +[{[foo]: bar4}] = [{bar: "bar"}]; +[{[foo2()]: bar5}] = [{bar: "bar"}]; + +[{[foo()]: bar4}] = [{bar: "bar"}]; +[{[(1 + {})]: bar4}] = [{bar: "bar"}]; + + +//// [computedPropertiesInDestructuring1_ES6.js] +// destructuring in variable declarations +let foo = "bar"; +let { [foo]: bar } = { bar: "bar" }; +let { ["bar"]: bar2 } = { bar: "bar" }; +let { [11]: bar2_1 } = { 11: "bar" }; +let foo2 = () => "bar"; +let { [foo2()]: bar3 } = { bar: "bar" }; +let [{ [foo]: bar4 }] = [{ bar: "bar" }]; +let [{ [foo2()]: bar5 }] = [{ bar: "bar" }]; +function f1({ ["bar"]: x }) { } +function f2({ [foo]: x }) { } +function f3({ [foo2()]: x }) { } +function f4([{ [foo]: x }]) { } +function f5([{ [foo2()]: x }]) { } +// report errors on type errors in computed properties used in destructuring +let [{ [foo()]: bar6 }] = [{ bar: "bar" }]; +let [{ [foo.toExponential()]: bar7 }] = [{ bar: "bar" }]; +// destructuring assignment +({ [foo]: bar } = { bar: "bar" }); +({ ["bar"]: bar2 } = { bar: "bar" }); +({ [foo2()]: bar3 } = { bar: "bar" }); +[{ [foo]: bar4 }] = [{ bar: "bar" }]; +[{ [foo2()]: bar5 }] = [{ bar: "bar" }]; +[{ [foo()]: bar4 }] = [{ bar: "bar" }]; +[{ [(1 + {})]: bar4 }] = [{ bar: "bar" }]; diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.js b/tests/baselines/reference/computedPropertiesInDestructuring2.js new file mode 100644 index 0000000000000..8579881b77546 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2.js @@ -0,0 +1,7 @@ +//// [computedPropertiesInDestructuring2.ts] +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {}; + +//// [computedPropertiesInDestructuring2.js] +var foo2 = function () { return "bar"; }; +var _a = foo2(), bar3 = {}[_a]; diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.symbols b/tests/baselines/reference/computedPropertiesInDestructuring2.symbols new file mode 100644 index 0000000000000..4ae6d5323e187 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2.symbols @@ -0,0 +1,8 @@ +=== tests/cases/compiler/computedPropertiesInDestructuring2.ts === +let foo2 = () => "bar"; +>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2.ts, 0, 3)) + +let {[foo2()]: bar3} = {}; +>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2.ts, 0, 3)) +>bar3 : Symbol(bar3, Decl(computedPropertiesInDestructuring2.ts, 1, 5)) + diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2.types b/tests/baselines/reference/computedPropertiesInDestructuring2.types new file mode 100644 index 0000000000000..0fa2066227047 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2.types @@ -0,0 +1,12 @@ +=== tests/cases/compiler/computedPropertiesInDestructuring2.ts === +let foo2 = () => "bar"; +>foo2 : () => string +>() => "bar" : () => string +>"bar" : string + +let {[foo2()]: bar3} = {}; +>foo2() : string +>foo2 : () => string +>bar3 : any +>{} : {} + diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js new file mode 100644 index 0000000000000..e0bd16287ee09 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.js @@ -0,0 +1,8 @@ +//// [computedPropertiesInDestructuring2_ES6.ts] + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {}; + +//// [computedPropertiesInDestructuring2_ES6.js] +let foo2 = () => "bar"; +let { [foo2()]: bar3 } = {}; diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols new file mode 100644 index 0000000000000..cd7cfda98441a --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts === + +let foo2 = () => "bar"; +>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2_ES6.ts, 1, 3)) + +let {[foo2()]: bar3} = {}; +>foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring2_ES6.ts, 1, 3)) +>bar3 : Symbol(bar3, Decl(computedPropertiesInDestructuring2_ES6.ts, 2, 5)) + diff --git a/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types new file mode 100644 index 0000000000000..f0d8b1033c829 --- /dev/null +++ b/tests/baselines/reference/computedPropertiesInDestructuring2_ES6.types @@ -0,0 +1,13 @@ +=== tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts === + +let foo2 = () => "bar"; +>foo2 : () => string +>() => "bar" : () => string +>"bar" : string + +let {[foo2()]: bar3} = {}; +>foo2() : string +>foo2 : () => string +>bar3 : any +>{} : {} + diff --git a/tests/baselines/reference/computedPropertyNames10_ES5.types b/tests/baselines/reference/computedPropertyNames10_ES5.types index 87648c1ed8015..9dea9cfca9390 100644 --- a/tests/baselines/reference/computedPropertyNames10_ES5.types +++ b/tests/baselines/reference/computedPropertyNames10_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ [s]() { }, [n]() { }, [s + s]() { }, [s + n]() { }, [+s]() { }, [""]() { }, [0]() { }, [a]() { }, [true]() { }, [`hello bye`]() { }, [`hello ${a} bye`]() { }} : {} +>v : { [0](): void; [""](): void; } +>{ [s]() { }, [n]() { }, [s + s]() { }, [s + n]() { }, [+s]() { }, [""]() { }, [0]() { }, [a]() { }, [true]() { }, [`hello bye`]() { }, [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; } [s]() { }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames10_ES6.types b/tests/baselines/reference/computedPropertyNames10_ES6.types index 996dfc99fe921..d2faa13898076 100644 --- a/tests/baselines/reference/computedPropertyNames10_ES6.types +++ b/tests/baselines/reference/computedPropertyNames10_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ [s]() { }, [n]() { }, [s + s]() { }, [s + n]() { }, [+s]() { }, [""]() { }, [0]() { }, [a]() { }, [true]() { }, [`hello bye`]() { }, [`hello ${a} bye`]() { }} : {} +>v : { [0](): void; [""](): void; } +>{ [s]() { }, [n]() { }, [s + s]() { }, [s + n]() { }, [+s]() { }, [""]() { }, [0]() { }, [a]() { }, [true]() { }, [`hello bye`]() { }, [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; } [s]() { }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.js b/tests/baselines/reference/computedPropertyNames11_ES5.js index 64c0b0bd67e35..0917f82477049 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.js +++ b/tests/baselines/reference/computedPropertyNames11_ES5.js @@ -46,16 +46,8 @@ var v = (_a = {}, enumerable: true, configurable: true }), - Object.defineProperty(_a, "", { - set: function (v) { }, - enumerable: true, - configurable: true - }), - Object.defineProperty(_a, 0, { - get: function () { return 0; }, - enumerable: true, - configurable: true - }), + , + , Object.defineProperty(_a, a, { set: function (v) { }, enumerable: true, diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types index c3c59c2eb9c73..e0787fc3ee712 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.types +++ b/tests/baselines/reference/computedPropertyNames11_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : {} +>v : { [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types index ef11511baaed7..8ad31a7c2a14e 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES6.types +++ b/tests/baselines/reference/computedPropertyNames11_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : {} +>v : { [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt index 9d07f34f3c4eb..71f81c27245f9 100644 --- a/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames12_ES5.errors.txt @@ -3,15 +3,13 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(6, tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(7,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(9,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(10,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(11,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(12,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(13,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(14,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(15,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts (11 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts (9 errors) ==== var s: string; var n: number; var a: any; @@ -32,11 +30,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES5.ts(15 ~~~~ !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. static [""]: number; - ~~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. [0]: number; - ~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. [a]: number; ~~~ !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. diff --git a/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt index f0a2267f8b365..8d8cce7e1408d 100644 --- a/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames12_ES6.errors.txt @@ -3,15 +3,13 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(6, tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(7,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(9,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(10,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(11,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(12,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(13,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(14,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(15,12): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts (11 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts (9 errors) ==== var s: string; var n: number; var a: any; @@ -32,11 +30,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(15 ~~~~ !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. static [""]: number; - ~~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. [0]: number; - ~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. [a]: number; ~~~ !!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. diff --git a/tests/baselines/reference/computedPropertyNames16_ES5.js b/tests/baselines/reference/computedPropertyNames16_ES5.js index 2c7316e13982c..f4d90579d63aa 100644 --- a/tests/baselines/reference/computedPropertyNames16_ES5.js +++ b/tests/baselines/reference/computedPropertyNames16_ES5.js @@ -48,16 +48,6 @@ var C = (function () { enumerable: true, configurable: true }); - Object.defineProperty(C, "", { - set: function (v) { }, - enumerable: true, - configurable: true - }); - Object.defineProperty(C.prototype, 0, { - get: function () { return 0; }, - enumerable: true, - configurable: true - }); Object.defineProperty(C.prototype, a, { set: function (v) { }, enumerable: true, diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js index 5519a6d284caf..4bb10ea754395 100644 --- a/tests/baselines/reference/computedPropertyNames36_ES5.js +++ b/tests/baselines/reference/computedPropertyNames36_ES5.js @@ -27,10 +27,6 @@ var C = (function () { Object.defineProperty(C.prototype, "get1", { // Computed properties get: function () { return new Foo; }, - enumerable: true, - configurable: true - }); - Object.defineProperty(C.prototype, "set1", { set: function (p) { }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js index 54a7243f3fae8..c2a346608fe79 100644 --- a/tests/baselines/reference/computedPropertyNames37_ES5.js +++ b/tests/baselines/reference/computedPropertyNames37_ES5.js @@ -27,10 +27,6 @@ var C = (function () { Object.defineProperty(C.prototype, "get1", { // Computed properties get: function () { return new Foo; }, - enumerable: true, - configurable: true - }); - Object.defineProperty(C.prototype, "set1", { set: function (p) { }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt index e8ceef0d58115..482978064d167 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt @@ -1,7 +1,9 @@ +tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8,5): error TS2393: Duplicate function implementation. tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. +tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(9,5): error TS2393: Duplicate function implementation. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts (1 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts (3 errors) ==== class Foo { x } class Foo2 { x; y } @@ -10,7 +12,11 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(8, // Computed properties [""]() { return new Foo } + ~~~~ +!!! error TS2393: Duplicate function implementation. ~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. [""]() { return new Foo2 } + ~~~~ +!!! error TS2393: Duplicate function implementation. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt index 1a032a87b2b00..669d0d04e6612 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt @@ -1,7 +1,9 @@ +tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,5): error TS2393: Duplicate function implementation. tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. +tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(9,5): error TS2393: Duplicate function implementation. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts (1 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts (3 errors) ==== class Foo { x } class Foo2 { x; y } @@ -10,7 +12,11 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8, // Computed properties [""]() { return new Foo } + ~~~~ +!!! error TS2393: Duplicate function implementation. ~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. [""]() { return new Foo2 } + ~~~~ +!!! error TS2393: Duplicate function implementation. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt index 94153c47aa5d4..bdb978220a03d 100644 --- a/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames42_ES5.errors.txt @@ -1,8 +1,7 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts (2 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts (1 errors) ==== class Foo { x } class Foo2 { x; y } @@ -11,8 +10,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES5.ts(8, // Computed properties [""]: Foo; - ~~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. ~~~~~~~~~~ !!! error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt index 1f4e27d6e810a..9feb6ba3d32ae 100644 --- a/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames42_ES6.errors.txt @@ -1,8 +1,7 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts (2 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts (1 errors) ==== class Foo { x } class Foo2 { x; y } @@ -11,8 +10,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8, // Computed properties [""]: Foo; - ~~~~ -!!! error TS1166: A computed property name in a class property declaration must directly refer to a built-in symbol. ~~~~~~~~~~ !!! error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js index c3b7f6a71d0e9..57026c3c70694 100644 --- a/tests/baselines/reference/computedPropertyNames43_ES5.js +++ b/tests/baselines/reference/computedPropertyNames43_ES5.js @@ -41,10 +41,6 @@ var D = (function (_super) { Object.defineProperty(D.prototype, "get1", { // Computed properties get: function () { return new Foo; }, - enumerable: true, - configurable: true - }); - Object.defineProperty(D.prototype, "set1", { set: function (p) { }, enumerable: true, configurable: true diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt index 83855c5f0b7e2..8baae68f33799 100644 --- a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt @@ -1,12 +1,15 @@ +tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'. tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts (1 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts (2 errors) ==== class Foo { x } class Foo2 { x; y } class C { get ["get1"]() { return new Foo } + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'. } class D extends C { diff --git a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt index 963e01ed86bd8..e329785f4cf53 100644 --- a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt @@ -1,12 +1,15 @@ +tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'. tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'. -==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (1 errors) ==== +==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (2 errors) ==== class Foo { x } class Foo2 { x; y } class C { get ["get1"]() { return new Foo } + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'. } class D extends C { diff --git a/tests/baselines/reference/computedPropertyNames4_ES5.types b/tests/baselines/reference/computedPropertyNames4_ES5.types index 51baca2658629..6984d2e69b8a4 100644 --- a/tests/baselines/reference/computedPropertyNames4_ES5.types +++ b/tests/baselines/reference/computedPropertyNames4_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : {} +>v : { [0]: number; [""]: number; } +>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; } [s]: 0, >s : string diff --git a/tests/baselines/reference/computedPropertyNames4_ES6.types b/tests/baselines/reference/computedPropertyNames4_ES6.types index 0526704951726..1fece561f5ae8 100644 --- a/tests/baselines/reference/computedPropertyNames4_ES6.types +++ b/tests/baselines/reference/computedPropertyNames4_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : {} ->{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : {} +>v : { [0]: number; [""]: number; } +>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; } [s]: 0, >s : string diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types index 9470aee8eb6f0..147b296650998 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types +++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2_ES5.ts === var v = { ->v : {} ->{ ["hello"]() { debugger; }} : {} +>v : { ["hello"](): void; } +>{ ["hello"]() { debugger; }} : { ["hello"](): void; } ["hello"]() { >"hello" : string diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types index c4f02155a95e9..0033468036299 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types +++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2_ES6.ts === var v = { ->v : {} ->{ ["hello"]() { debugger; }} : {} +>v : { ["hello"](): void; } +>{ ["hello"]() { debugger; }} : { ["hello"](): void; } ["hello"]() { >"hello" : string diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js index ece24d691da30..e7f88b92775a4 100644 --- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js +++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.js @@ -10,16 +10,16 @@ class C { static get ["computedname"]() { return ""; } - get ["computedname"]() { + get ["computedname1"]() { return ""; } - get ["computedname"]() { + get ["computedname2"]() { return ""; } - set ["computedname"](x: any) { + set ["computedname3"](x: any) { } - set ["computedname"](y: string) { + set ["computedname4"](y: string) { } set foo(a: string) { } @@ -38,15 +38,15 @@ class C { static get ["computedname"]() { return ""; } - get ["computedname"]() { + get ["computedname1"]() { return ""; } - get ["computedname"]() { + get ["computedname2"]() { return ""; } - set ["computedname"](x) { + set ["computedname3"](x) { } - set ["computedname"](y) { + set ["computedname4"](y) { } set foo(a) { } static set bar(b) { } diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols index 2d249348f9bad..b2b1a000dc968 100644 --- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols +++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols @@ -21,18 +21,18 @@ class C { static get ["computedname"]() { return ""; } - get ["computedname"]() { + get ["computedname1"]() { return ""; } - get ["computedname"]() { + get ["computedname2"]() { return ""; } - set ["computedname"](x: any) { ->x : Symbol(x, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 18, 25)) + set ["computedname3"](x: any) { +>x : Symbol(x, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 18, 26)) } - set ["computedname"](y: string) { ->y : Symbol(y, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 20, 25)) + set ["computedname4"](y: string) { +>y : Symbol(y, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 20, 26)) } set foo(a: string) { } diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types index 292fb961b10c4..e4f7d6c00b47b 100644 --- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types +++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types @@ -25,25 +25,25 @@ class C { return ""; >"" : string } - get ["computedname"]() { ->"computedname" : string + get ["computedname1"]() { +>"computedname1" : string return ""; >"" : string } - get ["computedname"]() { ->"computedname" : string + get ["computedname2"]() { +>"computedname2" : string return ""; >"" : string } - set ["computedname"](x: any) { ->"computedname" : string + set ["computedname3"](x: any) { +>"computedname3" : string >x : any } - set ["computedname"](y: string) { ->"computedname" : string + set ["computedname4"](y: string) { +>"computedname4" : string >y : string } diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js index fc0a510461bb1..8a79d45b6786c 100644 --- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js +++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.js @@ -2,18 +2,18 @@ class D { _bar: string; foo() { } - ["computedName"]() { } - ["computedName"](a: string) { } - ["computedName"](a: string): number { return 1; } + ["computedName1"]() { } + ["computedName2"](a: string) { } + ["computedName3"](a: string): number { return 1; } bar(): string { return this._bar; } baz(a: any, x: string): string { return "HELLO"; } - static ["computedname"]() { } - static ["computedname"](a: string) { } - static ["computedname"](a: string): boolean { return true; } + static ["computedname4"]() { } + static ["computedname5"](a: string) { } + static ["computedname6"](a: string): boolean { return true; } static staticMethod() { var x = 1 + 2; return x @@ -25,18 +25,18 @@ class D { //// [emitClassDeclarationWithMethodInES6.js] class D { foo() { } - ["computedName"]() { } - ["computedName"](a) { } - ["computedName"](a) { return 1; } + ["computedName1"]() { } + ["computedName2"](a) { } + ["computedName3"](a) { return 1; } bar() { return this._bar; } baz(a, x) { return "HELLO"; } - static ["computedname"]() { } - static ["computedname"](a) { } - static ["computedname"](a) { return true; } + static ["computedname4"]() { } + static ["computedname5"](a) { } + static ["computedname6"](a) { return true; } static staticMethod() { var x = 1 + 2; return x; diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols index b7a4dbbf341a1..970076f6b7837 100644 --- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols +++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols @@ -8,15 +8,15 @@ class D { foo() { } >foo : Symbol(foo, Decl(emitClassDeclarationWithMethodInES6.ts, 1, 17)) - ["computedName"]() { } - ["computedName"](a: string) { } ->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 4, 21)) + ["computedName1"]() { } + ["computedName2"](a: string) { } +>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 4, 22)) - ["computedName"](a: string): number { return 1; } ->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 21)) + ["computedName3"](a: string): number { return 1; } +>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 22)) bar(): string { ->bar : Symbol(bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 53)) +>bar : Symbol(bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 54)) return this._bar; >this._bar : Symbol(_bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9)) @@ -30,15 +30,15 @@ class D { return "HELLO"; } - static ["computedname"]() { } - static ["computedname"](a: string) { } ->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 13, 28)) + static ["computedname4"]() { } + static ["computedname5"](a: string) { } +>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 13, 29)) - static ["computedname"](a: string): boolean { return true; } ->a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 28)) + static ["computedname6"](a: string): boolean { return true; } +>a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 29)) static staticMethod() { ->staticMethod : Symbol(D.staticMethod, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 64)) +>staticMethod : Symbol(D.staticMethod, Decl(emitClassDeclarationWithMethodInES6.ts, 14, 65)) var x = 1 + 2; >x : Symbol(x, Decl(emitClassDeclarationWithMethodInES6.ts, 16, 11)) diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types index 10ae930c24486..02a90729486a7 100644 --- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types +++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.types @@ -8,15 +8,15 @@ class D { foo() { } >foo : () => void - ["computedName"]() { } ->"computedName" : string + ["computedName1"]() { } +>"computedName1" : string - ["computedName"](a: string) { } ->"computedName" : string + ["computedName2"](a: string) { } +>"computedName2" : string >a : string - ["computedName"](a: string): number { return 1; } ->"computedName" : string + ["computedName3"](a: string): number { return 1; } +>"computedName3" : string >a : string >1 : number @@ -36,15 +36,15 @@ class D { return "HELLO"; >"HELLO" : string } - static ["computedname"]() { } ->"computedname" : string + static ["computedname4"]() { } +>"computedname4" : string - static ["computedname"](a: string) { } ->"computedname" : string + static ["computedname5"](a: string) { } +>"computedname5" : string >a : string - static ["computedname"](a: string): boolean { return true; } ->"computedname" : string + static ["computedname6"](a: string): boolean { return true; } +>"computedname6" : string >a : string >true : boolean diff --git a/tests/baselines/reference/literalsInComputedProperties1.errors.txt b/tests/baselines/reference/literalsInComputedProperties1.errors.txt new file mode 100644 index 0000000000000..e9972229f795f --- /dev/null +++ b/tests/baselines/reference/literalsInComputedProperties1.errors.txt @@ -0,0 +1,66 @@ +tests/cases/compiler/literalsInComputedProperties1.ts(40,5): error TS2452: An enum member cannot have a numeric name. +tests/cases/compiler/literalsInComputedProperties1.ts(41,5): error TS2452: An enum member cannot have a numeric name. +tests/cases/compiler/literalsInComputedProperties1.ts(42,5): error TS2452: An enum member cannot have a numeric name. +tests/cases/compiler/literalsInComputedProperties1.ts(43,5): error TS2452: An enum member cannot have a numeric name. + + +==== tests/cases/compiler/literalsInComputedProperties1.ts (4 errors) ==== + + let x = { + 1:1, + [2]:1, + "3":1, + ["4"]:1 + } + x[1].toExponential(); + x[2].toExponential(); + x[3].toExponential(); + x[4].toExponential(); + + interface A { + 1:number; + [2]:number; + "3":number; + ["4"]:number; + } + + let y:A; + y[1].toExponential(); + y[2].toExponential(); + y[3].toExponential(); + y[4].toExponential(); + + class C { + 1:number; + [2]:number; + "3":number; + ["4"]:number; + } + + let z:C; + z[1].toExponential(); + z[2].toExponential(); + z[3].toExponential(); + z[4].toExponential(); + + enum X { + 1 = 1, + ~ +!!! error TS2452: An enum member cannot have a numeric name. + [2] = 2, + ~~~ +!!! error TS2452: An enum member cannot have a numeric name. + "3" = 3, + ~~~ +!!! error TS2452: An enum member cannot have a numeric name. + ["4"] = 4, + ~~~~~ +!!! error TS2452: An enum member cannot have a numeric name. + "foo" = 5, + ["bar"] = 6 + } + + let a = X["foo"]; + let a0 = X["bar"]; + + // TODO: make sure that enum still disallow template literals as member names \ No newline at end of file diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js new file mode 100644 index 0000000000000..ef11dbff6ea4a --- /dev/null +++ b/tests/baselines/reference/literalsInComputedProperties1.js @@ -0,0 +1,94 @@ +//// [literalsInComputedProperties1.ts] + +let x = { + 1:1, + [2]:1, + "3":1, + ["4"]:1 +} +x[1].toExponential(); +x[2].toExponential(); +x[3].toExponential(); +x[4].toExponential(); + +interface A { + 1:number; + [2]:number; + "3":number; + ["4"]:number; +} + +let y:A; +y[1].toExponential(); +y[2].toExponential(); +y[3].toExponential(); +y[4].toExponential(); + +class C { + 1:number; + [2]:number; + "3":number; + ["4"]:number; +} + +let z:C; +z[1].toExponential(); +z[2].toExponential(); +z[3].toExponential(); +z[4].toExponential(); + +enum X { + 1 = 1, + [2] = 2, + "3" = 3, + ["4"] = 4, + "foo" = 5, + ["bar"] = 6 +} + +let a = X["foo"]; +let a0 = X["bar"]; + +// TODO: make sure that enum still disallow template literals as member names + +//// [literalsInComputedProperties1.js] +var x = (_a = { + 1: 1 + }, + _a[2] = 1, + _a["3"] = 1, + _a["4"] = 1, + _a +); +x[1].toExponential(); +x[2].toExponential(); +x[3].toExponential(); +x[4].toExponential(); +var y; +y[1].toExponential(); +y[2].toExponential(); +y[3].toExponential(); +y[4].toExponential(); +var C = (function () { + function C() { + } + return C; +})(); +var z; +z[1].toExponential(); +z[2].toExponential(); +z[3].toExponential(); +z[4].toExponential(); +var X; +(function (X) { + X[X["1"] = 1] = "1"; + X[X[2] = 2] = 2; + X[X["3"] = 3] = "3"; + X[X["4"] = 4] = "4"; + X[X["foo"] = 5] = "foo"; + X[X["bar"] = 6] = "bar"; +})(X || (X = {})); +var a = X["foo"]; +var a0 = X["bar"]; +var _a; +// TODO: make sure that enum still disallow template literals as member names diff --git a/tests/cases/compiler/computedPropertiesInDestructuring1.ts b/tests/cases/compiler/computedPropertiesInDestructuring1.ts new file mode 100644 index 0000000000000..d3ccaa57ad105 --- /dev/null +++ b/tests/cases/compiler/computedPropertiesInDestructuring1.ts @@ -0,0 +1,36 @@ +// destructuring in variable declarations +let foo = "bar"; +let {[foo]: bar} = {bar: "bar"}; + +let {["bar"]: bar2} = {bar: "bar"}; + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {bar: "bar"}; + +let [{[foo]: bar4}] = [{bar: "bar"}]; +let [{[foo2()]: bar5}] = [{bar: "bar"}]; + +function f1({["bar"]: x}: { bar: number }) {} +function f2({[foo]: x}: { bar: number }) {} +function f3({[foo2()]: x}: { bar: number }) {} +function f4([{[foo]: x}]: [{ bar: number }]) {} +function f5([{[foo2()]: x}]: [{ bar: number }]) {} + +// report errors on type errors in computed properties used in destructuring +let [{[foo()]: bar6}] = [{bar: "bar"}]; +let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + +// destructuring assignment +({[foo]: bar} = {bar: "bar"}); + +({["bar"]: bar2} = {bar: "bar"}); + +({[foo2()]: bar3} = {bar: "bar"}); + +[{[foo]: bar4}] = [{bar: "bar"}]; +[{[foo2()]: bar5}] = [{bar: "bar"}]; + +[{[foo()]: bar4}] = [{bar: "bar"}]; +[{[(1 + {})]: bar4}] = [{bar: "bar"}]; + + diff --git a/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts b/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts new file mode 100644 index 0000000000000..4951e474fdba7 --- /dev/null +++ b/tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts @@ -0,0 +1,36 @@ +// @target: ES6 +// destructuring in variable declarations +let foo = "bar"; +let {[foo]: bar} = {bar: "bar"}; + +let {["bar"]: bar2} = {bar: "bar"}; +let {[11]: bar2_1} = {11: "bar"}; + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {bar: "bar"}; + +let [{[foo]: bar4}] = [{bar: "bar"}]; +let [{[foo2()]: bar5}] = [{bar: "bar"}]; + +function f1({["bar"]: x}: { bar: number }) {} +function f2({[foo]: x}: { bar: number }) {} +function f3({[foo2()]: x}: { bar: number }) {} +function f4([{[foo]: x}]: [{ bar: number }]) {} +function f5([{[foo2()]: x}]: [{ bar: number }]) {} + +// report errors on type errors in computed properties used in destructuring +let [{[foo()]: bar6}] = [{bar: "bar"}]; +let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; + +// destructuring assignment +({[foo]: bar} = {bar: "bar"}); + +({["bar"]: bar2} = {bar: "bar"}); + +({[foo2()]: bar3} = {bar: "bar"}); + +[{[foo]: bar4}] = [{bar: "bar"}]; +[{[foo2()]: bar5}] = [{bar: "bar"}]; + +[{[foo()]: bar4}] = [{bar: "bar"}]; +[{[(1 + {})]: bar4}] = [{bar: "bar"}]; diff --git a/tests/cases/compiler/computedPropertiesInDestructuring2.ts b/tests/cases/compiler/computedPropertiesInDestructuring2.ts new file mode 100644 index 0000000000000..806c528c17cc6 --- /dev/null +++ b/tests/cases/compiler/computedPropertiesInDestructuring2.ts @@ -0,0 +1,2 @@ +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {}; \ No newline at end of file diff --git a/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts b/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts new file mode 100644 index 0000000000000..c21f86bed1cee --- /dev/null +++ b/tests/cases/compiler/computedPropertiesInDestructuring2_ES6.ts @@ -0,0 +1,4 @@ +// @target: ES6 + +let foo2 = () => "bar"; +let {[foo2()]: bar3} = {}; \ No newline at end of file diff --git a/tests/cases/compiler/literalsInComputedProperties1.ts b/tests/cases/compiler/literalsInComputedProperties1.ts new file mode 100644 index 0000000000000..e3fed5b80aab1 --- /dev/null +++ b/tests/cases/compiler/literalsInComputedProperties1.ts @@ -0,0 +1,52 @@ +// @noImplicitAny: true + +let x = { + 1:1, + [2]:1, + "3":1, + ["4"]:1 +} +x[1].toExponential(); +x[2].toExponential(); +x[3].toExponential(); +x[4].toExponential(); + +interface A { + 1:number; + [2]:number; + "3":number; + ["4"]:number; +} + +let y:A; +y[1].toExponential(); +y[2].toExponential(); +y[3].toExponential(); +y[4].toExponential(); + +class C { + 1:number; + [2]:number; + "3":number; + ["4"]:number; +} + +let z:C; +z[1].toExponential(); +z[2].toExponential(); +z[3].toExponential(); +z[4].toExponential(); + +enum X { + 1 = 1, + [2] = 2, + "3" = 3, + ["4"] = 4, + "foo" = 5, + ["bar"] = 6 +} + +let a = X["foo"]; +let a0 = X["bar"]; + +// TODO: make sure that enum still disallow template literals as member names \ No newline at end of file diff --git a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts index 70c0b35763e9b..54c95c95a37d5 100644 --- a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts +++ b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6.ts @@ -10,16 +10,16 @@ class C { static get ["computedname"]() { return ""; } - get ["computedname"]() { + get ["computedname1"]() { return ""; } - get ["computedname"]() { + get ["computedname2"]() { return ""; } - set ["computedname"](x: any) { + set ["computedname3"](x: any) { } - set ["computedname"](y: string) { + set ["computedname4"](y: string) { } set foo(a: string) { } diff --git a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts index c5d95bc6cb16f..b7399a3511c96 100644 --- a/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts +++ b/tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithMethodInES6.ts @@ -2,18 +2,18 @@ class D { _bar: string; foo() { } - ["computedName"]() { } - ["computedName"](a: string) { } - ["computedName"](a: string): number { return 1; } + ["computedName1"]() { } + ["computedName2"](a: string) { } + ["computedName3"](a: string): number { return 1; } bar(): string { return this._bar; } baz(a: any, x: string): string { return "HELLO"; } - static ["computedname"]() { } - static ["computedname"](a: string) { } - static ["computedname"](a: string): boolean { return true; } + static ["computedname4"]() { } + static ["computedname5"](a: string) { } + static ["computedname6"](a: string): boolean { return true; } static staticMethod() { var x = 1 + 2; return x From 57f7d7f9dfb05c9e5a87c208e3ab3224be400a73 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 4 Nov 2015 16:44:21 -0800 Subject: [PATCH 138/353] Reword predicate to be more readable --- src/compiler/binder.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 57d610c931edb..b33f0b95fa337 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -130,12 +130,14 @@ namespace ts { symbol.members = {}; } - if (symbolFlags & SymbolFlags.Value && - (!symbol.valueDeclaration || - (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && node.kind !== SyntaxKind.ModuleDeclaration))) { - // other kinds of value declarations take precedence over modules - symbol.valueDeclaration = node; - } + if (symbolFlags & SymbolFlags.Value) { + const valueDeclaration = symbol.valueDeclaration; + if (!valueDeclaration || + (valueDeclaration.kind !== node.kind && valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) { + // other kinds of value declarations take precedence over modules + symbol.valueDeclaration = node; + } + } } // Should not be called on a declaration with a computed property name, From def7b665bb329f4b2f6222588f5a6f94dc5acaa5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 5 Nov 2015 20:09:40 -0800 Subject: [PATCH 139/353] PR feedback --- src/compiler/program.ts | 37 +++++++++++++++++++------------------ src/compiler/utilities.ts | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index d779e4e066529..254f6b1fe3b2d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -286,7 +286,7 @@ namespace ts { } export function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[] { - let diagnostics = program.getOptionsDiagnostics(cancellationToken).concat( + let diagnostics = program.getOptionsDiagnostics().concat( program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken)); @@ -337,6 +337,7 @@ namespace ts { let classifiableNames: Map; let skipDefaultLib = options.noLib; + let supportedExtensions = getSupportedExtensions(options); let start = new Date().getTime(); @@ -369,14 +370,13 @@ namespace ts { } if (!tryReuseStructureFromOldProgram()) { - let supportedExtensions = getSupportedExtensions(options); - forEach(rootNames, name => processRootFile(name, false, supportedExtensions)); + forEach(rootNames, name => processRootFile(name, false)); // Do not process the default library if: // - The '--noLib' flag is used. // - A 'no-default-lib' reference comment is encountered in // processing the root files. if (!skipDefaultLib) { - processRootFile(host.getDefaultLibFileName(options), true, supportedExtensions); + processRootFile(host.getDefaultLibFileName(options), true); } } @@ -833,7 +833,7 @@ namespace ts { }); } - function getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[] { + function getOptionsDiagnostics(): Diagnostic[] { let allDiagnostics: Diagnostic[] = []; addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics()); addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics()); @@ -851,8 +851,8 @@ namespace ts { return getBaseFileName(fileName).indexOf(".") >= 0; } - function processRootFile(fileName: string, isDefaultLib: boolean, supportedExtensions: string[]) { - processSourceFile(normalizePath(fileName), isDefaultLib, supportedExtensions); + function processRootFile(fileName: string, isDefaultLib: boolean) { + processSourceFile(normalizePath(fileName), isDefaultLib); } function fileReferenceIsEqualTo(a: FileReference, b: FileReference): boolean { @@ -911,7 +911,7 @@ namespace ts { } } - function processSourceFile(fileName: string, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number) { + function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) { let diagnosticArgument: string[]; let diagnostic: DiagnosticMessage; if (hasExtension(fileName)) { @@ -919,7 +919,7 @@ namespace ts { diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1; diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"]; } - else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd)) { + else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) { diagnostic = Diagnostics.File_0_not_found; diagnosticArgument = [fileName]; } @@ -929,13 +929,13 @@ namespace ts { } } else { - let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd); + let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); if (!nonTsFile) { if (options.allowNonTsExtensions) { diagnostic = Diagnostics.File_0_not_found; diagnosticArgument = [fileName]; } - else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) { + else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd))) { // (TODO: shkamat) Should this message be different given we support multiple extensions diagnostic = Diagnostics.File_0_not_found; fileName += ".ts"; @@ -965,7 +965,7 @@ namespace ts { } // Get source file from normalized fileName - function findSourceFile(fileName: string, normalizedAbsolutePath: Path, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { + function findSourceFile(fileName: string, normalizedAbsolutePath: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { if (filesByName.contains(normalizedAbsolutePath)) { const file = filesByName.get(normalizedAbsolutePath); // try to check if we've already seen this file but with a different casing in path @@ -1007,11 +1007,11 @@ namespace ts { let basePath = getDirectoryPath(fileName); if (!options.noResolve) { - processReferencedFiles(file, basePath, supportedExtensions); + processReferencedFiles(file, basePath); } // always process imported modules to record module name resolutions - processImportedModules(file, basePath, supportedExtensions); + processImportedModules(file, basePath); if (isDefaultLib) { file.isDefaultLib = true; @@ -1025,10 +1025,10 @@ namespace ts { return file; } - function processReferencedFiles(file: SourceFile, basePath: string, supportedExtensions: string[]) { + function processReferencedFiles(file: SourceFile, basePath: string) { forEach(file.referencedFiles, ref => { let referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, /* isDefaultLib */ false, supportedExtensions, file, ref.pos, ref.end); + processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end); }); } @@ -1036,7 +1036,7 @@ namespace ts { return host.getCanonicalFileName(fileName); } - function processImportedModules(file: SourceFile, basePath: string, supportedExtensions: string[]) { + function processImportedModules(file: SourceFile, basePath: string) { collectExternalModuleReferences(file); if (file.imports.length) { file.resolvedModules = {}; @@ -1046,7 +1046,7 @@ namespace ts { let resolution = resolutions[i]; setResolvedModule(file, moduleNames[i], resolution); if (resolution && !options.noResolve) { - const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, supportedExtensions, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end); + const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end); if (importedFile && resolution.isExternalLibraryImport) { if (!isExternalModule(importedFile)) { @@ -1255,6 +1255,7 @@ namespace ts { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators")); } + // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files if (!options.noEmit) { let emitHost = getEmitHost(); let emitFilesSeen = createFileMap(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index d7f33a945dd7e..1af18476e7e86 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1831,7 +1831,7 @@ namespace ts { function onBundledEmit(host: EmitHost) { let bundledSources = filter(host.getSourceFiles(), - sourceFile => !shouldEmitToOwnFile(sourceFile, host.getCompilerOptions()) && !isDeclarationFile(sourceFile)); + sourceFile => !shouldEmitToOwnFile(sourceFile, options) && !isDeclarationFile(sourceFile)); let jsFilePath = options.outFile || options.out; let emitFileNames: EmitFileNames = { jsFilePath, From 8dbfe1ca631111e28a59b62e1ddc941ea6fe2e3f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 6 Nov 2015 12:58:03 -0800 Subject: [PATCH 140/353] Added specific checks for comparing stringlike types. --- src/compiler/checker.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 50b826c1d14e0..3bbc27d71b0fc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9400,7 +9400,12 @@ namespace ts { let targetType = getTypeFromTypeNode(node.type); if (produceDiagnostics && targetType !== unknownType) { let widenedType = getWidenedType(exprType); - if (!(isTypeAssignableTo(targetType, widenedType))) { + + // Permit 'number[] | "foo"' to be asserted to 'string'. + const bothAreStringLike = + someConstituentTypeHasKind(targetType, TypeFlags.StringLike) && + someConstituentTypeHasKind(widenedType, TypeFlags.StringLike); + if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); } } @@ -10244,6 +10249,10 @@ namespace ts { case SyntaxKind.ExclamationEqualsToken: case SyntaxKind.EqualsEqualsEqualsToken: case SyntaxKind.ExclamationEqualsEqualsToken: + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (someConstituentTypeHasKind(leftType, TypeFlags.StringLike) && someConstituentTypeHasKind(rightType, TypeFlags.StringLike)) { + return booleanType; + } if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) { reportOperatorError(); } @@ -12703,6 +12712,7 @@ namespace ts { let hasDuplicateDefaultClause = false; let expressionType = checkExpression(node.expression); + const expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, TypeFlags.StringLike); forEach(node.caseBlock.clauses, clause => { // Grammar check for duplicate default clauses, skip if we already report duplicate default clause if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) { @@ -12723,6 +12733,12 @@ namespace ts { // TypeScript 1.0 spec (April 2014):5.9 // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression. let caseType = checkExpression(caseClause.expression); + + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, TypeFlags.StringLike)) { + return; + } + if (!isTypeAssignableTo(expressionType, caseType)) { // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined); From a1fcfaf5744bdf33767cb9cc720e2cc636cfe213 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 6 Nov 2015 12:59:06 -0800 Subject: [PATCH 141/353] Accepted baselines. --- .../stringLiteralCheckedInIf01.errors.txt | 26 ----- .../stringLiteralCheckedInIf01.symbols | 36 ++++++ .../stringLiteralCheckedInIf01.types | 46 ++++++++ .../stringLiteralCheckedInIf02.errors.txt | 27 ----- .../stringLiteralCheckedInIf02.symbols | 42 +++++++ .../stringLiteralCheckedInIf02.types | 52 +++++++++ .../stringLiteralMatchedInSwitch01.errors.txt | 26 ----- .../stringLiteralMatchedInSwitch01.symbols | 28 +++++ .../stringLiteralMatchedInSwitch01.types | 37 ++++++ .../stringLiteralTypeAssertion01.errors.txt | 55 --------- .../stringLiteralTypeAssertion01.symbols | 83 ++++++++++++++ .../stringLiteralTypeAssertion01.types | 107 ++++++++++++++++++ ...tringLiteralTypesInUnionTypes03.errors.txt | 29 ----- .../stringLiteralTypesInUnionTypes03.symbols | 52 +++++++++ .../stringLiteralTypesInUnionTypes03.types | 61 ++++++++++ ...eralTypesWithVariousOperators02.errors.txt | 13 +-- 16 files changed, 546 insertions(+), 174 deletions(-) delete mode 100644 tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf01.symbols create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf01.types delete mode 100644 tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf02.symbols create mode 100644 tests/baselines/reference/stringLiteralCheckedInIf02.types delete mode 100644 tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols create mode 100644 tests/baselines/reference/stringLiteralMatchedInSwitch01.types delete mode 100644 tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypeAssertion01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypeAssertion01.types delete mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesInUnionTypes03.types diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt b/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt deleted file mode 100644 index fb94cf6bc96d7..0000000000000 --- a/tests/baselines/reference/stringLiteralCheckedInIf01.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts(6,9): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. -tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts(9,14): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts (2 errors) ==== - - type S = "a" | "b"; - type T = S[] | S; - - function f(foo: T) { - if (foo === "a") { - ~~~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - return foo; - } - else if (foo === "b") { - ~~~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - return foo; - } - else { - return (foo as S[])[0]; - } - - throw new Error("Unreachable code hit."); - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.symbols b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols new file mode 100644 index 0000000000000..bd382a66ffa96 --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols @@ -0,0 +1,36 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts === + +type S = "a" | "b"; +>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0)) + +type T = S[] | S; +>T : Symbol(T, Decl(stringLiteralCheckedInIf01.ts, 1, 19)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0)) + +function f(foo: T) { +>f : Symbol(f, Decl(stringLiteralCheckedInIf01.ts, 2, 17)) +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) +>T : Symbol(T, Decl(stringLiteralCheckedInIf01.ts, 1, 19)) + + if (foo === "a") { +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) + + return foo; +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) + } + else if (foo === "b") { +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) + + return foo; +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) + } + else { + return (foo as S[])[0]; +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0)) + } + + throw new Error("Unreachable code hit."); +>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.types b/tests/baselines/reference/stringLiteralCheckedInIf01.types new file mode 100644 index 0000000000000..1b3e663be740f --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.types @@ -0,0 +1,46 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts === + +type S = "a" | "b"; +>S : "a" | "b" + +type T = S[] | S; +>T : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>S : "a" | "b" + +function f(foo: T) { +>f : (foo: ("a" | "b")[] | "a" | "b") => ("a" | "b")[] | "a" | "b" +>foo : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" + + if (foo === "a") { +>foo === "a" : boolean +>foo : ("a" | "b")[] | "a" | "b" +>"a" : string + + return foo; +>foo : ("a" | "b")[] | "a" | "b" + } + else if (foo === "b") { +>foo === "b" : boolean +>foo : ("a" | "b")[] | "a" | "b" +>"b" : string + + return foo; +>foo : ("a" | "b")[] | "a" | "b" + } + else { + return (foo as S[])[0]; +>(foo as S[])[0] : "a" | "b" +>(foo as S[]) : ("a" | "b")[] +>foo as S[] : ("a" | "b")[] +>foo : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>0 : number + } + + throw new Error("Unreachable code hit."); +>new Error("Unreachable code hit.") : Error +>Error : ErrorConstructor +>"Unreachable code hit." : string +} diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt b/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt deleted file mode 100644 index ced5adf626334..0000000000000 --- a/tests/baselines/reference/stringLiteralCheckedInIf02.errors.txt +++ /dev/null @@ -1,27 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts(6,12): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. -tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts(6,25): error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts (2 errors) ==== - - type S = "a" | "b"; - type T = S[] | S; - - function isS(t: T): t is S { - return t === "a" || t === "b"; - ~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - ~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '("a" | "b")[] | "a" | "b"' and 'string'. - } - - function f(foo: T) { - if (isS(foo)) { - return foo; - } - else { - return foo[0]; - } - - throw new Error("Unreachable code hit."); - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.symbols b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols new file mode 100644 index 0000000000000..84a19936371b2 --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols @@ -0,0 +1,42 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts === + +type S = "a" | "b"; +>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0)) + +type T = S[] | S; +>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0)) + +function isS(t: T): t is S { +>isS : Symbol(isS, Decl(stringLiteralCheckedInIf02.ts, 2, 17)) +>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13)) +>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19)) +>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13)) +>S : Symbol(S, Decl(stringLiteralCheckedInIf02.ts, 0, 0)) + + return t === "a" || t === "b"; +>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13)) +>t : Symbol(t, Decl(stringLiteralCheckedInIf02.ts, 4, 13)) +} + +function f(foo: T) { +>f : Symbol(f, Decl(stringLiteralCheckedInIf02.ts, 6, 1)) +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11)) +>T : Symbol(T, Decl(stringLiteralCheckedInIf02.ts, 1, 19)) + + if (isS(foo)) { +>isS : Symbol(isS, Decl(stringLiteralCheckedInIf02.ts, 2, 17)) +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11)) + + return foo; +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11)) + } + else { + return foo[0]; +>foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11)) + } + + throw new Error("Unreachable code hit."); +>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types new file mode 100644 index 0000000000000..005ec356f39b9 --- /dev/null +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types @@ -0,0 +1,52 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts === + +type S = "a" | "b"; +>S : "a" | "b" + +type T = S[] | S; +>T : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>S : "a" | "b" + +function isS(t: T): t is S { +>isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" +>t : any +>S : "a" | "b" + + return t === "a" || t === "b"; +>t === "a" || t === "b" : boolean +>t === "a" : boolean +>t : ("a" | "b")[] | "a" | "b" +>"a" : string +>t === "b" : boolean +>t : ("a" | "b")[] | "a" | "b" +>"b" : string +} + +function f(foo: T) { +>f : (foo: ("a" | "b")[] | "a" | "b") => "a" | "b" +>foo : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" + + if (isS(foo)) { +>isS(foo) : boolean +>isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b" +>foo : ("a" | "b")[] | "a" | "b" + + return foo; +>foo : "a" | "b" + } + else { + return foo[0]; +>foo[0] : "a" | "b" +>foo : ("a" | "b")[] +>0 : number + } + + throw new Error("Unreachable code hit."); +>new Error("Unreachable code hit.") : Error +>Error : ErrorConstructor +>"Unreachable code hit." : string +} diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt b/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt deleted file mode 100644 index 17e690715a1c5..0000000000000 --- a/tests/baselines/reference/stringLiteralMatchedInSwitch01.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts(7,10): error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. - Type 'string' is not assignable to type '"b"'. -tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts(8,10): error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. - Type 'string' is not assignable to type '"b"'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts (2 errors) ==== - - type S = "a" | "b"; - type T = S[] | S; - - var foo: T; - switch (foo) { - case "a": - ~~~ -!!! error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. -!!! error TS2322: Type 'string' is not assignable to type '"b"'. - case "b": - ~~~ -!!! error TS2322: Type 'string' is not assignable to type '("a" | "b")[] | "a" | "b"'. -!!! error TS2322: Type 'string' is not assignable to type '"b"'. - break; - default: - foo = (foo as S[])[0]; - break; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols b/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols new file mode 100644 index 0000000000000..0323371c3070d --- /dev/null +++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.symbols @@ -0,0 +1,28 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts === + +type S = "a" | "b"; +>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0)) + +type T = S[] | S; +>T : Symbol(T, Decl(stringLiteralMatchedInSwitch01.ts, 1, 19)) +>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0)) +>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0)) + +var foo: T; +>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralMatchedInSwitch01.ts, 1, 19)) + +switch (foo) { +>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3)) + + case "a": + case "b": + break; + default: + foo = (foo as S[])[0]; +>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3)) +>foo : Symbol(foo, Decl(stringLiteralMatchedInSwitch01.ts, 4, 3)) +>S : Symbol(S, Decl(stringLiteralMatchedInSwitch01.ts, 0, 0)) + + break; +} diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.types b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types new file mode 100644 index 0000000000000..cfbb77e07e0a3 --- /dev/null +++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types @@ -0,0 +1,37 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralMatchedInSwitch01.ts === + +type S = "a" | "b"; +>S : "a" | "b" + +type T = S[] | S; +>T : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>S : "a" | "b" + +var foo: T; +>foo : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" + +switch (foo) { +>foo : ("a" | "b")[] | "a" | "b" + + case "a": +>"a" : string + + case "b": +>"b" : string + + break; + default: + foo = (foo as S[])[0]; +>foo = (foo as S[])[0] : "a" | "b" +>foo : ("a" | "b")[] | "a" | "b" +>(foo as S[])[0] : "a" | "b" +>(foo as S[]) : ("a" | "b")[] +>foo as S[] : ("a" | "b")[] +>foo : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>0 : number + + break; +} diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt b/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt deleted file mode 100644 index 867ad80ee7fbf..0000000000000 --- a/tests/baselines/reference/stringLiteralTypeAssertion01.errors.txt +++ /dev/null @@ -1,55 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(22,5): error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. - Type 'string' is not assignable to type '"b"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(23,5): error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. - Type 'string' is not assignable to type '"b"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(30,7): error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. - Type '("a" | "b")[]' is not assignable to type 'string'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts(31,7): error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. - Type '("a" | "b")[]' is not assignable to type 'string'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts (4 errors) ==== - - type S = "a" | "b"; - type T = S[] | S; - - var s: S; - var t: T; - var str: string; - - //////////////// - - s = t; - s = t as S; - - s = str; - s = str as S; - - //////////////// - - t = s; - t = s as T; - - t = str; - ~~~~~~ -!!! error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. -!!! error TS2352: Type 'string' is not assignable to type '"b"'. - t = str as T; - ~~~~~~~~ -!!! error TS2352: Neither type 'string' nor type '("a" | "b")[] | "a" | "b"' is assignable to the other. -!!! error TS2352: Type 'string' is not assignable to type '"b"'. - - //////////////// - - str = s; - str = s as string; - - str = t; - ~~~~~~~~~ -!!! error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. -!!! error TS2352: Type '("a" | "b")[]' is not assignable to type 'string'. - str = t as string; - ~~~~~~~~~~~ -!!! error TS2352: Neither type '("a" | "b")[] | "a" | "b"' nor type 'string' is assignable to the other. -!!! error TS2352: Type '("a" | "b")[]' is not assignable to type 'string'. - \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.symbols b/tests/baselines/reference/stringLiteralTypeAssertion01.symbols new file mode 100644 index 0000000000000..1491a32b6f8bf --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeAssertion01.symbols @@ -0,0 +1,83 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts === + +type S = "a" | "b"; +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) + +type T = S[] | S; +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) + +var s: S; +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) + +var t: T; +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) + +var str: string; +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) + +//////////////// + +s = t; +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) + +s = t as S; +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) + +s = str; +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) + +s = str as S; +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>S : Symbol(S, Decl(stringLiteralTypeAssertion01.ts, 0, 0)) + +//////////////// + +t = s; +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) + +t = s as T; +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) + +t = str; +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) + +t = str as T; +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>T : Symbol(T, Decl(stringLiteralTypeAssertion01.ts, 1, 19)) + +//////////////// + +str = s; +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) + +str = s as string; +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>s : Symbol(s, Decl(stringLiteralTypeAssertion01.ts, 4, 3)) + +str = t; +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) + +str = t as string; +>str : Symbol(str, Decl(stringLiteralTypeAssertion01.ts, 6, 3)) +>t : Symbol(t, Decl(stringLiteralTypeAssertion01.ts, 5, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.types b/tests/baselines/reference/stringLiteralTypeAssertion01.types new file mode 100644 index 0000000000000..f70313f834700 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeAssertion01.types @@ -0,0 +1,107 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypeAssertion01.ts === + +type S = "a" | "b"; +>S : "a" | "b" + +type T = S[] | S; +>T : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" +>S : "a" | "b" + +var s: S; +>s : "a" | "b" +>S : "a" | "b" + +var t: T; +>t : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" + +var str: string; +>str : string + +//////////////// + +s = t; +>s = t : "a" | "b" +>s : "a" | "b" +>t : "a" | "b" +>S : "a" | "b" +>t : ("a" | "b")[] | "a" | "b" + +s = t as S; +>s = t as S : "a" | "b" +>s : "a" | "b" +>t as S : "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>S : "a" | "b" + +s = str; +>s = str : "a" | "b" +>s : "a" | "b" +>str : "a" | "b" +>S : "a" | "b" +>str : string + +s = str as S; +>s = str as S : "a" | "b" +>s : "a" | "b" +>str as S : "a" | "b" +>str : string +>S : "a" | "b" + +//////////////// + +t = s; +>t = s : ("a" | "b")[] | "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>s : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" +>s : "a" | "b" + +t = s as T; +>t = s as T : ("a" | "b")[] | "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>s as T : ("a" | "b")[] | "a" | "b" +>s : "a" | "b" +>T : ("a" | "b")[] | "a" | "b" + +t = str; +>t = str : ("a" | "b")[] | "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>str : ("a" | "b")[] | "a" | "b" +>T : ("a" | "b")[] | "a" | "b" +>str : string + +t = str as T; +>t = str as T : ("a" | "b")[] | "a" | "b" +>t : ("a" | "b")[] | "a" | "b" +>str as T : ("a" | "b")[] | "a" | "b" +>str : string +>T : ("a" | "b")[] | "a" | "b" + +//////////////// + +str = s; +>str = s : string +>str : string +>s : string +>s : "a" | "b" + +str = s as string; +>str = s as string : string +>str : string +>s as string : string +>s : "a" | "b" + +str = t; +>str = t : string +>str : string +>t : string +>t : ("a" | "b")[] | "a" | "b" + +str = t as string; +>str = t as string : string +>str : string +>t as string : string +>t : ("a" | "b")[] | "a" | "b" + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt deleted file mode 100644 index 74249b178d619..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(7,5): error TS2365: Operator '===' cannot be applied to types '"foo" | "bar" | number' and 'string'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts(10,10): error TS2365: Operator '!==' cannot be applied to types '"foo" | "bar" | number' and 'string'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts (2 errors) ==== - - type T = number | "foo" | "bar"; - - var x: "foo" | "bar" | number; - var y: T = "bar"; - - if (x === "foo") { - ~~~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '"foo" | "bar" | number' and 'string'. - let a = x; - } - else if (x !== "bar") { - ~~~~~~~~~~~ -!!! error TS2365: Operator '!==' cannot be applied to types '"foo" | "bar" | number' and 'string'. - let b = x || y; - } - else { - let c = x; - let d = y; - let e: (typeof x) | (typeof y) = c || d; - } - - x = y; - y = x; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols new file mode 100644 index 0000000000000..df5498d9a5943 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.symbols @@ -0,0 +1,52 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts === + +type T = number | "foo" | "bar"; +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes03.ts, 0, 0)) + +var x: "foo" | "bar" | number; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) + +var y: T = "bar"; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) +>T : Symbol(T, Decl(stringLiteralTypesInUnionTypes03.ts, 0, 0)) + +if (x === "foo") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesInUnionTypes03.ts, 7, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) +} +else if (x !== "bar") { +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) + + let b = x || y; +>b : Symbol(b, Decl(stringLiteralTypesInUnionTypes03.ts, 10, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) +} +else { + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes03.ts, 13, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) + + let d = y; +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes03.ts, 14, 7)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) + + let e: (typeof x) | (typeof y) = c || d; +>e : Symbol(e, Decl(stringLiteralTypesInUnionTypes03.ts, 15, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) +>c : Symbol(c, Decl(stringLiteralTypesInUnionTypes03.ts, 13, 7)) +>d : Symbol(d, Decl(stringLiteralTypesInUnionTypes03.ts, 14, 7)) +} + +x = y; +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) + +y = x; +>y : Symbol(y, Decl(stringLiteralTypesInUnionTypes03.ts, 4, 3)) +>x : Symbol(x, Decl(stringLiteralTypesInUnionTypes03.ts, 3, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types new file mode 100644 index 0000000000000..5fca6e69be996 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types @@ -0,0 +1,61 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesInUnionTypes03.ts === + +type T = number | "foo" | "bar"; +>T : number | "foo" | "bar" + +var x: "foo" | "bar" | number; +>x : "foo" | "bar" | number + +var y: T = "bar"; +>y : number | "foo" | "bar" +>T : number | "foo" | "bar" +>"bar" : "bar" + +if (x === "foo") { +>x === "foo" : boolean +>x : "foo" | "bar" | number +>"foo" : string + + let a = x; +>a : "foo" | "bar" | number +>x : "foo" | "bar" | number +} +else if (x !== "bar") { +>x !== "bar" : boolean +>x : "foo" | "bar" | number +>"bar" : string + + let b = x || y; +>b : "foo" | "bar" | number +>x || y : "foo" | "bar" | number +>x : "foo" | "bar" | number +>y : number | "foo" | "bar" +} +else { + let c = x; +>c : "foo" | "bar" | number +>x : "foo" | "bar" | number + + let d = y; +>d : number | "foo" | "bar" +>y : number | "foo" | "bar" + + let e: (typeof x) | (typeof y) = c || d; +>e : "foo" | "bar" | number +>x : "foo" | "bar" | number +>y : number | "foo" | "bar" +>c || d : "foo" | "bar" | number +>c : "foo" | "bar" | number +>d : number | "foo" | "bar" +} + +x = y; +>x = y : number | "foo" | "bar" +>x : "foo" | "bar" | number +>y : number | "foo" | "bar" + +y = x; +>y = x : "foo" | "bar" | number +>y : number | "foo" | "bar" +>x : "foo" | "bar" | number + diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt index 92afe67df0c62..69dd6c2f6a955 100644 --- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt @@ -7,12 +7,9 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(13,11): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(14,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(16,9): error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(17,9): error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(18,9): error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (12 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (9 errors) ==== let abc: "ABC" = "ABC"; let xyz: "XYZ" = "XYZ"; @@ -47,11 +44,5 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato ~~~~~~~~~~~~~~~~ !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type. let j = abc < xyz; - ~~~~~~~~~ -!!! error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'. let k = abc === xyz; - ~~~~~~~~~~~ -!!! error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'. - let l = abc != xyz; - ~~~~~~~~~~ -!!! error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'. \ No newline at end of file + let l = abc != xyz; \ No newline at end of file From f939ff23ce66ce8c461a2d5da400eb3c09fd384c Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 6 Nov 2015 14:25:25 -0800 Subject: [PATCH 142/353] Fixed unreachable code in tests. --- .../types/stringLiteral/stringLiteralCheckedInIf01.ts | 2 -- .../types/stringLiteral/stringLiteralCheckedInIf02.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts index 093824acf0d42..f13ce35e82914 100644 --- a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf01.ts @@ -12,6 +12,4 @@ function f(foo: T) { else { return (foo as S[])[0]; } - - throw new Error("Unreachable code hit."); } \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts index 53d625f720034..4eaf18ca7ccb4 100644 --- a/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralCheckedInIf02.ts @@ -13,6 +13,4 @@ function f(foo: T) { else { return foo[0]; } - - throw new Error("Unreachable code hit."); } \ No newline at end of file From d234b8df2ee3b26843d29e31e512c567ebf09e22 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 6 Nov 2015 14:28:54 -0800 Subject: [PATCH 143/353] Accepted baselines. --- tests/baselines/reference/stringLiteralCheckedInIf01.js | 3 --- tests/baselines/reference/stringLiteralCheckedInIf01.symbols | 3 --- tests/baselines/reference/stringLiteralCheckedInIf01.types | 5 ----- tests/baselines/reference/stringLiteralCheckedInIf02.js | 3 --- tests/baselines/reference/stringLiteralCheckedInIf02.symbols | 3 --- tests/baselines/reference/stringLiteralCheckedInIf02.types | 5 ----- 6 files changed, 22 deletions(-) diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.js b/tests/baselines/reference/stringLiteralCheckedInIf01.js index 227a243133c6b..161c39b96efa4 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf01.js +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.js @@ -13,8 +13,6 @@ function f(foo: T) { else { return (foo as S[])[0]; } - - throw new Error("Unreachable code hit."); } //// [stringLiteralCheckedInIf01.js] @@ -28,5 +26,4 @@ function f(foo) { else { return foo[0]; } - throw new Error("Unreachable code hit."); } diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.symbols b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols index bd382a66ffa96..1b4d5e6b07125 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf01.symbols +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.symbols @@ -30,7 +30,4 @@ function f(foo: T) { >foo : Symbol(foo, Decl(stringLiteralCheckedInIf01.ts, 4, 11)) >S : Symbol(S, Decl(stringLiteralCheckedInIf01.ts, 0, 0)) } - - throw new Error("Unreachable code hit."); ->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.types b/tests/baselines/reference/stringLiteralCheckedInIf01.types index 1b3e663be740f..75b7eadbc19b4 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf01.types +++ b/tests/baselines/reference/stringLiteralCheckedInIf01.types @@ -38,9 +38,4 @@ function f(foo: T) { >S : "a" | "b" >0 : number } - - throw new Error("Unreachable code hit."); ->new Error("Unreachable code hit.") : Error ->Error : ErrorConstructor ->"Unreachable code hit." : string } diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.js b/tests/baselines/reference/stringLiteralCheckedInIf02.js index b0b3a64116b3c..22bd6359f6187 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf02.js +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.js @@ -14,8 +14,6 @@ function f(foo: T) { else { return foo[0]; } - - throw new Error("Unreachable code hit."); } //// [stringLiteralCheckedInIf02.js] @@ -29,5 +27,4 @@ function f(foo) { else { return foo[0]; } - throw new Error("Unreachable code hit."); } diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.symbols b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols index 84a19936371b2..629f990b91260 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf02.symbols +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.symbols @@ -36,7 +36,4 @@ function f(foo: T) { return foo[0]; >foo : Symbol(foo, Decl(stringLiteralCheckedInIf02.ts, 8, 11)) } - - throw new Error("Unreachable code hit."); ->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types index 005ec356f39b9..79f4c6a223a71 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf02.types +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types @@ -44,9 +44,4 @@ function f(foo: T) { >foo : ("a" | "b")[] >0 : number } - - throw new Error("Unreachable code hit."); ->new Error("Unreachable code hit.") : Error ->Error : ErrorConstructor ->"Unreachable code hit." : string } From c011ed455bd06551c170ee781189f1c02c4a7c1a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 6 Nov 2015 15:00:35 -0800 Subject: [PATCH 144/353] Const. --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 44dcc423e8ff6..e0e9a6e620f54 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10403,7 +10403,7 @@ namespace ts { function checkStringLiteralExpression(node: StringLiteral): Type { // TODO (drosen): Do we want to apply the same approach to no-sub template literals? - let contextualType = getContextualType(node); + const contextualType = getContextualType(node); if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { return getStringLiteralType(node); } From 72723e93bebe87c657ebe1c69f771b00b3d4f780 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 7 Nov 2015 16:56:16 -0800 Subject: [PATCH 145/353] do not report 'excess property error' if object literal pattern contains computed properties --- src/compiler/checker.ts | 15 ++++++-- src/compiler/types.ts | 1 + ...putedPropertiesInDestructuring1.errors.txt | 38 +------------------ ...dPropertiesInDestructuring1_ES6.errors.txt | 38 +------------------ 4 files changed, 15 insertions(+), 77 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cb15d6d94013b..8b3b0417d5ddc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2500,10 +2500,12 @@ namespace ts { // Return the type implied by an object binding pattern function getTypeFromObjectBindingPattern(pattern: BindingPattern, includePatternInType: boolean): Type { const members: SymbolTable = {}; + let hasComputedProperties = false; forEach(pattern.elements, e => { const name = e.propertyName || e.name; if (isComputedNonLiteralName(name)) { // do not include computed properties in the implied type + hasComputedProperties = true; return; } @@ -2518,6 +2520,9 @@ namespace ts { if (includePatternInType) { result.pattern = pattern; } + if (hasComputedProperties) { + result.flags |= TypeFlags.ObjectLiteralPatternWithComputedProperties; + } return result; } @@ -5010,7 +5015,7 @@ namespace ts { } function hasExcessProperties(source: FreshObjectLiteralType, target: Type, reportErrors: boolean): boolean { - if (someConstituentTypeHasKind(target, TypeFlags.ObjectType)) { + if (!(target.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties) && someConstituentTypeHasKind(target, TypeFlags.ObjectType)) { for (const prop of getPropertiesOfObjectType(source)) { if (!isKnownProperty(target, prop.name)) { if (reportErrors) { @@ -7428,6 +7433,7 @@ namespace ts { (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression); let typeFlags: TypeFlags = 0; + let patternWithComputedProperties = false; for (const memberDecl of node.properties) { let member = memberDecl.symbol; if (memberDecl.kind === SyntaxKind.PropertyAssignment || @@ -7455,8 +7461,11 @@ namespace ts { if (isOptional) { prop.flags |= SymbolFlags.Optional; } + if (hasDynamicName(memberDecl)) { + patternWithComputedProperties = true; + } } - else if (contextualTypeHasPattern) { + else if (contextualTypeHasPattern && !(contextualType.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties)) { // If object literal is contextually typed by the implied type of a binding pattern, and if the // binding pattern specifies a default value for the property, make the property optional. const impliedProp = getPropertyOfType(contextualType, member.name); @@ -7513,7 +7522,7 @@ namespace ts { const numberIndexType = getIndexType(IndexKind.Number); const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral; - result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags); + result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0); if (inDestructuringPattern) { result.pattern = node; } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index af6200ac023cd..4ed64b07f17e8 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1822,6 +1822,7 @@ namespace ts { ContainsAnyFunctionType = 0x00800000, // Type is or contains object literal type ESSymbol = 0x01000000, // Type of symbol primitive introduced in ES6 ThisType = 0x02000000, // This type + ObjectLiteralPatternWithComputedProperties = 0x04000000, // Object literal type implied by binding pattern has computed properties /* @internal */ Intrinsic = Any | String | Number | Boolean | ESSymbol | Void | Undefined | Null, diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt index 682db92f95f61..dc536e544b23f 100644 --- a/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt +++ b/tests/baselines/reference/computedPropertiesInDestructuring1.errors.txt @@ -1,41 +1,21 @@ -tests/cases/compiler/computedPropertiesInDestructuring1.ts(3,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(8,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(10,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(11,28): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1.ts(20,8): error TS2349: Cannot invoke an expression whose type lacks a call signature. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(20,27): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1.ts(21,12): error TS2339: Property 'toExponential' does not exist on type 'string'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(21,41): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(24,18): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(28,22): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(30,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(31,24): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1.ts(33,4): error TS2349: Cannot invoke an expression whose type lacks a call signature. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(33,23): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,26): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -==== tests/cases/compiler/computedPropertiesInDestructuring1.ts (16 errors) ==== +==== tests/cases/compiler/computedPropertiesInDestructuring1.ts (4 errors) ==== // destructuring in variable declarations let foo = "bar"; let {[foo]: bar} = {bar: "bar"}; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let {["bar"]: bar2} = {bar: "bar"}; let foo2 = () => "bar"; let {[foo2()]: bar3} = {bar: "bar"}; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo]: bar4}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo2()]: bar5}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. function f1({["bar"]: x}: { bar: number }) {} function f2({[foo]: x}: { bar: number }) {} @@ -47,42 +27,26 @@ tests/cases/compiler/computedPropertiesInDestructuring1.ts(34,26): error TS2353: let [{[foo()]: bar6}] = [{bar: "bar"}]; ~~~~~ !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; ~~~~~~~~~~~~~ !!! error TS2339: Property 'toExponential' does not exist on type 'string'. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. // destructuring assignment ({[foo]: bar} = {bar: "bar"}); - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. ({["bar"]: bar2} = {bar: "bar"}); ({[foo2()]: bar3} = {bar: "bar"}); - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo]: bar4}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo2()]: bar5}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo()]: bar4}] = [{bar: "bar"}]; ~~~~~ !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[(1 + {})]: bar4}] = [{bar: "bar"}]; ~~~~~~ !!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt index 1866cf1d54370..96ab892d1b953 100644 --- a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.errors.txt @@ -1,42 +1,22 @@ -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(3,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(9,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(11,25): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(12,28): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(21,8): error TS2349: Cannot invoke an expression whose type lacks a call signature. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(21,27): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(22,12): error TS2339: Property 'toExponential' does not exist on type 'string'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(22,41): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(25,18): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(29,22): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(31,21): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(32,24): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(34,4): error TS2349: Cannot invoke an expression whose type lacks a call signature. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(34,23): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,5): error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. -tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,26): error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. -==== tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts (16 errors) ==== +==== tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts (4 errors) ==== // destructuring in variable declarations let foo = "bar"; let {[foo]: bar} = {bar: "bar"}; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let {["bar"]: bar2} = {bar: "bar"}; let {[11]: bar2_1} = {11: "bar"}; let foo2 = () => "bar"; let {[foo2()]: bar3} = {bar: "bar"}; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo]: bar4}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo2()]: bar5}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. function f1({["bar"]: x}: { bar: number }) {} function f2({[foo]: x}: { bar: number }) {} @@ -48,40 +28,24 @@ tests/cases/compiler/computedPropertiesInDestructuring1_ES6.ts(35,26): error TS2 let [{[foo()]: bar6}] = [{bar: "bar"}]; ~~~~~ !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. let [{[foo.toExponential()]: bar7}] = [{bar: "bar"}]; ~~~~~~~~~~~~~ !!! error TS2339: Property 'toExponential' does not exist on type 'string'. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. // destructuring assignment ({[foo]: bar} = {bar: "bar"}); - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. ({["bar"]: bar2} = {bar: "bar"}); ({[foo2()]: bar3} = {bar: "bar"}); - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo]: bar4}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo2()]: bar5}] = [{bar: "bar"}]; - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[foo()]: bar4}] = [{bar: "bar"}]; ~~~~~ !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. [{[(1 + {})]: bar4}] = [{bar: "bar"}]; ~~~~~~ !!! error TS2365: Operator '+' cannot be applied to types 'number' and '{}'. - ~~~ -!!! error TS2353: Object literal may only specify known properties, and 'bar' does not exist in type '{}'. \ No newline at end of file From 470d1d28ab60b078c1e0ce6146d860454bb16319 Mon Sep 17 00:00:00 2001 From: Jeffrey Morlan Date: Sun, 8 Nov 2015 12:00:27 -0800 Subject: [PATCH 146/353] Fix issue #5444 reportImplementationExpectedError: The next node in the tree is not necessarily consecutive. This happens due to syntax errors, e.g. class C { foo(), foo(); } --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 706ed1c65a3c9..c13f678261c11 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11205,7 +11205,7 @@ namespace ts { seen = c === node; } }); - if (subsequentNode) { + if (subsequentNode && subsequentNode.pos === node.end) { if (subsequentNode.kind === node.kind) { const errorNode: Node = (subsequentNode).name || subsequentNode; // TODO(jfreeman): These are methods, so handle computed name case From efbacb97c9d57a449a45da2110b550303e0a0398 Mon Sep 17 00:00:00 2001 From: mihailik Date: Mon, 9 Nov 2015 09:45:57 +0000 Subject: [PATCH 147/353] Use ts.indexOf instead of Array.prototype.indexOf (keep consistent with the rest of codebase, and thus enable ES3-compatibility of tsc and services) --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 706ed1c65a3c9..c4a60cd3355c2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3731,7 +3731,7 @@ namespace ts { if (node.initializer) { const signatureDeclaration = node.parent; const signature = getSignatureFromDeclaration(signatureDeclaration); - const parameterIndex = signatureDeclaration.parameters.indexOf(node); + const parameterIndex = ts.indexOf(signatureDeclaration.parameters, node); Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } From 4ca24bf1318d26b0770275417cf2e634a8ad5049 Mon Sep 17 00:00:00 2001 From: mihailik Date: Mon, 9 Nov 2015 09:52:13 +0000 Subject: [PATCH 148/353] Use ts.indexOf instead of Array.prototype.indexOf (keep consistent with the rest of codebase, and thus enable ES3-compatibility of tsc and services) --- src/services/formatting/tokenRange.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/formatting/tokenRange.ts b/src/services/formatting/tokenRange.ts index 19185cdf78d3f..1afde6136188c 100644 --- a/src/services/formatting/tokenRange.ts +++ b/src/services/formatting/tokenRange.ts @@ -14,7 +14,7 @@ namespace ts.formatting { constructor(from: SyntaxKind, to: SyntaxKind, except: SyntaxKind[]) { this.tokens = []; for (let token = from; token <= to; token++) { - if (except.indexOf(token) < 0) { + if (ts.indexOf(except, token) < 0) { this.tokens.push(token); } } @@ -123,4 +123,4 @@ namespace ts.formatting { static TypeNames = TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.NumberKeyword, SyntaxKind.StringKeyword, SyntaxKind.BooleanKeyword, SyntaxKind.SymbolKeyword, SyntaxKind.VoidKeyword, SyntaxKind.AnyKeyword]); } } -} \ No newline at end of file +} From 81c2cb90e8c1beacd780d5e5b90cdfc15fa9ea8f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 9 Nov 2015 10:16:16 -0800 Subject: [PATCH 149/353] apply captured type parameters to returned classes Get instantiated constructors for classes with captured (outer) type parameters that have not yet been applied. The fast path was incorrect for these classes. --- src/compiler/checker.ts | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d1dbc9669529c..4f39ada7a53b8 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2868,23 +2868,25 @@ namespace ts { function resolveBaseTypesOfClass(type: InterfaceType): void { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; - let baseContructorType = getBaseConstructorTypeOfClass(type); - if (!(baseContructorType.flags & TypeFlags.ObjectType)) { + let baseConstructorType = getBaseConstructorTypeOfClass(type); + if (!(baseConstructorType.flags & TypeFlags.ObjectType)) { return; } let baseTypeNode = getBaseTypeNodeOfClass(type); let baseType: Type; - if (baseContructorType.symbol && baseContructorType.symbol.flags & SymbolFlags.Class) { - // When base constructor type is a class we know that the constructors all have the same type parameters as the + let originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class && + !baseTypeHasUnappliedOuterTypeParameters(originalBaseType)) { + // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the // class and all return the instance type of the class. There is no need for further checks and we can apply the // type arguments in the same manner as a type reference to get the same error reporting experience. - baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol); + baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol); } else { // The class derives from a "class-like" constructor function, check that we have at least one construct signature // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere // we check that all instantiated signatures return the same type. - let constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments); + let constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments); if (!constructors.length) { error(baseTypeNode.expression, Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments); return; @@ -2911,6 +2913,21 @@ namespace ts { } } + function baseTypeHasUnappliedOuterTypeParameters(type: Type): boolean { + let originalBaseType = type; + let originalTypeReference = type; + if (originalBaseType.outerTypeParameters) { + // an unapplied type type parameter is one + // whose argument symbol is still the same as the parameter symbol + for (let i = 0; i < originalBaseType.outerTypeParameters.length; i++) { + if (originalBaseType.outerTypeParameters[i].symbol === originalTypeReference.typeArguments[i].symbol) { + return true; + } + } + } + return false; + } + function resolveBaseTypesOfInterface(type: InterfaceType): void { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; for (let declaration of type.symbol.declarations) { From a6068e1c08553c843e34ca00ff76da550cfa4159 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 9 Nov 2015 10:21:54 -0800 Subject: [PATCH 150/353] More test cases and accept baselines --- .../genericClassExpressionInFunction.js | 104 +++++++++++++++++ .../genericClassExpressionInFunction.symbols | 92 +++++++++++++++ .../genericClassExpressionInFunction.types | 108 ++++++++++++++++++ .../genericClassExpressionInFunction.ts | 13 ++- 4 files changed, 313 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/genericClassExpressionInFunction.js create mode 100644 tests/baselines/reference/genericClassExpressionInFunction.symbols create mode 100644 tests/baselines/reference/genericClassExpressionInFunction.types diff --git a/tests/baselines/reference/genericClassExpressionInFunction.js b/tests/baselines/reference/genericClassExpressionInFunction.js new file mode 100644 index 0000000000000..bb45587eea144 --- /dev/null +++ b/tests/baselines/reference/genericClassExpressionInFunction.js @@ -0,0 +1,104 @@ +//// [genericClassExpressionInFunction.ts] +class A { + genericVar: T +} +function B1() { + // class expression can use T + return class extends A { } +} +class B2 { + anon = class extends A { } +} +function B3() { + return class Inner extends A { } +} +// extends can call B +class K extends B1() { + namae: string; +} +class C extends (new B2().anon) { + name: string; +} +let b3Number = B3(); +class S extends b3Number { + nom: string; +} +var c = new C(); +var k = new K(); +var s = new S(); +c.genericVar = 12; +k.genericVar = 12; +s.genericVar = 12; + + +//// [genericClassExpressionInFunction.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var A = (function () { + function A() { + } + return A; +})(); +function B1() { + // class expression can use T + return (function (_super) { + __extends(class_1, _super); + function class_1() { + _super.apply(this, arguments); + } + return class_1; + })(A); +} +var B2 = (function () { + function B2() { + this.anon = (function (_super) { + __extends(class_2, _super); + function class_2() { + _super.apply(this, arguments); + } + return class_2; + })(A); + } + return B2; +})(); +function B3() { + return (function (_super) { + __extends(Inner, _super); + function Inner() { + _super.apply(this, arguments); + } + return Inner; + })(A); +} +// extends can call B +var K = (function (_super) { + __extends(K, _super); + function K() { + _super.apply(this, arguments); + } + return K; +})(B1()); +var C = (function (_super) { + __extends(C, _super); + function C() { + _super.apply(this, arguments); + } + return C; +})((new B2().anon)); +var b3Number = B3(); +var S = (function (_super) { + __extends(S, _super); + function S() { + _super.apply(this, arguments); + } + return S; +})(b3Number); +var c = new C(); +var k = new K(); +var s = new S(); +c.genericVar = 12; +k.genericVar = 12; +s.genericVar = 12; diff --git a/tests/baselines/reference/genericClassExpressionInFunction.symbols b/tests/baselines/reference/genericClassExpressionInFunction.symbols new file mode 100644 index 0000000000000..b5a6b8c6c7043 --- /dev/null +++ b/tests/baselines/reference/genericClassExpressionInFunction.symbols @@ -0,0 +1,92 @@ +=== tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts === +class A { +>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0)) +>T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8)) + + genericVar: T +>genericVar : Symbol(genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) +>T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8)) +} +function B1() { +>B1 : Symbol(B1, Decl(genericClassExpressionInFunction.ts, 2, 1)) +>U : Symbol(U, Decl(genericClassExpressionInFunction.ts, 3, 12)) + + // class expression can use T + return class extends A { } +>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0)) +>U : Symbol(U, Decl(genericClassExpressionInFunction.ts, 3, 12)) +} +class B2 { +>B2 : Symbol(B2, Decl(genericClassExpressionInFunction.ts, 6, 1)) +>V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9)) + + anon = class extends A { } +>anon : Symbol(anon, Decl(genericClassExpressionInFunction.ts, 7, 13)) +>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0)) +>V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9)) +} +function B3() { +>B3 : Symbol(B3, Decl(genericClassExpressionInFunction.ts, 9, 1)) +>W : Symbol(W, Decl(genericClassExpressionInFunction.ts, 10, 12)) + + return class Inner extends A { } +>Inner : Symbol(Inner, Decl(genericClassExpressionInFunction.ts, 11, 10)) +>TInner : Symbol(TInner, Decl(genericClassExpressionInFunction.ts, 11, 23)) +>A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0)) +>W : Symbol(W, Decl(genericClassExpressionInFunction.ts, 10, 12)) +} +// extends can call B +class K extends B1() { +>K : Symbol(K, Decl(genericClassExpressionInFunction.ts, 12, 1)) +>B1 : Symbol(B1, Decl(genericClassExpressionInFunction.ts, 2, 1)) + + namae: string; +>namae : Symbol(namae, Decl(genericClassExpressionInFunction.ts, 14, 30)) +} +class C extends (new B2().anon) { +>C : Symbol(C, Decl(genericClassExpressionInFunction.ts, 16, 1)) +>new B2().anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13)) +>B2 : Symbol(B2, Decl(genericClassExpressionInFunction.ts, 6, 1)) +>anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13)) + + name: string; +>name : Symbol(name, Decl(genericClassExpressionInFunction.ts, 17, 41)) +} +let b3Number = B3(); +>b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3)) +>B3 : Symbol(B3, Decl(genericClassExpressionInFunction.ts, 9, 1)) + +class S extends b3Number { +>S : Symbol(S, Decl(genericClassExpressionInFunction.ts, 20, 28)) +>b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3)) + + nom: string; +>nom : Symbol(nom, Decl(genericClassExpressionInFunction.ts, 21, 34)) +} +var c = new C(); +>c : Symbol(c, Decl(genericClassExpressionInFunction.ts, 24, 3)) +>C : Symbol(C, Decl(genericClassExpressionInFunction.ts, 16, 1)) + +var k = new K(); +>k : Symbol(k, Decl(genericClassExpressionInFunction.ts, 25, 3)) +>K : Symbol(K, Decl(genericClassExpressionInFunction.ts, 12, 1)) + +var s = new S(); +>s : Symbol(s, Decl(genericClassExpressionInFunction.ts, 26, 3)) +>S : Symbol(S, Decl(genericClassExpressionInFunction.ts, 20, 28)) + +c.genericVar = 12; +>c.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) +>c : Symbol(c, Decl(genericClassExpressionInFunction.ts, 24, 3)) +>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) + +k.genericVar = 12; +>k.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) +>k : Symbol(k, Decl(genericClassExpressionInFunction.ts, 25, 3)) +>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) + +s.genericVar = 12; +>s.genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) +>s : Symbol(s, Decl(genericClassExpressionInFunction.ts, 26, 3)) +>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12)) + diff --git a/tests/baselines/reference/genericClassExpressionInFunction.types b/tests/baselines/reference/genericClassExpressionInFunction.types new file mode 100644 index 0000000000000..943391fdd59b8 --- /dev/null +++ b/tests/baselines/reference/genericClassExpressionInFunction.types @@ -0,0 +1,108 @@ +=== tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts === +class A { +>A : A +>T : T + + genericVar: T +>genericVar : T +>T : T +} +function B1() { +>B1 : () => typeof (Anonymous class) +>U : U + + // class expression can use T + return class extends A { } +>class extends A { } : typeof (Anonymous class) +>A : A +>U : U +} +class B2 { +>B2 : B2 +>V : V + + anon = class extends A { } +>anon : typeof (Anonymous class) +>class extends A { } : typeof (Anonymous class) +>A : A +>V : V +} +function B3() { +>B3 : () => typeof Inner +>W : W + + return class Inner extends A { } +>class Inner extends A { } : typeof Inner +>Inner : typeof Inner +>TInner : TInner +>A : A +>W : W +} +// extends can call B +class K extends B1() { +>K : K +>B1() : B1.(Anonymous class) +>B1 : () => typeof (Anonymous class) + + namae: string; +>namae : string +} +class C extends (new B2().anon) { +>C : C +>(new B2().anon) : B2.(Anonymous class) +>new B2().anon : typeof (Anonymous class) +>new B2() : B2 +>B2 : typeof B2 +>anon : typeof (Anonymous class) + + name: string; +>name : string +} +let b3Number = B3(); +>b3Number : typeof Inner +>B3() : typeof Inner +>B3 : () => typeof Inner + +class S extends b3Number { +>S : S +>b3Number : B3.Inner + + nom: string; +>nom : string +} +var c = new C(); +>c : C +>new C() : C +>C : typeof C + +var k = new K(); +>k : K +>new K() : K +>K : typeof K + +var s = new S(); +>s : S +>new S() : S +>S : typeof S + +c.genericVar = 12; +>c.genericVar = 12 : number +>c.genericVar : number +>c : C +>genericVar : number +>12 : number + +k.genericVar = 12; +>k.genericVar = 12 : number +>k.genericVar : number +>k : K +>genericVar : number +>12 : number + +s.genericVar = 12; +>s.genericVar = 12 : number +>s.genericVar : number +>s : S +>genericVar : number +>12 : number + diff --git a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts index 70f63e8a929a5..14885ca99056c 100644 --- a/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts +++ b/tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts @@ -1,8 +1,6 @@ class A { genericVar: T } -class B3 extends A { -} function B1() { // class expression can use T return class extends A { } @@ -10,6 +8,9 @@ function B1() { class B2 { anon = class extends A { } } +function B3() { + return class Inner extends A { } +} // extends can call B class K extends B1() { namae: string; @@ -17,9 +18,13 @@ class K extends B1() { class C extends (new B2().anon) { name: string; } +let b3Number = B3(); +class S extends b3Number { + nom: string; +} var c = new C(); var k = new K(); -var b3 = new B3(); +var s = new S(); c.genericVar = 12; k.genericVar = 12; -b3.genericVar = 12 +s.genericVar = 12; From 0cf4c6caba1f46e6094e1c59c0906f2b6ee9b5d1 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 9 Nov 2015 10:44:02 -0800 Subject: [PATCH 151/353] Fix linter error --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4f39ada7a53b8..1a5348018b80c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2875,7 +2875,7 @@ namespace ts { let baseTypeNode = getBaseTypeNodeOfClass(type); let baseType: Type; let originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; - if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class && + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class && !baseTypeHasUnappliedOuterTypeParameters(originalBaseType)) { // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the // class and all return the instance type of the class. There is no need for further checks and we can apply the From 569cf96d06f612e1464704e85b16eef3add37be2 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 9 Nov 2015 10:48:22 -0800 Subject: [PATCH 152/353] Fix new and improved linter errors --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ff30b67d9c62f..2494009333b5e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2876,7 +2876,7 @@ namespace ts { } const baseTypeNode = getBaseTypeNodeOfClass(type); let baseType: Type; - let originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + const originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class && !baseTypeHasUnappliedOuterTypeParameters(originalBaseType)) { // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the @@ -2916,8 +2916,8 @@ namespace ts { } function baseTypeHasUnappliedOuterTypeParameters(type: Type): boolean { - let originalBaseType = type; - let originalTypeReference = type; + const originalBaseType = type; + const originalTypeReference = type; if (originalBaseType.outerTypeParameters) { // an unapplied type type parameter is one // whose argument symbol is still the same as the parameter symbol From 38090c6ba50f11fbfe4700b3771f95f194de4783 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 12:48:58 -0800 Subject: [PATCH 153/353] Added tests for template strings with string literal types. --- .../stringLiteralTypesWithTemplateStrings01.ts | 7 +++++++ .../stringLiteralTypesWithTemplateStrings02.ts | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts new file mode 100644 index 0000000000000..1920551abd812 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts @@ -0,0 +1,7 @@ +// @declaration: true + +let ABC: "ABC" = `ABC`; +let DE_NEWLINE_F: "DE\nF" = `DE +F`; +let G_QUOTE_HI: 'G"HI'; +let JK_BACKTICK_L: "JK`L" = `JK\`L`; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts new file mode 100644 index 0000000000000..12debae4e2030 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts @@ -0,0 +1,5 @@ +// @declaration: true + +let abc: "AB\r\nC" = `AB +C`; +let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`; \ No newline at end of file From d294524861e9486c6f5d9c91a0557269206598e3 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 13:27:08 -0800 Subject: [PATCH 154/353] Accepted baselines. --- ...teralTypesWithTemplateStrings01.errors.txt | 18 +++++++++++++++++ ...stringLiteralTypesWithTemplateStrings01.js | 20 +++++++++++++++++++ ...teralTypesWithTemplateStrings02.errors.txt | 13 ++++++++++++ ...stringLiteralTypesWithTemplateStrings02.js | 14 +++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js create mode 100644 tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt new file mode 100644 index 0000000000000..3851a0b10efaa --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.errors.txt @@ -0,0 +1,18 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(2,5): error TS2322: Type 'string' is not assignable to type '"ABC"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(3,5): error TS2322: Type 'string' is not assignable to type '"DE\nF"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts(6,5): error TS2322: Type 'string' is not assignable to type '"JK`L"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings01.ts (3 errors) ==== + + let ABC: "ABC" = `ABC`; + ~~~ +!!! error TS2322: Type 'string' is not assignable to type '"ABC"'. + let DE_NEWLINE_F: "DE\nF" = `DE + ~~~~~~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"DE\nF"'. + F`; + let G_QUOTE_HI: 'G"HI'; + let JK_BACKTICK_L: "JK`L" = `JK\`L`; + ~~~~~~~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"JK`L"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js new file mode 100644 index 0000000000000..8f548afc7bf19 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings01.js @@ -0,0 +1,20 @@ +//// [stringLiteralTypesWithTemplateStrings01.ts] + +let ABC: "ABC" = `ABC`; +let DE_NEWLINE_F: "DE\nF" = `DE +F`; +let G_QUOTE_HI: 'G"HI'; +let JK_BACKTICK_L: "JK`L" = `JK\`L`; + +//// [stringLiteralTypesWithTemplateStrings01.js] +var ABC = "ABC"; +var DE_NEWLINE_F = "DE\nF"; +var G_QUOTE_HI; +var JK_BACKTICK_L = "JK`L"; + + +//// [stringLiteralTypesWithTemplateStrings01.d.ts] +declare let ABC: "ABC"; +declare let DE_NEWLINE_F: "DE\nF"; +declare let G_QUOTE_HI: 'G"HI'; +declare let JK_BACKTICK_L: "JK`L"; diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt new file mode 100644 index 0000000000000..803e4f5cb24e7 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts(2,5): error TS2322: Type 'string' is not assignable to type '"AB\r\nC"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts(4,5): error TS2322: Type 'string' is not assignable to type '"DE\nF"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithTemplateStrings02.ts (2 errors) ==== + + let abc: "AB\r\nC" = `AB + ~~~ +!!! error TS2322: Type 'string' is not assignable to type '"AB\r\nC"'. + C`; + let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`; + ~~~~~~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type '"DE\nF"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js new file mode 100644 index 0000000000000..f5d9045921a8e --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesWithTemplateStrings02.js @@ -0,0 +1,14 @@ +//// [stringLiteralTypesWithTemplateStrings02.ts] + +let abc: "AB\r\nC" = `AB +C`; +let de_NEWLINE_f: "DE\nF" = `DE${"\n"}F`; + +//// [stringLiteralTypesWithTemplateStrings02.js] +var abc = "AB\nC"; +var de_NEWLINE_f = "DE" + "\n" + "F"; + + +//// [stringLiteralTypesWithTemplateStrings02.d.ts] +declare let abc: "AB\r\nC"; +declare let de_NEWLINE_f: "DE\nF"; From ea4e21d96914783c66563850eda52e0aafb7fb9b Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 13:27:19 -0800 Subject: [PATCH 155/353] Fixed comments. --- src/compiler/checker.ts | 2 -- src/compiler/types.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e0e9a6e620f54..c3792c85dd647 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10401,8 +10401,6 @@ namespace ts { } function checkStringLiteralExpression(node: StringLiteral): Type { - // TODO (drosen): Do we want to apply the same approach to no-sub template literals? - const contextualType = getContextualType(node); if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { return getStringLiteralType(node); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f536a1e469307..d3cf86fed12c7 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -701,7 +701,7 @@ namespace ts { } // Note that a StringLiteral AST node is both an Expression and a TypeNode. The latter is - // because string literals can appear in the type annotation of a parameter node. + // because string literals can appear in type annotations as well. export interface StringLiteral extends LiteralExpression, TypeNode { _stringLiteralBrand: any; } From 6f08e89455073b07f36f764ceaa21a9010d74f94 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 9 Nov 2015 13:34:30 -0800 Subject: [PATCH 156/353] use modulekind to check if initializer for shorthand property assignment should be emitted --- src/compiler/emitter.ts | 2 +- ...ndPropertyAssignmentInES6Module.errors.txt | 23 +++++++++++++++++++ .../shorthandPropertyAssignmentInES6Module.js | 23 +++++++++++++++++++ .../shorthandPropertyAssignmentInES6Module.ts | 14 +++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt create mode 100644 tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js create mode 100644 tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index cb4cd3b380350..0d57bd1a6a7ba 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2461,7 +2461,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // let obj = { y }; // } // Here we need to emit obj = { y : m.y } regardless of the output target. - if (languageVersion < ScriptTarget.ES6 || isNamespaceExportReference(node.name)) { + if (modulekind !== ModuleKind.ES6 || isNamespaceExportReference(node.name)) { // Emit identifier as an identifier write(": "); emit(node.name); diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt new file mode 100644 index 0000000000000..6befffeee7407 --- /dev/null +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo2'. +tests/cases/compiler/test.ts(6,1): error TS2304: Cannot find name 'console'. +tests/cases/compiler/test.ts(7,1): error TS2304: Cannot find name 'console'. + + +==== tests/cases/compiler/foo1.ts (0 errors) ==== + + export var x = 1; + +==== tests/cases/compiler/test.ts (3 errors) ==== + import {x} from './foo1'; + import {foo} from './foo2'; + ~~~~~~~~ +!!! error TS2307: Cannot find module './foo2'. + + const test = { x, foo }; + + console.log(x); + ~~~~~~~ +!!! error TS2304: Cannot find name 'console'. + console.log(foo); + ~~~~~~~ +!!! error TS2304: Cannot find name 'console'. \ No newline at end of file diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js new file mode 100644 index 0000000000000..2865f244fc8aa --- /dev/null +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts] //// + +//// [foo1.ts] + +export var x = 1; + +//// [test.ts] +import {x} from './foo1'; +import {foo} from './foo2'; + +const test = { x, foo }; + +console.log(x); +console.log(foo); + +//// [foo1.js] +exports.x = 1; +//// [test.js] +var foo1_1 = require('./foo1'); +var foo2_1 = require('./foo2'); +const test = { x: foo1_1.x, foo: foo2_1.foo }; +console.log(foo1_1.x); +console.log(foo2_1.foo); diff --git a/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts new file mode 100644 index 0000000000000..50e2d2cf99ca2 --- /dev/null +++ b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts @@ -0,0 +1,14 @@ +// @target: ES6 +// @module: commonjs + +// @filename: foo1.ts +export var x = 1; + +// @filename: test.ts +import {x} from './foo1'; +import {foo} from './foo2'; + +const test = { x, foo }; + +console.log(x); +console.log(foo); \ No newline at end of file From fe770bdd7591574ce092c7fb753a3c1ef74f5362 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 9 Nov 2015 13:56:18 -0800 Subject: [PATCH 157/353] addressed PR feedback --- ...ndPropertyAssignmentInES6Module.errors.txt | 26 ++++++++----------- .../shorthandPropertyAssignmentInES6Module.js | 24 +++++++++-------- .../shorthandPropertyAssignmentInES6Module.ts | 12 +++++---- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt index 6befffeee7407..35fc45421c4ee 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.errors.txt @@ -1,23 +1,19 @@ -tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo2'. -tests/cases/compiler/test.ts(6,1): error TS2304: Cannot find name 'console'. -tests/cases/compiler/test.ts(7,1): error TS2304: Cannot find name 'console'. +tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './missingModule'. -==== tests/cases/compiler/foo1.ts (0 errors) ==== +==== tests/cases/compiler/existingModule.ts (0 errors) ==== export var x = 1; -==== tests/cases/compiler/test.ts (3 errors) ==== - import {x} from './foo1'; - import {foo} from './foo2'; - ~~~~~~~~ -!!! error TS2307: Cannot find module './foo2'. +==== tests/cases/compiler/test.ts (1 errors) ==== + import {x} from './existingModule'; + import {foo} from './missingModule'; + ~~~~~~~~~~~~~~~~~ +!!! error TS2307: Cannot find module './missingModule'. + + declare function use(a: any): void; const test = { x, foo }; - console.log(x); - ~~~~~~~ -!!! error TS2304: Cannot find name 'console'. - console.log(foo); - ~~~~~~~ -!!! error TS2304: Cannot find name 'console'. \ No newline at end of file + use(x); + use(foo); \ No newline at end of file diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index 2865f244fc8aa..1cb7fc677cdcd 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -1,23 +1,25 @@ //// [tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts] //// -//// [foo1.ts] +//// [existingModule.ts] export var x = 1; //// [test.ts] -import {x} from './foo1'; -import {foo} from './foo2'; +import {x} from './existingModule'; +import {foo} from './missingModule'; + +declare function use(a: any): void; const test = { x, foo }; -console.log(x); -console.log(foo); +use(x); +use(foo); -//// [foo1.js] +//// [existingModule.js] exports.x = 1; //// [test.js] -var foo1_1 = require('./foo1'); -var foo2_1 = require('./foo2'); -const test = { x: foo1_1.x, foo: foo2_1.foo }; -console.log(foo1_1.x); -console.log(foo2_1.foo); +var existingModule_1 = require('./existingModule'); +var missingModule_1 = require('./missingModule'); +const test = { x: existingModule_1.x, foo: missingModule_1.foo }; +use(existingModule_1.x); +use(missingModule_1.foo); diff --git a/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts index 50e2d2cf99ca2..8b08fd64e3e56 100644 --- a/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts +++ b/tests/cases/compiler/shorthandPropertyAssignmentInES6Module.ts @@ -1,14 +1,16 @@ // @target: ES6 // @module: commonjs -// @filename: foo1.ts +// @filename: existingModule.ts export var x = 1; // @filename: test.ts -import {x} from './foo1'; -import {foo} from './foo2'; +import {x} from './existingModule'; +import {foo} from './missingModule'; + +declare function use(a: any): void; const test = { x, foo }; -console.log(x); -console.log(foo); \ No newline at end of file +use(x); +use(foo); \ No newline at end of file From 8a959ead4cab5a943d25d5240d8489e695ddf67e Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 14:34:07 -0800 Subject: [PATCH 158/353] Removed no-default-lib comment from test case. --- tests/cases/compiler/typeCheckTypeArgument.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cases/compiler/typeCheckTypeArgument.ts b/tests/cases/compiler/typeCheckTypeArgument.ts index ea125f62c07ce..1647f40dafb2e 100644 --- a/tests/cases/compiler/typeCheckTypeArgument.ts +++ b/tests/cases/compiler/typeCheckTypeArgument.ts @@ -1,4 +1,3 @@ -/// var f: () => void; From a32f44f9f4c630c8e644e40bf6c9826b18a420e1 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 9 Nov 2015 14:24:19 -0800 Subject: [PATCH 159/353] Add command line flag to allow synthetic default exports --- src/compiler/checker.ts | 6 ++- src/compiler/commandLineParser.ts | 5 +++ src/compiler/diagnosticMessages.json | 4 ++ src/compiler/types.ts | 1 + .../allowSyntheticDefaultImports1.js | 22 ++++++++++ .../allowSyntheticDefaultImports1.symbols | 18 ++++++++ .../allowSyntheticDefaultImports1.types | 19 +++++++++ .../allowSyntheticDefaultImports2.js | 40 ++++++++++++++++++ .../allowSyntheticDefaultImports2.symbols | 17 ++++++++ .../allowSyntheticDefaultImports2.types | 18 ++++++++ .../allowSyntheticDefaultImports3.errors.txt | 14 +++++++ .../allowSyntheticDefaultImports3.js | 41 +++++++++++++++++++ .../allowSyntheticDefaultImports4.js | 16 ++++++++ .../allowSyntheticDefaultImports4.symbols | 18 ++++++++ .../allowSyntheticDefaultImports4.types | 19 +++++++++ .../allowSyntheticDefaultImports5.js | 27 ++++++++++++ .../allowSyntheticDefaultImports5.symbols | 18 ++++++++ .../allowSyntheticDefaultImports5.types | 19 +++++++++ .../allowSyntheticDefaultImports6.errors.txt | 15 +++++++ .../allowSyntheticDefaultImports6.js | 27 ++++++++++++ .../compiler/allowSyntheticDefaultImports1.ts | 10 +++++ .../compiler/allowSyntheticDefaultImports2.ts | 9 ++++ .../compiler/allowSyntheticDefaultImports3.ts | 10 +++++ .../compiler/allowSyntheticDefaultImports4.ts | 11 +++++ .../compiler/allowSyntheticDefaultImports5.ts | 10 +++++ .../compiler/allowSyntheticDefaultImports6.ts | 11 +++++ 26 files changed, 424 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports1.js create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports1.symbols create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports1.types create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports2.js create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports2.symbols create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports2.types create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports3.js create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports4.js create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports4.symbols create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports4.types create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports5.js create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports5.symbols create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports5.types create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports6.js create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports1.ts create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports2.ts create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports3.ts create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports4.ts create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports5.ts create mode 100644 tests/cases/compiler/allowSyntheticDefaultImports6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 706ed1c65a3c9..9dbce88c32b1b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -46,6 +46,7 @@ namespace ts { const compilerOptions = host.getCompilerOptions(); const languageVersion = compilerOptions.target || ScriptTarget.ES3; const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; + const allowSyntheticDefaultImports = compilerOptions.hasOwnProperty("allowSyntheticDefaultImports") ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; const emitResolver = createResolver(); @@ -730,9 +731,12 @@ namespace ts { const moduleSymbol = resolveExternalModuleName(node, (node.parent).moduleSpecifier); if (moduleSymbol) { const exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]); - if (!exportDefaultSymbol) { + if (!exportDefaultSymbol && !allowSyntheticDefaultImports) { error(node.name, Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol)); } + else if (!exportDefaultSymbol && allowSyntheticDefaultImports) { + return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol); + } return exportDefaultSymbol; } } diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 3fca97c045021..272f5430b8cbc 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -279,6 +279,11 @@ namespace ts { name: "forceConsistentCasingInFileNames", type: "boolean", description: Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file + }, + { + name: "allowSyntheticDefaultImports", + type: "boolean", + description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export } ]; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index e6008ce3c1ebb..cdd20b38a6991 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2101,6 +2101,10 @@ "category": "Message", "code": 6010 }, + "Allow default imports from modules with no default export": { + "category": "Message", + "code": 6011 + }, "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)": { "category": "Message", "code": 6015 diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 679957d1d3878..b846dc88aab7d 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2109,6 +2109,7 @@ namespace ts { noImplicitReturns?: boolean; noFallthroughCasesInSwitch?: boolean; forceConsistentCasingInFileNames?: boolean; + allowSyntheticDefaultImports?: boolean; /* @internal */ stripInternal?: boolean; // Skip checking lib.d.ts to help speed up tests. diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js new file mode 100644 index 0000000000000..bc78725cb1c5b --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -0,0 +1,22 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports1.ts] //// + +//// [a.ts] +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +//// [b.ts] +export class Foo { + member: string; +} + + +//// [b.js] +var Foo = (function () { + function Foo() { + } + return Foo; +})(); +exports.Foo = Foo; +//// [a.js] +var b_1 = require("./b"); +exports.x = new b_1["default"].Foo(); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.symbols b/tests/baselines/reference/allowSyntheticDefaultImports1.symbols new file mode 100644 index 0000000000000..d88a79e1bf27e --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.symbols @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.ts === +import Namespace from "./b"; +>Namespace : Symbol(Namespace, Decl(a.ts, 0, 6)) + +export var x = new Namespace.Foo(); +>x : Symbol(x, Decl(a.ts, 1, 10)) +>Namespace.Foo : Symbol(Namespace.Foo, Decl(b.ts, 0, 0)) +>Namespace : Symbol(Namespace, Decl(a.ts, 0, 6)) +>Foo : Symbol(Namespace.Foo, Decl(b.ts, 0, 0)) + +=== tests/cases/compiler/b.ts === +export class Foo { +>Foo : Symbol(Foo, Decl(b.ts, 0, 0)) + + member: string; +>member : Symbol(member, Decl(b.ts, 0, 18)) +} + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.types b/tests/baselines/reference/allowSyntheticDefaultImports1.types new file mode 100644 index 0000000000000..c2265d7611b38 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/a.ts === +import Namespace from "./b"; +>Namespace : typeof Namespace + +export var x = new Namespace.Foo(); +>x : Namespace.Foo +>new Namespace.Foo() : Namespace.Foo +>Namespace.Foo : typeof Namespace.Foo +>Namespace : typeof Namespace +>Foo : typeof Namespace.Foo + +=== tests/cases/compiler/b.ts === +export class Foo { +>Foo : Foo + + member: string; +>member : string +} + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js new file mode 100644 index 0000000000000..3c1981bee9bd0 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports2.ts] //// + +//// [a.ts] +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +//// [b.ts] +export class Foo { + member: string; +} + +//// [b.js] +System.register([], function(exports_1) { + var Foo; + return { + setters:[], + execute: function() { + Foo = (function () { + function Foo() { + } + return Foo; + })(); + exports_1("Foo", Foo); + } + } +}); +//// [a.js] +System.register(["./b"], function(exports_1) { + var b_1; + var x; + return { + setters:[ + function (b_1_1) { + b_1 = b_1_1; + }], + execute: function() { + exports_1("x", x = new b_1["default"].Foo()); + } + } +}); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.symbols b/tests/baselines/reference/allowSyntheticDefaultImports2.symbols new file mode 100644 index 0000000000000..cea6145fbd607 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.symbols @@ -0,0 +1,17 @@ +=== tests/cases/compiler/a.ts === +import Namespace from "./b"; +>Namespace : Symbol(Namespace, Decl(a.ts, 0, 6)) + +export var x = new Namespace.Foo(); +>x : Symbol(x, Decl(a.ts, 1, 10)) +>Namespace.Foo : Symbol(Namespace.Foo, Decl(b.ts, 0, 0)) +>Namespace : Symbol(Namespace, Decl(a.ts, 0, 6)) +>Foo : Symbol(Namespace.Foo, Decl(b.ts, 0, 0)) + +=== tests/cases/compiler/b.ts === +export class Foo { +>Foo : Symbol(Foo, Decl(b.ts, 0, 0)) + + member: string; +>member : Symbol(member, Decl(b.ts, 0, 18)) +} diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.types b/tests/baselines/reference/allowSyntheticDefaultImports2.types new file mode 100644 index 0000000000000..c40fbc7e98859 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.ts === +import Namespace from "./b"; +>Namespace : typeof Namespace + +export var x = new Namespace.Foo(); +>x : Namespace.Foo +>new Namespace.Foo() : Namespace.Foo +>Namespace.Foo : typeof Namespace.Foo +>Namespace : typeof Namespace +>Foo : typeof Namespace.Foo + +=== tests/cases/compiler/b.ts === +export class Foo { +>Foo : Foo + + member: string; +>member : string +} diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt new file mode 100644 index 0000000000000..551355e5cce06 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt @@ -0,0 +1,14 @@ +tests/cases/compiler/a.ts(1,8): error TS1192: Module '"tests/cases/compiler/b"' has no default export. + + +==== tests/cases/compiler/a.ts (1 errors) ==== + import Namespace from "./b"; + ~~~~~~~~~ +!!! error TS1192: Module '"tests/cases/compiler/b"' has no default export. + export var x = new Namespace.Foo(); + +==== tests/cases/compiler/b.ts (0 errors) ==== + export class Foo { + member: string; + } + \ No newline at end of file diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js new file mode 100644 index 0000000000000..2345ad65d107a --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports3.ts] //// + +//// [a.ts] +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +//// [b.ts] +export class Foo { + member: string; +} + + +//// [b.js] +System.register([], function(exports_1) { + var Foo; + return { + setters:[], + execute: function() { + Foo = (function () { + function Foo() { + } + return Foo; + })(); + exports_1("Foo", Foo); + } + } +}); +//// [a.js] +System.register(["./b"], function(exports_1) { + var b_1; + var x; + return { + setters:[ + function (b_1_1) { + b_1 = b_1_1; + }], + execute: function() { + exports_1("x", x = new b_1["default"].Foo()); + } + } +}); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js new file mode 100644 index 0000000000000..583d4f0bc9235 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js @@ -0,0 +1,16 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports4.ts] //// + +//// [b.d.ts] +declare class Foo { + member: string; +} +export = Foo; + +//// [a.ts] +import Foo from "./b"; +export var x = new Foo(); + + +//// [a.js] +var b_1 = require("./b"); +exports.x = new b_1["default"](); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.symbols b/tests/baselines/reference/allowSyntheticDefaultImports4.symbols new file mode 100644 index 0000000000000..8edad006c2dd5 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.symbols @@ -0,0 +1,18 @@ +=== tests/cases/compiler/b.d.ts === +declare class Foo { +>Foo : Symbol(Foo, Decl(b.d.ts, 0, 0)) + + member: string; +>member : Symbol(member, Decl(b.d.ts, 0, 19)) +} +export = Foo; +>Foo : Symbol(Foo, Decl(b.d.ts, 0, 0)) + +=== tests/cases/compiler/a.ts === +import Foo from "./b"; +>Foo : Symbol(Foo, Decl(a.ts, 0, 6)) + +export var x = new Foo(); +>x : Symbol(x, Decl(a.ts, 1, 10)) +>Foo : Symbol(Foo, Decl(a.ts, 0, 6)) + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.types b/tests/baselines/reference/allowSyntheticDefaultImports4.types new file mode 100644 index 0000000000000..5922abeb43f77 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/b.d.ts === +declare class Foo { +>Foo : Foo + + member: string; +>member : string +} +export = Foo; +>Foo : Foo + +=== tests/cases/compiler/a.ts === +import Foo from "./b"; +>Foo : typeof Foo + +export var x = new Foo(); +>x : Foo +>new Foo() : Foo +>Foo : typeof Foo + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.js b/tests/baselines/reference/allowSyntheticDefaultImports5.js new file mode 100644 index 0000000000000..e1528e2791521 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports5.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports5.ts] //// + +//// [b.d.ts] +declare class Foo { + member: string; +} +export = Foo; + +//// [a.ts] +import Foo from "./b"; +export var x = new Foo(); + + +//// [a.js] +System.register(["./b"], function(exports_1) { + var b_1; + var x; + return { + setters:[ + function (b_1_1) { + b_1 = b_1_1; + }], + execute: function() { + exports_1("x", x = new b_1["default"]()); + } + } +}); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.symbols b/tests/baselines/reference/allowSyntheticDefaultImports5.symbols new file mode 100644 index 0000000000000..8edad006c2dd5 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports5.symbols @@ -0,0 +1,18 @@ +=== tests/cases/compiler/b.d.ts === +declare class Foo { +>Foo : Symbol(Foo, Decl(b.d.ts, 0, 0)) + + member: string; +>member : Symbol(member, Decl(b.d.ts, 0, 19)) +} +export = Foo; +>Foo : Symbol(Foo, Decl(b.d.ts, 0, 0)) + +=== tests/cases/compiler/a.ts === +import Foo from "./b"; +>Foo : Symbol(Foo, Decl(a.ts, 0, 6)) + +export var x = new Foo(); +>x : Symbol(x, Decl(a.ts, 1, 10)) +>Foo : Symbol(Foo, Decl(a.ts, 0, 6)) + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.types b/tests/baselines/reference/allowSyntheticDefaultImports5.types new file mode 100644 index 0000000000000..5922abeb43f77 --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports5.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/b.d.ts === +declare class Foo { +>Foo : Foo + + member: string; +>member : string +} +export = Foo; +>Foo : Foo + +=== tests/cases/compiler/a.ts === +import Foo from "./b"; +>Foo : typeof Foo + +export var x = new Foo(); +>x : Foo +>new Foo() : Foo +>Foo : typeof Foo + diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt new file mode 100644 index 0000000000000..80b9cf8d074ab --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt @@ -0,0 +1,15 @@ +tests/cases/compiler/a.ts(1,8): error TS1192: Module '"tests/cases/compiler/b"' has no default export. + + +==== tests/cases/compiler/b.d.ts (0 errors) ==== + declare class Foo { + member: string; + } + export = Foo; + +==== tests/cases/compiler/a.ts (1 errors) ==== + import Foo from "./b"; + ~~~ +!!! error TS1192: Module '"tests/cases/compiler/b"' has no default export. + export var x = new Foo(); + \ No newline at end of file diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.js b/tests/baselines/reference/allowSyntheticDefaultImports6.js new file mode 100644 index 0000000000000..0e27ce127d82e --- /dev/null +++ b/tests/baselines/reference/allowSyntheticDefaultImports6.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/allowSyntheticDefaultImports6.ts] //// + +//// [b.d.ts] +declare class Foo { + member: string; +} +export = Foo; + +//// [a.ts] +import Foo from "./b"; +export var x = new Foo(); + + +//// [a.js] +System.register(["./b"], function(exports_1) { + var b_1; + var x; + return { + setters:[ + function (b_1_1) { + b_1 = b_1_1; + }], + execute: function() { + exports_1("x", x = new b_1["default"]()); + } + } +}); diff --git a/tests/cases/compiler/allowSyntheticDefaultImports1.ts b/tests/cases/compiler/allowSyntheticDefaultImports1.ts new file mode 100644 index 0000000000000..4793da791361c --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports1.ts @@ -0,0 +1,10 @@ +// @allowSyntheticDefaultImports: true +// @module: commonjs +// @Filename: a.ts +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +// @Filename: b.ts +export class Foo { + member: string; +} diff --git a/tests/cases/compiler/allowSyntheticDefaultImports2.ts b/tests/cases/compiler/allowSyntheticDefaultImports2.ts new file mode 100644 index 0000000000000..8fa004be38720 --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports2.ts @@ -0,0 +1,9 @@ +// @module: system +// @Filename: a.ts +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +// @Filename: b.ts +export class Foo { + member: string; +} \ No newline at end of file diff --git a/tests/cases/compiler/allowSyntheticDefaultImports3.ts b/tests/cases/compiler/allowSyntheticDefaultImports3.ts new file mode 100644 index 0000000000000..65d11c892c97c --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports3.ts @@ -0,0 +1,10 @@ +// @allowSyntheticDefaultImports: false +// @module: system +// @Filename: a.ts +import Namespace from "./b"; +export var x = new Namespace.Foo(); + +// @Filename: b.ts +export class Foo { + member: string; +} diff --git a/tests/cases/compiler/allowSyntheticDefaultImports4.ts b/tests/cases/compiler/allowSyntheticDefaultImports4.ts new file mode 100644 index 0000000000000..1d26c6277c1c6 --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports4.ts @@ -0,0 +1,11 @@ +// @allowSyntheticDefaultImports: true +// @module: commonjs +// @Filename: b.d.ts +declare class Foo { + member: string; +} +export = Foo; + +// @Filename: a.ts +import Foo from "./b"; +export var x = new Foo(); diff --git a/tests/cases/compiler/allowSyntheticDefaultImports5.ts b/tests/cases/compiler/allowSyntheticDefaultImports5.ts new file mode 100644 index 0000000000000..30ebba67144a8 --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports5.ts @@ -0,0 +1,10 @@ +// @module: system +// @Filename: b.d.ts +declare class Foo { + member: string; +} +export = Foo; + +// @Filename: a.ts +import Foo from "./b"; +export var x = new Foo(); diff --git a/tests/cases/compiler/allowSyntheticDefaultImports6.ts b/tests/cases/compiler/allowSyntheticDefaultImports6.ts new file mode 100644 index 0000000000000..ff0300e30b472 --- /dev/null +++ b/tests/cases/compiler/allowSyntheticDefaultImports6.ts @@ -0,0 +1,11 @@ +// @allowSyntheticDefaultImports: false +// @module: system +// @Filename: b.d.ts +declare class Foo { + member: string; +} +export = Foo; + +// @Filename: a.ts +import Foo from "./b"; +export var x = new Foo(); From cece4411ca7169a1cbdbe63cb6ed747f69c03b2c Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 14:40:57 -0800 Subject: [PATCH 160/353] Get rid of the concept of 'isDefaultLib'. --- src/compiler/checker.ts | 6 +----- src/compiler/program.ts | 1 - src/compiler/types.ts | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9b0c5d3468c04..c302d71025c78 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14059,13 +14059,9 @@ namespace ts { // Check whether the file has declared it is the default lib, // and whether the user has specifically chosen to avoid checking it. if (compilerOptions.skipDefaultLibCheck) { - if (node.isDefaultLib) { - return; - } - // If the user specified '--noLib' and a file has a '/// ', // then we should treat that file as a default lib. - if (compilerOptions.noLib && node.hasNoDefaultLib) { + if (node.hasNoDefaultLib) { return; } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 4822a86b5273b..a4fce102c6799 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -835,7 +835,6 @@ namespace ts { processImportedModules(file, basePath); if (isDefaultLib) { - file.isDefaultLib = true; files.unshift(file); } else { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f536a1e469307..d10010bc818e3 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1285,7 +1285,6 @@ namespace ts { // The first node that causes this file to be an external module /* @internal */ externalModuleIndicator: Node; - /* @internal */ isDefaultLib: boolean; /* @internal */ identifiers: Map; /* @internal */ nodeCount: number; /* @internal */ identifierCount: number; From fb192e2464681a73e1b2a33e07dd11622681fe94 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 9 Nov 2015 14:41:44 -0800 Subject: [PATCH 161/353] Accepted baselines. --- .../typeCheckTypeArgument.errors.txt | 29 ++++--------------- .../reference/typeCheckTypeArgument.js | 2 -- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/tests/baselines/reference/typeCheckTypeArgument.errors.txt b/tests/baselines/reference/typeCheckTypeArgument.errors.txt index bf3e8bfdb9b2a..1452a2d4deba0 100644 --- a/tests/baselines/reference/typeCheckTypeArgument.errors.txt +++ b/tests/baselines/reference/typeCheckTypeArgument.errors.txt @@ -1,29 +1,12 @@ -error TS2318: Cannot find global type 'Array'. -error TS2318: Cannot find global type 'Boolean'. -error TS2318: Cannot find global type 'Function'. -error TS2318: Cannot find global type 'IArguments'. -error TS2318: Cannot find global type 'Number'. -error TS2318: Cannot find global type 'Object'. -error TS2318: Cannot find global type 'RegExp'. -error TS2318: Cannot find global type 'String'. -tests/cases/compiler/typeCheckTypeArgument.ts(3,19): error TS2304: Cannot find name 'UNKNOWN'. -tests/cases/compiler/typeCheckTypeArgument.ts(5,26): error TS2304: Cannot find name 'UNKNOWN'. -tests/cases/compiler/typeCheckTypeArgument.ts(7,21): error TS2304: Cannot find name 'UNKNOWN'. -tests/cases/compiler/typeCheckTypeArgument.ts(9,24): error TS2304: Cannot find name 'UNKNOWN'. -tests/cases/compiler/typeCheckTypeArgument.ts(12,22): error TS2304: Cannot find name 'UNKNOWN'. -tests/cases/compiler/typeCheckTypeArgument.ts(15,13): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(2,19): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(4,26): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(6,21): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(8,24): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(11,22): error TS2304: Cannot find name 'UNKNOWN'. +tests/cases/compiler/typeCheckTypeArgument.ts(14,13): error TS2304: Cannot find name 'UNKNOWN'. -!!! error TS2318: Cannot find global type 'Array'. -!!! error TS2318: Cannot find global type 'Boolean'. -!!! error TS2318: Cannot find global type 'Function'. -!!! error TS2318: Cannot find global type 'IArguments'. -!!! error TS2318: Cannot find global type 'Number'. -!!! error TS2318: Cannot find global type 'Object'. -!!! error TS2318: Cannot find global type 'RegExp'. -!!! error TS2318: Cannot find global type 'String'. ==== tests/cases/compiler/typeCheckTypeArgument.ts (6 errors) ==== - /// var f: () => void; ~~~~~~~ diff --git a/tests/baselines/reference/typeCheckTypeArgument.js b/tests/baselines/reference/typeCheckTypeArgument.js index bec33393f9260..633eb75ed913b 100644 --- a/tests/baselines/reference/typeCheckTypeArgument.js +++ b/tests/baselines/reference/typeCheckTypeArgument.js @@ -1,5 +1,4 @@ //// [typeCheckTypeArgument.ts] -/// var f: () => void; @@ -16,7 +15,6 @@ class Foo2 { ((a) => { }); //// [typeCheckTypeArgument.js] -/// var f; var Foo = (function () { function Foo() { From eba94b4e8540bcf2c21c37ec68804bec8b226551 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 9 Nov 2015 14:53:21 -0800 Subject: [PATCH 162/353] Address comments --- src/compiler/checker.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2494009333b5e..adf23cc2ae756 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2916,13 +2916,14 @@ namespace ts { } function baseTypeHasUnappliedOuterTypeParameters(type: Type): boolean { - const originalBaseType = type; - const originalTypeReference = type; - if (originalBaseType.outerTypeParameters) { - // an unapplied type type parameter is one + const outerTypeParameters = (type).outerTypeParameters; + const typeArguments = (type).typeArguments; + if (outerTypeParameters) { + // an unapplied type parameter is one // whose argument symbol is still the same as the parameter symbol - for (let i = 0; i < originalBaseType.outerTypeParameters.length; i++) { - if (originalBaseType.outerTypeParameters[i].symbol === originalTypeReference.typeArguments[i].symbol) { + const numParameters = outerTypeParameters.length; + for (let i = 0; i < numParameters; i++) { + if (outerTypeParameters[i].symbol === typeArguments[i].symbol) { return true; } } From 9024032571316f17ccdc80a3392b9d173621babe Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 9 Nov 2015 15:13:55 -0800 Subject: [PATCH 163/353] use typeof --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9dbce88c32b1b..102b6b0c67015 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -46,7 +46,7 @@ namespace ts { const compilerOptions = host.getCompilerOptions(); const languageVersion = compilerOptions.target || ScriptTarget.ES3; const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; - const allowSyntheticDefaultImports = compilerOptions.hasOwnProperty("allowSyntheticDefaultImports") ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; + const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; const emitResolver = createResolver(); From eaeeb1f7624f9be5287544659debdbda40df8824 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 9 Nov 2015 15:19:41 -0800 Subject: [PATCH 164/353] Fix TC --- tests/cases/fourslash/javaScriptPrototype4.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts index 78eab19733a49..f78bf52438bdf 100644 --- a/tests/cases/fourslash/javaScriptPrototype4.ts +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -23,14 +23,9 @@ verify.completionListContains('qua', undefined, undefined, 'warning'); // Check members of function.prototype edit.insert('prototype.'); -debugger; debug.printMemberListMembers(); verify.completionListContains('foo', undefined, undefined, 'method'); verify.completionListContains('bar', undefined, undefined, 'method'); verify.completionListContains('qua', undefined, undefined, 'warning'); verify.completionListContains('prototype', undefined, undefined, 'warning'); -// debug.printErrorList(); -// debug.printCurrentQuickInfo(); -// edit.insert('.'); -// verify.completionListContains('toFixed', undefined, undefined, 'method'); From c72861ebd77722230c830ee9b31c929001025967 Mon Sep 17 00:00:00 2001 From: Jeffrey Morlan Date: Mon, 9 Nov 2015 21:05:05 -0800 Subject: [PATCH 165/353] Add test case --- .../overloadConsecutiveness.errors.txt | 63 +++++++++++++++++++ .../reference/overloadConsecutiveness.js | 27 ++++++++ .../cases/compiler/overloadConsecutiveness.ts | 11 ++++ 3 files changed, 101 insertions(+) create mode 100644 tests/baselines/reference/overloadConsecutiveness.errors.txt create mode 100644 tests/baselines/reference/overloadConsecutiveness.js create mode 100644 tests/cases/compiler/overloadConsecutiveness.ts diff --git a/tests/baselines/reference/overloadConsecutiveness.errors.txt b/tests/baselines/reference/overloadConsecutiveness.errors.txt new file mode 100644 index 0000000000000..59634681c4371 --- /dev/null +++ b/tests/baselines/reference/overloadConsecutiveness.errors.txt @@ -0,0 +1,63 @@ +tests/cases/compiler/overloadConsecutiveness.ts(3,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(3,14): error TS1144: '{' or ';' expected. +tests/cases/compiler/overloadConsecutiveness.ts(3,25): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(4,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(4,14): error TS1144: '{' or ';' expected. +tests/cases/compiler/overloadConsecutiveness.ts(5,10): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(5,17): error TS1128: Declaration or statement expected. +tests/cases/compiler/overloadConsecutiveness.ts(5,28): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(8,2): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(8,6): error TS1144: '{' or ';' expected. +tests/cases/compiler/overloadConsecutiveness.ts(8,8): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(9,2): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(9,6): error TS1144: '{' or ';' expected. +tests/cases/compiler/overloadConsecutiveness.ts(10,2): error TS2391: Function implementation is missing or not immediately following the declaration. +tests/cases/compiler/overloadConsecutiveness.ts(10,9): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. +tests/cases/compiler/overloadConsecutiveness.ts(10,11): error TS2391: Function implementation is missing or not immediately following the declaration. + + +==== tests/cases/compiler/overloadConsecutiveness.ts (16 errors) ==== + // Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional. + + function f1(), function f1(); + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1144: '{' or ';' expected. + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + function f2(), function f2() {} + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1144: '{' or ';' expected. + function f3() {}, function f3(); + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1128: Declaration or statement expected. + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + + class C { + m1(), m1(); + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1144: '{' or ';' expected. + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + m2(), m2() {} + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1144: '{' or ';' expected. + m3() {}, m3(); + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + ~ +!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. + ~~ +!!! error TS2391: Function implementation is missing or not immediately following the declaration. + } + \ No newline at end of file diff --git a/tests/baselines/reference/overloadConsecutiveness.js b/tests/baselines/reference/overloadConsecutiveness.js new file mode 100644 index 0000000000000..8c0d3d26b7286 --- /dev/null +++ b/tests/baselines/reference/overloadConsecutiveness.js @@ -0,0 +1,27 @@ +//// [overloadConsecutiveness.ts] +// Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional. + +function f1(), function f1(); +function f2(), function f2() {} +function f3() {}, function f3(); + +class C { + m1(), m1(); + m2(), m2() {} + m3() {}, m3(); +} + + +//// [overloadConsecutiveness.js] +// Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional. +function f2() { } +function f3() { } +var C = (function () { + function C() { + } + C.prototype.m1 = ; + C.prototype.m2 = ; + C.prototype.m2 = function () { }; + C.prototype.m3 = function () { }; + return C; +})(); diff --git a/tests/cases/compiler/overloadConsecutiveness.ts b/tests/cases/compiler/overloadConsecutiveness.ts new file mode 100644 index 0000000000000..ced6d88b80cf9 --- /dev/null +++ b/tests/cases/compiler/overloadConsecutiveness.ts @@ -0,0 +1,11 @@ +// Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional. + +function f1(), function f1(); +function f2(), function f2() {} +function f3() {}, function f3(); + +class C { + m1(), m1(); + m2(), m2() {} + m3() {}, m3(); +} From cfc6ed2adb4bc51f0eac52060a2ccc0d57a3e951 Mon Sep 17 00:00:00 2001 From: Basarat Syed Date: Tue, 10 Nov 2015 18:33:19 +1100 Subject: [PATCH 166/353] tsx : support tags in language service semantic tokenizer --- src/services/services.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/services/services.ts b/src/services/services.ts index 113a52459e9cb..ad8481e82cbe8 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1611,6 +1611,9 @@ namespace ts { public static typeAliasName = "type alias name"; public static parameterName = "parameter name"; public static docCommentTagName = "doc comment tag name"; + public static jsxOpenTagName = "jsx open tag name"; + public static jsxCloseTagName = "jsx close tag name"; + public static jsxSelfClosingTagName = "jsx self closing tag name"; } export const enum ClassificationType { @@ -1632,6 +1635,9 @@ namespace ts { typeAliasName = 16, parameterName = 17, docCommentTagName = 18, + jsxOpenTagName = 19, + jsxCloseTagName = 20, + jsxSelfClosingTagName = 21, } /// Language Service @@ -6619,6 +6625,9 @@ namespace ts { case ClassificationType.typeAliasName: return ClassificationTypeNames.typeAliasName; case ClassificationType.parameterName: return ClassificationTypeNames.parameterName; case ClassificationType.docCommentTagName: return ClassificationTypeNames.docCommentTagName; + case ClassificationType.jsxOpenTagName: return ClassificationTypeNames.jsxOpenTagName; + case ClassificationType.jsxCloseTagName: return ClassificationTypeNames.jsxCloseTagName; + case ClassificationType.jsxSelfClosingTagName: return ClassificationTypeNames.jsxSelfClosingTagName; } } @@ -6931,6 +6940,23 @@ namespace ts { } return; + case SyntaxKind.JsxOpeningElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxOpenTagName; + } + return; + + case SyntaxKind.JsxClosingElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxCloseTagName; + } + return; + + case SyntaxKind.JsxSelfClosingElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxSelfClosingTagName; + } + return; } } From 64e4cc306cae1444a0bf545aa641c7ea5208cf32 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 10 Nov 2015 08:55:24 -0800 Subject: [PATCH 167/353] Improve efficiency and naming The unapplied outer parameters check now checks only whether the last outer parameter is unapplied, and its name is now positive -- are-all-applied vs are-some-unapplied. --- src/compiler/checker.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index adf23cc2ae756..37c70731fca6f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2878,7 +2878,7 @@ namespace ts { let baseType: Type; const originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; if (baseConstructorType.symbol && baseConstructorType.symbol.flags & SymbolFlags.Class && - !baseTypeHasUnappliedOuterTypeParameters(originalBaseType)) { + areAllOuterTypeParametersApplied(originalBaseType)) { // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the // class and all return the instance type of the class. There is no need for further checks and we can apply the // type arguments in the same manner as a type reference to get the same error reporting experience. @@ -2915,20 +2915,16 @@ namespace ts { } } - function baseTypeHasUnappliedOuterTypeParameters(type: Type): boolean { + function areAllOuterTypeParametersApplied(type: Type): boolean { const outerTypeParameters = (type).outerTypeParameters; - const typeArguments = (type).typeArguments; if (outerTypeParameters) { // an unapplied type parameter is one // whose argument symbol is still the same as the parameter symbol - const numParameters = outerTypeParameters.length; - for (let i = 0; i < numParameters; i++) { - if (outerTypeParameters[i].symbol === typeArguments[i].symbol) { - return true; - } - } + const last = outerTypeParameters.length - 1; + const typeArguments = (type).typeArguments; + return outerTypeParameters[last].symbol !== typeArguments[last].symbol; } - return false; + return true; } function resolveBaseTypesOfInterface(type: InterfaceType): void { From 48e985d72f12af17d39b47140491a8b52ccb29df Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 10 Nov 2015 11:35:03 -0800 Subject: [PATCH 168/353] Prevent resolveName from ignoring default exports --- src/compiler/checker.ts | 42 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 706ed1c65a3c9..05ced970793eb 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -487,8 +487,9 @@ namespace ts { (location.kind === SyntaxKind.ModuleDeclaration && (location).name.kind === SyntaxKind.StringLiteral)) { // It's an external module. Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. Therefore, - // if the name we find is purely an export specifier, it is not actually considered in scope. + // yet we never want to treat an export specifier as putting a member in scope, except 'default'. + // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope, + // unless it is 'default'. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol // on an export specifier is that it might find the export specifier itself, and try to @@ -497,15 +498,16 @@ namespace ts { // 2. We check === SymbolFlags.Alias in order to check that the symbol is *purely* // an alias. If we used &, we'd be throwing out symbols that have non alias aspects, // which is not the desired behavior. + const isLocalSymbolForExportDefault = doesNameResolveToLocalSymbolForExportDefault(moduleExports, meaning, name); if (hasProperty(moduleExports, name) && moduleExports[name].flags === SymbolFlags.Alias && + !isLocalSymbolForExportDefault && getDeclarationOfKind(moduleExports[name], SyntaxKind.ExportSpecifier)) { break; } - result = moduleExports["default"]; - const localSymbol = getLocalSymbolForExportDefault(result); - if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) { + if (isLocalSymbolForExportDefault) { + result = moduleExports["default"]; break loop; } result = undefined; @@ -674,6 +676,12 @@ namespace ts { return result; } + function doesNameResolveToLocalSymbolForExportDefault(exports: SymbolTable, meaning: SymbolFlags, name: string): boolean { + const defaultExport = exports["default"]; + const localSymbol = getLocalSymbolForExportDefault(defaultExport); + return defaultExport && (defaultExport.flags & meaning) && localSymbol && localSymbol.name === name; + } + function checkResolvedBlockScopedVariable(result: Symbol, errorLocation: Node): void { Debug.assert((result.flags & SymbolFlags.BlockScopedVariable) !== 0); // Block-scoped variables cannot be used before their definition @@ -4124,12 +4132,12 @@ namespace ts { // We only support expressions that are simple qualified names. For other expressions this produces undefined. const typeNameOrExpression = node.kind === SyntaxKind.TypeReference ? (node).typeName : isSupportedExpressionWithTypeArguments(node) ? (node).expression : - undefined; + undefined; const symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, SymbolFlags.Type) || unknownSymbol; const type = symbol === unknownSymbol ? unknownType : symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface) ? getTypeFromClassOrInterfaceReference(node, symbol) : - symbol.flags & SymbolFlags.TypeAlias ? getTypeFromTypeAliasReference(node, symbol) : - getTypeFromNonGenericTypeReference(node, symbol); + symbol.flags & SymbolFlags.TypeAlias ? getTypeFromTypeAliasReference(node, symbol) : + getTypeFromNonGenericTypeReference(node, symbol); // Cache both the resolved symbol and the resolved type. The resolved symbol is needed in when we check the // type reference in checkTypeReferenceOrExpressionWithTypeArguments. links.resolvedSymbol = symbol; @@ -11309,7 +11317,7 @@ namespace ts { // Abstract methods can't have an implementation -- in particular, they don't need one. if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body && - !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract) ) { + !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract)) { reportImplementationExpectedError(lastSeenNonAmbientDeclaration); } @@ -14221,8 +14229,8 @@ namespace ts { if (className) { copySymbol(location.symbol, meaning); } - // fall through; this fall-through is necessary because we would like to handle - // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration + // fall through; this fall-through is necessary because we would like to handle + // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration case SyntaxKind.ClassDeclaration: case SyntaxKind.InterfaceDeclaration: // If we didn't come from static member of class or interface, @@ -14378,8 +14386,8 @@ namespace ts { return resolveEntityName(entityName, meaning); } else if ((entityName.parent.kind === SyntaxKind.JsxOpeningElement) || - (entityName.parent.kind === SyntaxKind.JsxSelfClosingElement) || - (entityName.parent.kind === SyntaxKind.JsxClosingElement)) { + (entityName.parent.kind === SyntaxKind.JsxSelfClosingElement) || + (entityName.parent.kind === SyntaxKind.JsxClosingElement)) { return getJsxElementTagSymbol(entityName.parent); } else if (isExpression(entityName)) { @@ -14446,8 +14454,8 @@ namespace ts { : getSymbolOfPartOfRightHandSideOfImportEquals(node); } else if (node.parent.kind === SyntaxKind.BindingElement && - node.parent.parent.kind === SyntaxKind.ObjectBindingPattern && - node === (node.parent).propertyName) { + node.parent.parent.kind === SyntaxKind.ObjectBindingPattern && + node === (node.parent).propertyName) { const typeOfPattern = getTypeOfNode(node.parent.parent); const propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, (node).text); @@ -14484,7 +14492,7 @@ namespace ts { (node.parent).moduleSpecifier === node)) { return resolveExternalModuleName(node, node); } - // Fall through + // Fall through case SyntaxKind.NumericLiteral: // index access @@ -14680,7 +14688,7 @@ namespace ts { if (links.isNestedRedeclaration === undefined) { const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration); links.isNestedRedeclaration = isStatementWithLocals(container) && - !!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined); + !!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined); } return links.isNestedRedeclaration; } From e30a01db0fb06dc93177f194cfd919ca4d4baec3 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 10 Nov 2015 11:44:56 -0800 Subject: [PATCH 169/353] Add test case and accept baseline --- .../reference/reExportDefaultExport.js | 27 +++++++++++++++++++ .../reference/reExportDefaultExport.symbols | 22 +++++++++++++++ .../reference/reExportDefaultExport.types | 24 +++++++++++++++++ .../es6/modules/reExportDefaultExport.ts | 15 +++++++++++ 4 files changed, 88 insertions(+) create mode 100644 tests/baselines/reference/reExportDefaultExport.js create mode 100644 tests/baselines/reference/reExportDefaultExport.symbols create mode 100644 tests/baselines/reference/reExportDefaultExport.types create mode 100644 tests/cases/conformance/es6/modules/reExportDefaultExport.ts diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js new file mode 100644 index 0000000000000..dbe3dfdbbaea7 --- /dev/null +++ b/tests/baselines/reference/reExportDefaultExport.js @@ -0,0 +1,27 @@ +//// [tests/cases/conformance/es6/modules/reExportDefaultExport.ts] //// + +//// [m1.ts] + +export default function f() { +} +export {f}; + + +//// [m2.ts] +import foo from "./m1"; +import {f} from "./m1"; + +f(); +foo(); + +//// [m1.js] +function f() { +} +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = f; +exports.f = f; +//// [m2.js] +var m1_1 = require("./m1"); +var m1_2 = require("./m1"); +m1_2.f(); +m1_1.default(); diff --git a/tests/baselines/reference/reExportDefaultExport.symbols b/tests/baselines/reference/reExportDefaultExport.symbols new file mode 100644 index 0000000000000..cd0d6e493c946 --- /dev/null +++ b/tests/baselines/reference/reExportDefaultExport.symbols @@ -0,0 +1,22 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +export default function f() { +>f : Symbol(f, Decl(m1.ts, 0, 0)) +} +export {f}; +>f : Symbol(f, Decl(m1.ts, 3, 8)) + + +=== tests/cases/conformance/es6/modules/m2.ts === +import foo from "./m1"; +>foo : Symbol(foo, Decl(m2.ts, 0, 6)) + +import {f} from "./m1"; +>f : Symbol(f, Decl(m2.ts, 1, 8)) + +f(); +>f : Symbol(f, Decl(m2.ts, 1, 8)) + +foo(); +>foo : Symbol(foo, Decl(m2.ts, 0, 6)) + diff --git a/tests/baselines/reference/reExportDefaultExport.types b/tests/baselines/reference/reExportDefaultExport.types new file mode 100644 index 0000000000000..f775571ac2c8d --- /dev/null +++ b/tests/baselines/reference/reExportDefaultExport.types @@ -0,0 +1,24 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +export default function f() { +>f : () => void +} +export {f}; +>f : () => void + + +=== tests/cases/conformance/es6/modules/m2.ts === +import foo from "./m1"; +>foo : () => void + +import {f} from "./m1"; +>f : () => void + +f(); +>f() : void +>f : () => void + +foo(); +>foo() : void +>foo : () => void + diff --git a/tests/cases/conformance/es6/modules/reExportDefaultExport.ts b/tests/cases/conformance/es6/modules/reExportDefaultExport.ts new file mode 100644 index 0000000000000..730435fd4eebc --- /dev/null +++ b/tests/cases/conformance/es6/modules/reExportDefaultExport.ts @@ -0,0 +1,15 @@ +// @module: commonjs +// @target: ES5 + +// @filename: m1.ts +export default function f() { +} +export {f}; + + +// @filename: m2.ts +import foo from "./m1"; +import {f} from "./m1"; + +f(); +foo(); \ No newline at end of file From 694c714cf594f714ca87069021a94d7d8dd75cb4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 11:56:32 -0800 Subject: [PATCH 170/353] Added test for parenthesized string literals. --- .../stringLiteralTypesAndParenthesizedExpressions01.ts | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts new file mode 100644 index 0000000000000..7910c0e16b709 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts @@ -0,0 +1,8 @@ +// @declaration: true + +declare function myRandBool(): boolean; + +let a: "foo" = ("foo"); +let b: "foo" | "bar" = ("foo"); +let c: "foo" = (myRandBool ? "foo" : ("foo")); +let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); From 6dcf3cf75696d79a7f422ab8a7f423bc36352aed Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 12:06:25 -0800 Subject: [PATCH 171/353] Add case sensitivity-check, only error on failure when outDir is specified and resource based paths are found --- src/compiler/program.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 8f031a4de4342..aee66834a11f4 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -888,7 +888,7 @@ namespace ts { function computeCommonSourceDirectory(sourceFiles: SourceFile[]): string { let commonPathComponents: string[]; - forEach(files, sourceFile => { + const failed = forEach(files, sourceFile => { // Each file contributes into common source file path if (isDeclarationFile(sourceFile)) { return; @@ -903,11 +903,12 @@ namespace ts { return; } + const caseSensitive = host.useCaseSensitiveFileNames(); for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) { - if (commonPathComponents[i] !== sourcePathComponents[i]) { + if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) { if (i === 0) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files)); - return; + // Failed to find any common path component + return true; } // New common path found that is 0 -> i-1 @@ -922,6 +923,11 @@ namespace ts { } }); + // A common path can not be found when paths span multiple drives on windows, for example + if (failed) { + return ""; + } + if (!commonPathComponents) { // Can happen when all input files are .d.ts files return currentDirectory; } @@ -1045,6 +1051,10 @@ namespace ts { else { // Compute the commonSourceDirectory from the input files commonSourceDirectory = computeCommonSourceDirectory(files); + // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure + if (options.outDir && commonSourceDirectory === "" && forEach(files, file => getRootLength(file.fileName) > 1)) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files)); + } } if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { From abc230195c5d708015383967a27a4aaed2872872 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 12:12:14 -0800 Subject: [PATCH 172/353] Add handling for json parse errors --- src/compiler/tsc.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 79158cf4e9dd2..474d721207084 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -349,6 +349,11 @@ namespace ts { const result = parseConfigFileTextToJson(configFileName, cachedConfigFileText); const configObject = result.config; + if (!configObject) { + reportDiagnostics([result.error], /* compilerHost */ undefined); + sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); + return; + } const configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName)); if (configParseResult.errors.length > 0) { reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined); From 38127457372b917d49d8c5ee9955ac8e1d88db42 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 12:59:39 -0800 Subject: [PATCH 173/353] Added other tests for string literal types. --- .../stringLiteralTypesAndLogicalOrExpressions01.ts | 9 +++++++++ .../types/stringLiteral/stringLiteralTypesOverloads04.ts | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts new file mode 100644 index 0000000000000..8a257ae1caf5e --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts @@ -0,0 +1,9 @@ +// @declaration: true + +declare function myRandBool(): boolean; + +let a: "foo" = "foo"; +let b = a || "foo"; +let c: "foo" = b; +let d = b || "bar"; +let e: "foo" | "bar" = d; diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts new file mode 100644 index 0000000000000..8bc2a0c94b8e6 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts @@ -0,0 +1,8 @@ +// @declaration: true + +declare function f(x: (p: "foo" | "bar") => "foo"); + +f(y => { + let z = y = "foo"; + return z; +}) \ No newline at end of file From f80a6c6e869b9f84bee99bdfd20594423f56d263 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 11:56:50 -0800 Subject: [PATCH 174/353] Accepted baselines. --- ...ngLiteralTypesAndLogicalOrExpressions01.js | 26 +++++++++++++++++ ...eralTypesAndLogicalOrExpressions01.symbols | 24 +++++++++++++++ ...iteralTypesAndLogicalOrExpressions01.types | 29 +++++++++++++++++++ ...esAndParenthesizedExpressions01.errors.txt | 17 +++++++++++ ...teralTypesAndParenthesizedExpressions01.js | 23 +++++++++++++++ .../stringLiteralTypesOverloads04.js | 18 ++++++++++++ .../stringLiteralTypesOverloads04.symbols | 19 ++++++++++++ .../stringLiteralTypesOverloads04.types | 23 +++++++++++++++ 8 files changed, 179 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js create mode 100644 tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types create mode 100644 tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads04.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads04.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads04.types diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js new file mode 100644 index 0000000000000..479256b18b7e5 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.js @@ -0,0 +1,26 @@ +//// [stringLiteralTypesAndLogicalOrExpressions01.ts] + +declare function myRandBool(): boolean; + +let a: "foo" = "foo"; +let b = a || "foo"; +let c: "foo" = b; +let d = b || "bar"; +let e: "foo" | "bar" = d; + + +//// [stringLiteralTypesAndLogicalOrExpressions01.js] +var a = "foo"; +var b = a || "foo"; +var c = b; +var d = b || "bar"; +var e = d; + + +//// [stringLiteralTypesAndLogicalOrExpressions01.d.ts] +declare function myRandBool(): boolean; +declare let a: "foo"; +declare let b: "foo"; +declare let c: "foo"; +declare let d: "foo" | "bar"; +declare let e: "foo" | "bar"; diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols new file mode 100644 index 0000000000000..2a9f28e85a5ca --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.symbols @@ -0,0 +1,24 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts === + +declare function myRandBool(): boolean; +>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 0, 0)) + +let a: "foo" = "foo"; +>a : Symbol(a, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 3, 3)) + +let b = a || "foo"; +>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3)) +>a : Symbol(a, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 3, 3)) + +let c: "foo" = b; +>c : Symbol(c, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 5, 3)) +>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3)) + +let d = b || "bar"; +>d : Symbol(d, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 6, 3)) +>b : Symbol(b, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 4, 3)) + +let e: "foo" | "bar" = d; +>e : Symbol(e, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 7, 3)) +>d : Symbol(d, Decl(stringLiteralTypesAndLogicalOrExpressions01.ts, 6, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types new file mode 100644 index 0000000000000..ddc79b818579e --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndLogicalOrExpressions01.types @@ -0,0 +1,29 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01.ts === + +declare function myRandBool(): boolean; +>myRandBool : () => boolean + +let a: "foo" = "foo"; +>a : "foo" +>"foo" : "foo" + +let b = a || "foo"; +>b : "foo" +>a || "foo" : "foo" +>a : "foo" +>"foo" : "foo" + +let c: "foo" = b; +>c : "foo" +>b : "foo" + +let d = b || "bar"; +>d : "foo" | "bar" +>b || "bar" : "foo" | "bar" +>b : "foo" +>"bar" : "bar" + +let e: "foo" | "bar" = d; +>e : "foo" | "bar" +>d : "foo" | "bar" + diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt new file mode 100644 index 0000000000000..93d8a213d0fee --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt @@ -0,0 +1,17 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts(4,5): error TS2322: Type 'string' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts(6,5): error TS2322: Type 'string' is not assignable to type '"foo"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts (2 errors) ==== + + declare function myRandBool(): boolean; + + let a: "foo" = ("foo"); + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. + let b: "foo" | "bar" = ("foo"); + let c: "foo" = (myRandBool ? "foo" : ("foo")); + ~ +!!! error TS2322: Type 'string' is not assignable to type '"foo"'. + let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); + \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js new file mode 100644 index 0000000000000..1fe1225c6f40d --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.js @@ -0,0 +1,23 @@ +//// [stringLiteralTypesAndParenthesizedExpressions01.ts] + +declare function myRandBool(): boolean; + +let a: "foo" = ("foo"); +let b: "foo" | "bar" = ("foo"); +let c: "foo" = (myRandBool ? "foo" : ("foo")); +let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); + + +//// [stringLiteralTypesAndParenthesizedExpressions01.js] +var a = ("foo"); +var b = ("foo"); +var c = (myRandBool ? "foo" : ("foo")); +var d = (myRandBool ? "foo" : ("bar")); + + +//// [stringLiteralTypesAndParenthesizedExpressions01.d.ts] +declare function myRandBool(): boolean; +declare let a: "foo"; +declare let b: "foo" | "bar"; +declare let c: "foo"; +declare let d: "foo" | "bar"; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.js b/tests/baselines/reference/stringLiteralTypesOverloads04.js new file mode 100644 index 0000000000000..fd10ac986a9d5 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads04.js @@ -0,0 +1,18 @@ +//// [stringLiteralTypesOverloads04.ts] + +declare function f(x: (p: "foo" | "bar") => "foo"); + +f(y => { + let z = y = "foo"; + return z; +}) + +//// [stringLiteralTypesOverloads04.js] +f(function (y) { + var z = y = "foo"; + return z; +}); + + +//// [stringLiteralTypesOverloads04.d.ts] +declare function f(x: (p: "foo" | "bar") => "foo"): any; diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.symbols b/tests/baselines/reference/stringLiteralTypesOverloads04.symbols new file mode 100644 index 0000000000000..9f468b8bd9502 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads04.symbols @@ -0,0 +1,19 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts === + +declare function f(x: (p: "foo" | "bar") => "foo"); +>f : Symbol(f, Decl(stringLiteralTypesOverloads04.ts, 0, 0)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads04.ts, 1, 19)) +>p : Symbol(p, Decl(stringLiteralTypesOverloads04.ts, 1, 23)) + +f(y => { +>f : Symbol(f, Decl(stringLiteralTypesOverloads04.ts, 0, 0)) +>y : Symbol(y, Decl(stringLiteralTypesOverloads04.ts, 3, 2)) + + let z = y = "foo"; +>z : Symbol(z, Decl(stringLiteralTypesOverloads04.ts, 4, 7)) +>y : Symbol(y, Decl(stringLiteralTypesOverloads04.ts, 3, 2)) + + return z; +>z : Symbol(z, Decl(stringLiteralTypesOverloads04.ts, 4, 7)) + +}) diff --git a/tests/baselines/reference/stringLiteralTypesOverloads04.types b/tests/baselines/reference/stringLiteralTypesOverloads04.types new file mode 100644 index 0000000000000..32d316494ca5e --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads04.types @@ -0,0 +1,23 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads04.ts === + +declare function f(x: (p: "foo" | "bar") => "foo"); +>f : (x: (p: "foo" | "bar") => "foo") => any +>x : (p: "foo" | "bar") => "foo" +>p : "foo" | "bar" + +f(y => { +>f(y => { let z = y = "foo"; return z;}) : any +>f : (x: (p: "foo" | "bar") => "foo") => any +>y => { let z = y = "foo"; return z;} : (y: "foo" | "bar") => "foo" +>y : "foo" | "bar" + + let z = y = "foo"; +>z : "foo" +>y = "foo" : "foo" +>y : "foo" | "bar" +>"foo" : "foo" + + return z; +>z : "foo" + +}) From 58b5d29c5299809605ac8a9c2cb1ac5217f7261f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 10 Nov 2015 13:05:30 -0800 Subject: [PATCH 175/353] Improve comment --- src/compiler/checker.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 37c70731fca6f..97f274ab74de9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2915,11 +2915,13 @@ namespace ts { } } + /** + * An unapplied type parameter has its symbol still the same as the matching argument symbol. + * Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked. + */ function areAllOuterTypeParametersApplied(type: Type): boolean { const outerTypeParameters = (type).outerTypeParameters; if (outerTypeParameters) { - // an unapplied type parameter is one - // whose argument symbol is still the same as the parameter symbol const last = outerTypeParameters.length - 1; const typeArguments = (type).typeArguments; return outerTypeParameters[last].symbol !== typeArguments[last].symbol; From 97d170b388102bded0fdd68384c3a43b4f871fe6 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 13:10:44 -0800 Subject: [PATCH 176/353] Support to tests for absolute paths, add common src dir edgecase tests --- src/harness/compilerRunner.ts | 22 ++++++------------- tests/baselines/reference/commonSourceDir1.js | 13 +++++++++++ .../reference/commonSourceDir1.symbols | 8 +++++++ .../reference/commonSourceDir1.types | 8 +++++++ .../reference/commonSourceDir2.errors.txt | 9 ++++++++ tests/baselines/reference/commonSourceDir2.js | 12 ++++++++++ tests/baselines/reference/commonSourceDir3.js | 12 ++++++++++ .../reference/commonSourceDir3.symbols | 8 +++++++ .../reference/commonSourceDir3.types | 8 +++++++ .../reference/commonSourceDir4.errors.txt | 9 ++++++++ tests/baselines/reference/commonSourceDir4.js | 12 ++++++++++ tests/cases/compiler/commonSourceDir1.ts | 6 +++++ tests/cases/compiler/commonSourceDir2.ts | 6 +++++ tests/cases/compiler/commonSourceDir3.ts | 6 +++++ tests/cases/compiler/commonSourceDir4.ts | 7 ++++++ 15 files changed, 131 insertions(+), 15 deletions(-) create mode 100644 tests/baselines/reference/commonSourceDir1.js create mode 100644 tests/baselines/reference/commonSourceDir1.symbols create mode 100644 tests/baselines/reference/commonSourceDir1.types create mode 100644 tests/baselines/reference/commonSourceDir2.errors.txt create mode 100644 tests/baselines/reference/commonSourceDir2.js create mode 100644 tests/baselines/reference/commonSourceDir3.js create mode 100644 tests/baselines/reference/commonSourceDir3.symbols create mode 100644 tests/baselines/reference/commonSourceDir3.types create mode 100644 tests/baselines/reference/commonSourceDir4.errors.txt create mode 100644 tests/baselines/reference/commonSourceDir4.js create mode 100644 tests/cases/compiler/commonSourceDir1.ts create mode 100644 tests/cases/compiler/commonSourceDir2.ts create mode 100644 tests/cases/compiler/commonSourceDir3.ts create mode 100644 tests/cases/compiler/commonSourceDir4.ts diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 848f229f109c0..f7bb23527dddd 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -45,14 +45,10 @@ class CompilerBaselineRunner extends RunnerBase { // Mocha holds onto the closure environment of the describe callback even after the test is done. // Everything declared here should be cleared out in the "after" callback. let justName: string; - let content: string; - let testCaseContent: { settings: Harness.TestCaseParser.CompilerSettings; testUnitData: Harness.TestCaseParser.TestUnitData[]; }; - let units: Harness.TestCaseParser.TestUnitData[]; let tcSettings: Harness.TestCaseParser.CompilerSettings; let lastUnit: Harness.TestCaseParser.TestUnitData; - let rootDir: string; let result: Harness.Compiler.CompilerResult; let program: ts.Program; @@ -65,12 +61,12 @@ class CompilerBaselineRunner extends RunnerBase { before(() => { justName = fileName.replace(/^.*[\\\/]/, ""); // strips the fileName from the path. - content = Harness.IO.readFile(fileName); - testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); - units = testCaseContent.testUnitData; + const content = Harness.IO.readFile(fileName); + const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); + const units = testCaseContent.testUnitData; tcSettings = testCaseContent.settings; lastUnit = units[units.length - 1]; - rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; + const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; harnessCompiler = Harness.Compiler.getCompiler(); // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test) // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references, @@ -78,16 +74,16 @@ class CompilerBaselineRunner extends RunnerBase { toBeCompiled = []; otherFiles = []; if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) { - toBeCompiled.push({ unitName: rootDir + lastUnit.name, content: lastUnit.content }); + toBeCompiled.push({ unitName: ts.isRootedDiskPath(lastUnit.name) ? lastUnit.name : rootDir + lastUnit.name, content: lastUnit.content }); units.forEach(unit => { if (unit.name !== lastUnit.name) { - otherFiles.push({ unitName: rootDir + unit.name, content: unit.content }); + otherFiles.push({ unitName: ts.isRootedDiskPath(unit.name) ? unit.name : rootDir + unit.name, content: unit.content }); } }); } else { toBeCompiled = units.map(unit => { - return { unitName: rootDir + unit.name, content: unit.content }; + return { unitName: ts.isRootedDiskPath(unit.name) ? unit.name : rootDir + unit.name, content: unit.content }; }); } @@ -104,12 +100,8 @@ class CompilerBaselineRunner extends RunnerBase { // Mocha holds onto the closure environment of the describe callback even after the test is done. // Therefore we have to clean out large objects after the test is done. justName = undefined; - content = undefined; - testCaseContent = undefined; - units = undefined; tcSettings = undefined; lastUnit = undefined; - rootDir = undefined; result = undefined; program = undefined; options = undefined; diff --git a/tests/baselines/reference/commonSourceDir1.js b/tests/baselines/reference/commonSourceDir1.js new file mode 100644 index 0000000000000..68833aed49db0 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir1.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/commonSourceDir1.ts] //// + +//// [bar.ts] +var x: number; + +//// [baz.ts] +var y: number; + + +//// [bar.js] +var x; +//// [baz.js] +var y; diff --git a/tests/baselines/reference/commonSourceDir1.symbols b/tests/baselines/reference/commonSourceDir1.symbols new file mode 100644 index 0000000000000..9248e0c97afb6 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir1.symbols @@ -0,0 +1,8 @@ +=== A:/foo/bar.ts === +var x: number; +>x : Symbol(x, Decl(bar.ts, 0, 3)) + +=== A:/foo/baz.ts === +var y: number; +>y : Symbol(y, Decl(baz.ts, 0, 3)) + diff --git a/tests/baselines/reference/commonSourceDir1.types b/tests/baselines/reference/commonSourceDir1.types new file mode 100644 index 0000000000000..6c9864c02ccb8 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir1.types @@ -0,0 +1,8 @@ +=== A:/foo/bar.ts === +var x: number; +>x : number + +=== A:/foo/baz.ts === +var y: number; +>y : number + diff --git a/tests/baselines/reference/commonSourceDir2.errors.txt b/tests/baselines/reference/commonSourceDir2.errors.txt new file mode 100644 index 0000000000000..85bcf5d9c722c --- /dev/null +++ b/tests/baselines/reference/commonSourceDir2.errors.txt @@ -0,0 +1,9 @@ +error TS5009: Cannot find the common subdirectory path for the input files. + + +!!! error TS5009: Cannot find the common subdirectory path for the input files. +==== A:/foo/bar.ts (0 errors) ==== + var x: number; + +==== B:/foo/baz.ts (0 errors) ==== + var y: number; \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDir2.js b/tests/baselines/reference/commonSourceDir2.js new file mode 100644 index 0000000000000..cf263b51fb60b --- /dev/null +++ b/tests/baselines/reference/commonSourceDir2.js @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/commonSourceDir2.ts] //// + +//// [bar.ts] +var x: number; + +//// [baz.ts] +var y: number; + +//// [bar.js] +var x; +//// [baz.js] +var y; diff --git a/tests/baselines/reference/commonSourceDir3.js b/tests/baselines/reference/commonSourceDir3.js new file mode 100644 index 0000000000000..0535d51f4bf08 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir3.js @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/commonSourceDir3.ts] //// + +//// [bar.ts] +var x: number; + +//// [baz.ts] +var y: number; + +//// [bar.js] +var x; +//// [baz.js] +var y; diff --git a/tests/baselines/reference/commonSourceDir3.symbols b/tests/baselines/reference/commonSourceDir3.symbols new file mode 100644 index 0000000000000..b8783523dfd9a --- /dev/null +++ b/tests/baselines/reference/commonSourceDir3.symbols @@ -0,0 +1,8 @@ +=== A:/foo/bar.ts === +var x: number; +>x : Symbol(x, Decl(bar.ts, 0, 3)) + +=== a:/foo/baz.ts === +var y: number; +>y : Symbol(y, Decl(baz.ts, 0, 3)) + diff --git a/tests/baselines/reference/commonSourceDir3.types b/tests/baselines/reference/commonSourceDir3.types new file mode 100644 index 0000000000000..a0b95275897a2 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir3.types @@ -0,0 +1,8 @@ +=== A:/foo/bar.ts === +var x: number; +>x : number + +=== a:/foo/baz.ts === +var y: number; +>y : number + diff --git a/tests/baselines/reference/commonSourceDir4.errors.txt b/tests/baselines/reference/commonSourceDir4.errors.txt new file mode 100644 index 0000000000000..f3493504e4d56 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir4.errors.txt @@ -0,0 +1,9 @@ +error TS5009: Cannot find the common subdirectory path for the input files. + + +!!! error TS5009: Cannot find the common subdirectory path for the input files. +==== A:/foo/bar.ts (0 errors) ==== + var x: number; + +==== a:/foo/baz.ts (0 errors) ==== + var y: number; \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDir4.js b/tests/baselines/reference/commonSourceDir4.js new file mode 100644 index 0000000000000..2f2af9f68b2d9 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir4.js @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/commonSourceDir4.ts] //// + +//// [bar.ts] +var x: number; + +//// [baz.ts] +var y: number; + +//// [bar.js] +var x; +//// [baz.js] +var y; diff --git a/tests/cases/compiler/commonSourceDir1.ts b/tests/cases/compiler/commonSourceDir1.ts new file mode 100644 index 0000000000000..1a178ac0226c8 --- /dev/null +++ b/tests/cases/compiler/commonSourceDir1.ts @@ -0,0 +1,6 @@ +// @outDir: A:/ +// @Filename: A:/foo/bar.ts +var x: number; + +// @Filename: A:/foo/baz.ts +var y: number; diff --git a/tests/cases/compiler/commonSourceDir2.ts b/tests/cases/compiler/commonSourceDir2.ts new file mode 100644 index 0000000000000..68dab0727a3ad --- /dev/null +++ b/tests/cases/compiler/commonSourceDir2.ts @@ -0,0 +1,6 @@ +// @outDir: A:/ +// @Filename: A:/foo/bar.ts +var x: number; + +// @Filename: B:/foo/baz.ts +var y: number; \ No newline at end of file diff --git a/tests/cases/compiler/commonSourceDir3.ts b/tests/cases/compiler/commonSourceDir3.ts new file mode 100644 index 0000000000000..cc42eb8f26788 --- /dev/null +++ b/tests/cases/compiler/commonSourceDir3.ts @@ -0,0 +1,6 @@ +// @outDir: A:/ +// @Filename: A:/foo/bar.ts +var x: number; + +// @Filename: a:/foo/baz.ts +var y: number; \ No newline at end of file diff --git a/tests/cases/compiler/commonSourceDir4.ts b/tests/cases/compiler/commonSourceDir4.ts new file mode 100644 index 0000000000000..41ee7a0344a45 --- /dev/null +++ b/tests/cases/compiler/commonSourceDir4.ts @@ -0,0 +1,7 @@ +// @useCaseSensitiveFileNames: true +// @outDir: A:/ +// @Filename: A:/foo/bar.ts +var x: number; + +// @Filename: a:/foo/baz.ts +var y: number; \ No newline at end of file From f3d2963ff7a985c827aaf2a882427fe401fe5d29 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 10 Nov 2015 13:13:58 -0800 Subject: [PATCH 177/353] Change back from jsdoc comment. --- src/compiler/checker.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 97f274ab74de9..958dcf3e4b9e0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2915,11 +2915,9 @@ namespace ts { } } - /** - * An unapplied type parameter has its symbol still the same as the matching argument symbol. - * Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked. - */ function areAllOuterTypeParametersApplied(type: Type): boolean { + // An unapplied type parameter has its symbol still the same as the matching argument symbol. + // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked. const outerTypeParameters = (type).outerTypeParameters; if (outerTypeParameters) { const last = outerTypeParameters.length - 1; From 00130f1a68011ae59fb61e2f70897d48ec100b47 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 13:20:28 -0800 Subject: [PATCH 178/353] Handle when using -p and config file not found --- src/compiler/tsc.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 474d721207084..f560a15dfb95a 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -346,6 +346,12 @@ namespace ts { return; } } + if (!cachedConfigFileText) { + const error = createCompilerDiagnostic(Diagnostics.File_0_not_found, configFileName); + reportDiagnostics([error], /* compilerHost */ undefined); + sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); + return; + } const result = parseConfigFileTextToJson(configFileName, cachedConfigFileText); const configObject = result.config; From a1cf51faacf18f4a3f91530688ec2c77fefd698d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 13:25:09 -0800 Subject: [PATCH 179/353] use canonical filename function --- src/compiler/program.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index aee66834a11f4..03305dd368d71 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -894,7 +894,7 @@ namespace ts { return; } - const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory); + const sourcePathComponents = getNormalizedPathComponents(getCanonicalFileName(sourceFile.fileName), currentDirectory); sourcePathComponents.pop(); // The base file name is not part of the common directory path if (!commonPathComponents) { @@ -903,9 +903,8 @@ namespace ts { return; } - const caseSensitive = host.useCaseSensitiveFileNames(); for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) { - if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) { + if (commonPathComponents[i] !== sourcePathComponents[i]) { if (i === 0) { // Failed to find any common path component return true; From 79b7146d0bbb3c80cb3a73a6fa2d86894af97d6a Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 10 Nov 2015 13:30:26 -0800 Subject: [PATCH 180/353] Cleanup of types --- src/compiler/checker.ts | 2 +- src/compiler/parser.ts | 56 +++---- src/compiler/types.ts | 337 +++++++++++++++++++++++++++++++++----- src/compiler/utilities.ts | 4 +- src/services/services.ts | 96 +++++------ 5 files changed, 371 insertions(+), 124 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f1593abb17763..bfd2eb8d7b878 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9766,7 +9766,7 @@ namespace ts { return type; } - function checkFunctionExpressionOrObjectLiteralMethodBody(node: FunctionExpression | MethodDeclaration) { + function checkFunctionExpressionOrObjectLiteralMethodBody(node: ArrowFunction | FunctionExpression | MethodDeclaration) { Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node)); const isAsync = isAsyncFunctionLike(node); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 18e9cdea4062f..39b5a5d322eaf 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1082,7 +1082,7 @@ namespace ts { token === SyntaxKind.NumericLiteral; } - function parsePropertyNameWorker(allowComputedPropertyNames: boolean): DeclarationName { + function parsePropertyNameWorker(allowComputedPropertyNames: boolean): PropertyName { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.NumericLiteral) { return parseLiteralNode(/*internName*/ true); } @@ -1092,7 +1092,7 @@ namespace ts { return parseIdentifierName(); } - function parsePropertyName(): DeclarationName { + function parsePropertyName(): PropertyName { return parsePropertyNameWorker(/*allowComputedPropertyNames:*/ true); } @@ -1152,7 +1152,7 @@ namespace ts { } function parseAnyContextualModifier(): boolean { - return isModifier(token) && tryParse(nextTokenCanFollowModifier); + return isModifierKind(token) && tryParse(nextTokenCanFollowModifier); } function canFollowModifier(): boolean { @@ -1999,7 +1999,7 @@ namespace ts { } function isStartOfParameter(): boolean { - return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifier(token) || token === SyntaxKind.AtToken; + return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifierKind(token) || token === SyntaxKind.AtToken; } function setModifiers(node: Node, modifiers: ModifiersArray) { @@ -2020,7 +2020,7 @@ namespace ts { node.name = parseIdentifierOrPattern(); - if (getFullWidth(node.name) === 0 && node.flags === 0 && isModifier(token)) { + if (getFullWidth(node.name) === 0 && node.flags === 0 && isModifierKind(token)) { // in cases like // 'use strict' // function foo(static) @@ -2127,8 +2127,8 @@ namespace ts { parseSemicolon(); } - function parseSignatureMember(kind: SyntaxKind): SignatureDeclaration { - const node = createNode(kind); + function parseSignatureMember(kind: SyntaxKind): CallSignatureDeclaration | ConstructSignatureDeclaration { + const node = createNode(kind); if (kind === SyntaxKind.ConstructSignature) { parseExpected(SyntaxKind.NewKeyword); } @@ -2167,7 +2167,7 @@ namespace ts { return true; } - if (isModifier(token)) { + if (isModifierKind(token)) { nextToken(); if (isIdentifier()) { return true; @@ -2210,13 +2210,13 @@ namespace ts { return finishNode(node); } - function parsePropertyOrMethodSignature(): Declaration { + function parsePropertyOrMethodSignature(): PropertySignature | MethodSignature { const fullStart = scanner.getStartPos(); const name = parsePropertyName(); const questionToken = parseOptionalToken(SyntaxKind.QuestionToken); if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { - const method = createNode(SyntaxKind.MethodSignature, fullStart); + const method = createNode(SyntaxKind.MethodSignature, fullStart); method.name = name; method.questionToken = questionToken; @@ -2227,7 +2227,7 @@ namespace ts { return finishNode(method); } else { - const property = createNode(SyntaxKind.PropertySignature, fullStart); + const property = createNode(SyntaxKind.PropertySignature, fullStart); property.name = name; property.questionToken = questionToken; property.type = parseTypeAnnotation(); @@ -2243,7 +2243,7 @@ namespace ts { case SyntaxKind.OpenBracketToken: // Both for indexers and computed properties return true; default: - if (isModifier(token)) { + if (isModifierKind(token)) { const result = lookAhead(isStartOfIndexSignatureDeclaration); if (result) { return result; @@ -2255,7 +2255,7 @@ namespace ts { } function isStartOfIndexSignatureDeclaration() { - while (isModifier(token)) { + while (isModifierKind(token)) { nextToken(); } @@ -2271,7 +2271,7 @@ namespace ts { canParseSemicolon(); } - function parseTypeMember(): Declaration { + function parseTypeMember(): TypeElement { switch (token) { case SyntaxKind.OpenParenToken: case SyntaxKind.LessThanToken: @@ -2296,7 +2296,7 @@ namespace ts { // when incrementally parsing as the parser will produce the Index declaration // if it has the same text regardless of whether it is inside a class or an // object type. - if (isModifier(token)) { + if (isModifierKind(token)) { const result = tryParse(parseIndexSignatureWithModifiers); if (result) { return result; @@ -2329,14 +2329,14 @@ namespace ts { return finishNode(node); } - function parseObjectTypeMembers(): NodeArray { - let members: NodeArray; + function parseObjectTypeMembers(): NodeArray { + let members: NodeArray; if (parseExpected(SyntaxKind.OpenBraceToken)) { members = parseList(ParsingContext.TypeMembers, parseTypeMember); parseExpected(SyntaxKind.CloseBraceToken); } else { - members = createMissingList(); + members = createMissingList(); } return members; @@ -2478,11 +2478,11 @@ namespace ts { // ( ... return true; } - if (isIdentifier() || isModifier(token)) { + if (isIdentifier() || isModifierKind(token)) { nextToken(); if (token === SyntaxKind.ColonToken || token === SyntaxKind.CommaToken || token === SyntaxKind.QuestionToken || token === SyntaxKind.EqualsToken || - isIdentifier() || isModifier(token)) { + isIdentifier() || isModifierKind(token)) { // ( id : // ( id , // ( id ? @@ -2889,7 +2889,7 @@ namespace ts { } // This *could* be a parenthesized arrow function. - // Return Unknown to const the caller know. + // Return Unknown to let the caller know. return Tristate.Unknown; } else { @@ -2988,7 +2988,7 @@ namespace ts { // user meant to supply a block. For example, if the user wrote: // // a => - // const v = 0; + // let v = 0; // } // // they may be missing an open brace. Check to see if that's the case so we can @@ -3215,7 +3215,7 @@ namespace ts { /** * Parse ES7 unary expression and await expression - * + * * ES7 UnaryExpression: * 1) SimpleUnaryExpression[?yield] * 2) IncrementExpression[?yield] ** UnaryExpression[?yield] @@ -4716,7 +4716,7 @@ namespace ts { return finishNode(node); } - function parseMethodDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, asteriskToken: Node, name: DeclarationName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration { + function parseMethodDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration { const method = createNode(SyntaxKind.MethodDeclaration, fullStart); method.decorators = decorators; setModifiers(method, modifiers); @@ -4730,7 +4730,7 @@ namespace ts { return finishNode(method); } - function parsePropertyDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, name: DeclarationName, questionToken: Node): ClassElement { + function parsePropertyDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, name: PropertyName, questionToken: Node): ClassElement { const property = createNode(SyntaxKind.PropertyDeclaration, fullStart); property.decorators = decorators; setModifiers(property, modifiers); @@ -4804,7 +4804,7 @@ namespace ts { } // Eat up all modifiers, but hold on to the last one in case it is actually an identifier. - while (isModifier(token)) { + while (isModifierKind(token)) { idToken = token; // If the idToken is a class modifier (protected, private, public, and static), it is // certain that we are starting to parse class member. This allows better error recovery @@ -5014,8 +5014,8 @@ namespace ts { // implements is a future reserved word so // 'class implements' might mean either // - class expression with omitted name, 'implements' starts heritage clause - // - class with name 'implements' - // 'isImplementsClause' helps to disambiguate between these two cases + // - class with name 'implements' + // 'isImplementsClause' helps to disambiguate between these two cases return isIdentifier() && !isImplementsClause() ? parseIdentifier() : undefined; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 08313f832a2ad..2489c049b6885 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -348,7 +348,7 @@ namespace ts { LastKeyword = OfKeyword, FirstFutureReservedWord = ImplementsKeyword, LastFutureReservedWord = YieldKeyword, - FirstTypeNode = TypeReference, + FirstTypeNode = TypePredicate, LastTypeNode = ParenthesizedType, FirstPunctuation = OpenBraceToken, LastPunctuation = CaretEqualsToken, @@ -474,15 +474,29 @@ namespace ts { hasTrailingComma?: boolean; } - export interface ModifiersArray extends NodeArray { + export interface ModifiersArray extends NodeArray { flags: number; } + // @kind(SyntaxKind.AbstractKeyword) + // @kind(SyntaxKind.AsyncKeyword) + // @kind(SyntaxKind.ConstKeyword) + // @kind(SyntaxKind.DeclareKeyword) + // @kind(SyntaxKind.DefaultKeyword) + // @kind(SyntaxKind.ExportKeyword) + // @kind(SyntaxKind.PublicKeyword) + // @kind(SyntaxKind.PrivateKeyword) + // @kind(SyntaxKind.ProtectedKeyword) + // @kind(SyntaxKind.StaticKeyword) + export interface Modifier extends Node { } + + // @kind(SyntaxKind.Identifier) export interface Identifier extends PrimaryExpression { text: string; // Text of identifier (with escapes converted to characters) originalKeywordKind?: SyntaxKind; // Original syntaxKind which get set so that we can report an error later } + // @kind(SyntaxKind.QualifiedName) export interface QualifiedName extends Node { // Must have same layout as PropertyAccess left: EntityName; @@ -491,6 +505,8 @@ namespace ts { export type EntityName = Identifier | QualifiedName; + export type PropertyName = Identifier | LiteralExpression | ComputedPropertyName; + export type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern; export interface Declaration extends Node { @@ -498,14 +514,21 @@ namespace ts { name?: DeclarationName; } + export interface DeclarationStatement extends Declaration, Statement { + name?: Identifier; + } + + // @kind(SyntaxKind.ComputedPropertyName) export interface ComputedPropertyName extends Node { expression: Expression; } + // @kind(SyntaxKind.Decorator) export interface Decorator extends Node { expression: LeftHandSideExpression; } + // @kind(SyntaxKind.TypeParameter) export interface TypeParameterDeclaration extends Declaration { name: Identifier; constraint?: TypeNode; @@ -515,12 +538,19 @@ namespace ts { } export interface SignatureDeclaration extends Declaration { + name?: PropertyName; typeParameters?: NodeArray; parameters: NodeArray; type?: TypeNode; } - // SyntaxKind.VariableDeclaration + // @kind(SyntaxKind.CallSignature) + export interface CallSignatureDeclaration extends SignatureDeclaration, TypeElement { } + + // @kind(SyntaxKind.ConstructSignature) + export interface ConstructSignatureDeclaration extends SignatureDeclaration, TypeElement { } + + // @kind(SyntaxKind.VariableDeclaration) export interface VariableDeclaration extends Declaration { parent?: VariableDeclarationList; name: Identifier | BindingPattern; // Declared variable name @@ -528,11 +558,12 @@ namespace ts { initializer?: Expression; // Optional initializer } + // @kind(SyntaxKind.VariableDeclarationList) export interface VariableDeclarationList extends Node { declarations: NodeArray; } - // SyntaxKind.Parameter + // @kind(SyntaxKind.Parameter) export interface ParameterDeclaration extends Declaration { dotDotDotToken?: Node; // Present on rest parameter name: Identifier | BindingPattern; // Declared parameter name @@ -541,7 +572,7 @@ namespace ts { initializer?: Expression; // Optional initializer } - // SyntaxKind.BindingElement + // @kind(SyntaxKind.BindingElement) export interface BindingElement extends Declaration { propertyName?: Identifier; // Binding property name (in object binding pattern) dotDotDotToken?: Node; // Present on rest binding element @@ -549,27 +580,35 @@ namespace ts { initializer?: Expression; // Optional initializer } - // SyntaxKind.Property - export interface PropertyDeclaration extends Declaration, ClassElement { - name: DeclarationName; // Declared property name + // @kind(SyntaxKind.PropertySignature) + export interface PropertySignature extends TypeElement { + name: PropertyName; // Declared property name questionToken?: Node; // Present on optional property type?: TypeNode; // Optional type annotation + } + + // @kind(SyntaxKind.PropertyDeclaration) + export interface PropertyDeclaration extends ClassElement { + questionToken?: Node; // Present for use with reporting a grammar error + name: PropertyName; + type?: TypeNode; initializer?: Expression; // Optional initializer } export interface ObjectLiteralElement extends Declaration { _objectLiteralBrandBrand: any; - } + name?: PropertyName; + } - // SyntaxKind.PropertyAssignment + // @kind(SyntaxKind.PropertyAssignment) export interface PropertyAssignment extends ObjectLiteralElement { _propertyAssignmentBrand: any; - name: DeclarationName; + name: PropertyName; questionToken?: Node; initializer: Expression; } - // SyntaxKind.ShorthandPropertyAssignment + // @kind(SyntaxKind.ShorthandPropertyAssignment) export interface ShorthandPropertyAssignment extends ObjectLiteralElement { name: Identifier; questionToken?: Node; @@ -595,10 +634,20 @@ namespace ts { initializer?: Expression; } + export interface PropertyLikeDeclaration extends Declaration { + name: PropertyName; + } + export interface BindingPattern extends Node { elements: NodeArray; } + // @kind(SyntaxKind.ObjectBindingPattern) + export interface ObjectBindingPattern extends BindingPattern { } + + // @kind(SyntaxKind.ArrayBindingPattern) + export interface ArrayBindingPattern extends BindingPattern { } + /** * Several node kinds share function-like features such as a signature, * a name, and a body. These nodes should extend FunctionLikeDeclaration. @@ -615,9 +664,15 @@ namespace ts { body?: Block | Expression; } - export interface FunctionDeclaration extends FunctionLikeDeclaration, Statement { + // @kind(SyntaxKind.FunctionDeclaration) + export interface FunctionDeclaration extends FunctionLikeDeclaration, DeclarationStatement { name?: Identifier; - body?: Block; + body?: FunctionBody; + } + + // @kind(SyntaxKind.MethodSignature) + export interface MethodSignature extends SignatureDeclaration, TypeElement { + name: PropertyName; } // Note that a MethodDeclaration is considered both a ClassElement and an ObjectLiteralElement. @@ -629,15 +684,19 @@ namespace ts { // Because of this, it may be necessary to determine what sort of MethodDeclaration you have // at later stages of the compiler pipeline. In that case, you can either check the parent kind // of the method, or use helpers like isObjectLiteralMethodDeclaration + // @kind(SyntaxKind.MethodDeclaration) export interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement { - body?: Block; + name: PropertyName; + body?: FunctionBody; } + // @kind(SyntaxKind.Constructor) export interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement { - body?: Block; + body?: FunctionBody; } // For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. + // @kind(SyntaxKind.SemicolonClassElement) export interface SemicolonClassElement extends ClassElement { _semicolonClassElementBrand: any; } @@ -646,13 +705,27 @@ namespace ts { // ClassElement and an ObjectLiteralElement. export interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement { _accessorDeclarationBrand: any; - body: Block; + name: PropertyName; + body: FunctionBody; } - export interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement { + // @kind(SyntaxKind.GetAccessor) + export interface GetAccessorDeclaration extends AccessorDeclaration { } + + // @kind(SyntaxKind.SetAccessor) + export interface SetAccessorDeclaration extends AccessorDeclaration { } + + // @kind(SyntaxKind.IndexSignature) + export interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement, TypeElement { _indexSignatureDeclarationBrand: any; } + // @kind(SyntaxKind.AnyKeyword) + // @kind(SyntaxKind.NumberKeyword) + // @kind(SyntaxKind.BooleanKeyword) + // @kind(SyntaxKind.StringKeyword) + // @kind(SyntaxKind.SymbolKeyword) + // @kind(SyntaxKind.VoidKeyword) export interface TypeNode extends Node { _typeNodeBrand: any; } @@ -661,29 +734,41 @@ namespace ts { _functionOrConstructorTypeNodeBrand: any; } + // @kind(SyntaxKind.FunctionType) + export interface FunctionTypeNode extends FunctionOrConstructorTypeNode { } + + // @kind(SyntaxKind.ConstructorType) + export interface ConstructorTypeNode extends FunctionOrConstructorTypeNode { } + + // @kind(SyntaxKind.TypeReference) export interface TypeReferenceNode extends TypeNode { typeName: EntityName; typeArguments?: NodeArray; } + // @kind(SyntaxKind.TypePredicate) export interface TypePredicateNode extends TypeNode { parameterName: Identifier; type: TypeNode; } + // @kind(SyntaxKind.TypeQuery) export interface TypeQueryNode extends TypeNode { exprName: EntityName; } // A TypeLiteral is the declaration node for an anonymous symbol. + // @kind(SyntaxKind.TypeLiteral) export interface TypeLiteralNode extends TypeNode, Declaration { - members: NodeArray; + members: NodeArray; } + // @kind(SyntaxKind.ArrayType) export interface ArrayTypeNode extends TypeNode { elementType: TypeNode; } + // @kind(SyntaxKind.TupleType) export interface TupleTypeNode extends TypeNode { elementTypes: NodeArray; } @@ -692,16 +777,20 @@ namespace ts { types: NodeArray; } + // @kind(SyntaxKind.UnionType) export interface UnionTypeNode extends UnionOrIntersectionTypeNode { } + // @kind(SyntaxKind.IntersectionType) export interface IntersectionTypeNode extends UnionOrIntersectionTypeNode { } + // @kind(SyntaxKind.ParenthesizedType) export interface ParenthesizedTypeNode extends TypeNode { type: TypeNode; } // Note that a StringLiteral AST node is both an Expression and a TypeNode. The latter is // because string literals can appear in type annotations as well. + // @kind(SyntaxKind.StringLiteral) export interface StringLiteral extends LiteralExpression, TypeNode { _stringLiteralBrand: any; } @@ -718,6 +807,9 @@ namespace ts { contextualType?: Type; // Used to temporarily assign a contextual type during overload resolution } + // @kind(SyntaxKind.OmittedExpression) + export interface OmittedExpression extends Expression { } + export interface UnaryExpression extends Expression { _unaryExpressionBrand: any; } @@ -726,11 +818,13 @@ namespace ts { _incrementExpressionBrand: any; } + // @kind(SyntaxKind.PrefixUnaryExpression) export interface PrefixUnaryExpression extends IncrementExpression { operator: SyntaxKind; operand: UnaryExpression; } + // @kind(SyntaxKind.PostfixUnaryExpression) export interface PostfixUnaryExpression extends IncrementExpression { operand: LeftHandSideExpression; operator: SyntaxKind; @@ -748,37 +842,49 @@ namespace ts { _memberExpressionBrand: any; } + // @kind(SyntaxKind.TrueKeyword) + // @kind(SyntaxKind.FalseKeyword) + // @kind(SyntaxKind.NullKeyword) + // @kind(SyntaxKind.ThisKeyword) + // @kind(SyntaxKind.SuperKeyword) export interface PrimaryExpression extends MemberExpression { _primaryExpressionBrand: any; } + // @kind(SyntaxKind.DeleteExpression) export interface DeleteExpression extends UnaryExpression { expression: UnaryExpression; } + // @kind(SyntaxKind.TypeOfExpression) export interface TypeOfExpression extends UnaryExpression { expression: UnaryExpression; } + // @kind(SyntaxKind.VoidExpression) export interface VoidExpression extends UnaryExpression { expression: UnaryExpression; } + // @kind(SyntaxKind.AwaitExpression) export interface AwaitExpression extends UnaryExpression { expression: UnaryExpression; } + // @kind(SyntaxKind.YieldExpression) export interface YieldExpression extends Expression { asteriskToken?: Node; expression?: Expression; } + // @kind(SyntaxKind.BinaryExpression) export interface BinaryExpression extends Expression { left: Expression; operatorToken: Node; right: Expression; } + // @kind(SyntaxKind.ConditionalExpression) export interface ConditionalExpression extends Expression { condition: Expression; questionToken: Node; @@ -787,24 +893,37 @@ namespace ts { whenFalse: Expression; } + export type FunctionBody = Block; + export type ConciseBody = FunctionBody | Expression; + + // @kind(SyntaxKind.FunctionExpression) export interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration { name?: Identifier; - body: Block | Expression; // Required, whereas the member inherited from FunctionDeclaration is optional + body: FunctionBody; // Required, whereas the member inherited from FunctionDeclaration is optional } + // @kind(SyntaxKind.ArrowFunction) export interface ArrowFunction extends Expression, FunctionLikeDeclaration { equalsGreaterThanToken: Node; + body: ConciseBody; } // The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral, // or any literal of a template, this means quotes have been removed and escapes have been converted to actual characters. // For a NumericLiteral, the stored value is the toString() representation of the number. For example 1, 1.00, and 1e0 are all stored as just "1". + // @kind(SyntaxKind.NumericLiteral) + // @kind(SyntaxKind.RegularExpressionLiteral) + // @kind(SyntaxKind.NoSubstitutionTemplateLiteral) + // @kind(SyntaxKind.TemplateHead) + // @kind(SyntaxKind.TemplateMiddle) + // @kind(SyntaxKind.TemplateTail) export interface LiteralExpression extends PrimaryExpression { text: string; isUnterminated?: boolean; hasExtendedUnicodeEscape?: boolean; } + // @kind(SyntaxKind.TemplateExpression) export interface TemplateExpression extends PrimaryExpression { head: LiteralExpression; templateSpans: NodeArray; @@ -812,52 +931,63 @@ namespace ts { // Each of these corresponds to a substitution expression and a template literal, in that order. // The template literal must have kind TemplateMiddleLiteral or TemplateTailLiteral. + // @kind(SyntaxKind.TemplateSpan) export interface TemplateSpan extends Node { expression: Expression; literal: LiteralExpression; } + // @kind(SyntaxKind.ParenthesizedExpression) export interface ParenthesizedExpression extends PrimaryExpression { expression: Expression; } + // @kind(SyntaxKind.ArrayLiteralExpression) export interface ArrayLiteralExpression extends PrimaryExpression { elements: NodeArray; } + // @kind(SyntaxKind.SpreadElementExpression) export interface SpreadElementExpression extends Expression { expression: Expression; } // An ObjectLiteralExpression is the declaration node for an anonymous symbol. + // @kind(SyntaxKind.ObjectLiteralExpression) export interface ObjectLiteralExpression extends PrimaryExpression, Declaration { properties: NodeArray; } + // @kind(SyntaxKind.PropertyAccessExpression) export interface PropertyAccessExpression extends MemberExpression { expression: LeftHandSideExpression; dotToken: Node; name: Identifier; } + // @kind(SyntaxKind.ElementAccessExpression) export interface ElementAccessExpression extends MemberExpression { expression: LeftHandSideExpression; argumentExpression?: Expression; } + // @kind(SyntaxKind.CallExpression) export interface CallExpression extends LeftHandSideExpression { expression: LeftHandSideExpression; typeArguments?: NodeArray; arguments: NodeArray; } + // @kind(SyntaxKind.ExpressionWithTypeArguments) export interface ExpressionWithTypeArguments extends TypeNode { expression: LeftHandSideExpression; typeArguments?: NodeArray; } + // @kind(SyntaxKind.NewExpression) export interface NewExpression extends CallExpression, PrimaryExpression { } + // @kind(SyntaxKind.TaggedTemplateExpression) export interface TaggedTemplateExpression extends MemberExpression { tag: LeftHandSideExpression; template: LiteralExpression | TemplateExpression; @@ -865,11 +995,13 @@ namespace ts { export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator; + // @kind(SyntaxKind.AsExpression) export interface AsExpression extends Expression { expression: Expression; type: TypeNode; } + // @kind(SyntaxKind.TypeAssertionExpression) export interface TypeAssertion extends UnaryExpression { type: TypeNode; expression: UnaryExpression; @@ -878,6 +1010,7 @@ namespace ts { export type AssertionExpression = TypeAssertion | AsExpression; /// A JSX expression of the form ... + // @kind(SyntaxKind.JsxElement) export interface JsxElement extends PrimaryExpression { openingElement: JsxOpeningElement; children: NodeArray; @@ -885,6 +1018,7 @@ namespace ts { } /// The opening element of a ... JsxElement + // @kind(SyntaxKind.JsxOpeningElement) export interface JsxOpeningElement extends Expression { _openingElementBrand?: any; tagName: EntityName; @@ -892,6 +1026,7 @@ namespace ts { } /// A JSX expression of the form + // @kind(SyntaxKind.JsxSelfClosingElement) export interface JsxSelfClosingElement extends PrimaryExpression, JsxOpeningElement { _selfClosingElementBrand?: any; } @@ -899,24 +1034,29 @@ namespace ts { /// Either the opening tag in a ... pair, or the lone in a self-closing form export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement; + // @kind(SyntaxKind.JsxAttribute) export interface JsxAttribute extends Node { name: Identifier; /// JSX attribute initializers are optional; is sugar for initializer?: Expression; } + // @kind(SyntaxKind.JsxSpreadAttribute) export interface JsxSpreadAttribute extends Node { expression: Expression; } + // @kind(SyntaxKind.JsxClosingElement) export interface JsxClosingElement extends Node { tagName: EntityName; } + // @kind(SyntaxKind.JsxExpression) export interface JsxExpression extends Expression { expression?: Expression; } + // @kind(SyntaxKind.JsxText) export interface JsxText extends Node { _jsxTextExpressionBrand: any; } @@ -927,18 +1067,36 @@ namespace ts { _statementBrand: any; } + // @kind(SyntaxKind.EmptyStatement) + export interface EmptyStatement extends Statement { } + + // @kind(SyntaxKind.DebuggerStatement) + export interface DebuggerStatement extends Statement { } + + // @kind(SyntaxKind.MissingDeclaration) + // @factoryhidden("name", true) + export interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement { + name?: Identifier; + } + + export type BlockLike = SourceFile | Block | ModuleBlock | CaseClause; + + // @kind(SyntaxKind.Block) export interface Block extends Statement { statements: NodeArray; } + // @kind(SyntaxKind.VariableStatement) export interface VariableStatement extends Statement { declarationList: VariableDeclarationList; } + // @kind(SyntaxKind.ExpressionStatement) export interface ExpressionStatement extends Statement { expression: Expression; } + // @kind(SyntaxKind.IfStatement) export interface IfStatement extends Statement { expression: Expression; thenStatement: Statement; @@ -949,78 +1107,101 @@ namespace ts { statement: Statement; } + // @kind(SyntaxKind.DoStatement) export interface DoStatement extends IterationStatement { expression: Expression; } + // @kind(SyntaxKind.WhileStatement) export interface WhileStatement extends IterationStatement { expression: Expression; } + // @kind(SyntaxKind.ForStatement) export interface ForStatement extends IterationStatement { initializer?: VariableDeclarationList | Expression; condition?: Expression; incrementor?: Expression; } + // @kind(SyntaxKind.ForInStatement) export interface ForInStatement extends IterationStatement { initializer: VariableDeclarationList | Expression; expression: Expression; } + // @kind(SyntaxKind.ForOfStatement) export interface ForOfStatement extends IterationStatement { initializer: VariableDeclarationList | Expression; expression: Expression; } - export interface BreakOrContinueStatement extends Statement { + // @kind(SyntaxKind.BreakStatement) + export interface BreakStatement extends Statement { label?: Identifier; } + // @kind(SyntaxKind.ContinueStatement) + export interface ContinueStatement extends Statement { + label?: Identifier; + } + + export type BreakOrContinueStatement = BreakStatement | ContinueStatement; + + // @kind(SyntaxKind.ReturnStatement) export interface ReturnStatement extends Statement { expression?: Expression; } + // @kind(SyntaxKind.WithStatement) export interface WithStatement extends Statement { expression: Expression; statement: Statement; } + // @kind(SyntaxKind.SwitchStatement) export interface SwitchStatement extends Statement { expression: Expression; caseBlock: CaseBlock; } + // @kind(SyntaxKind.CaseBlock) export interface CaseBlock extends Node { clauses: NodeArray; } + // @kind(SyntaxKind.CaseClause) export interface CaseClause extends Node { expression?: Expression; statements: NodeArray; } + // @kind(SyntaxKind.DefaultClause) export interface DefaultClause extends Node { statements: NodeArray; } export type CaseOrDefaultClause = CaseClause | DefaultClause; + // @kind(SyntaxKind.LabeledStatement) export interface LabeledStatement extends Statement { label: Identifier; statement: Statement; } + // @kind(SyntaxKind.ThrowStatement) export interface ThrowStatement extends Statement { expression: Expression; } + // @kind(SyntaxKind.TryStatement) export interface TryStatement extends Statement { tryBlock: Block; catchClause?: CatchClause; finallyBlock?: Block; } + // @kind(SyntaxKind.CatchClause) export interface CatchClause extends Node { variableDeclaration: VariableDeclaration; block: Block; @@ -1033,34 +1214,49 @@ namespace ts { members: NodeArray; } - export interface ClassDeclaration extends ClassLikeDeclaration, Statement { + // @kind(SyntaxKind.ClassDeclaration) + export interface ClassDeclaration extends ClassLikeDeclaration, DeclarationStatement { + name?: Identifier; } + // @kind(SyntaxKind.ClassExpression) export interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression { } export interface ClassElement extends Declaration { _classElementBrand: any; + name?: PropertyName; } - export interface InterfaceDeclaration extends Declaration, Statement { + export interface TypeElement extends Declaration { + _typeElementBrand: any; + name?: PropertyName; + // @factoryparam + questionToken?: Node; + } + + // @kind(SyntaxKind.InterfaceDeclaration) + export interface InterfaceDeclaration extends DeclarationStatement { name: Identifier; typeParameters?: NodeArray; heritageClauses?: NodeArray; - members: NodeArray; + members: NodeArray; } + // @kind(SyntaxKind.HeritageClause) export interface HeritageClause extends Node { token: SyntaxKind; types?: NodeArray; } - export interface TypeAliasDeclaration extends Declaration, Statement { + // @kind(SyntaxKind.TypeAliasDeclaration) + export interface TypeAliasDeclaration extends DeclarationStatement { name: Identifier; typeParameters?: NodeArray; type: TypeNode; } + // @kind(SyntaxKind.EnumMember) export interface EnumMember extends Declaration { // This does include ComputedPropertyName, but the parser will give an error // if it parses a ComputedPropertyName in an EnumMember @@ -1068,21 +1264,27 @@ namespace ts { initializer?: Expression; } - export interface EnumDeclaration extends Declaration, Statement { + // @kind(SyntaxKind.EnumDeclaration) + export interface EnumDeclaration extends DeclarationStatement { name: Identifier; members: NodeArray; } - export interface ModuleDeclaration extends Declaration, Statement { + export type ModuleBody = ModuleBlock | ModuleDeclaration; + + // @kind(SyntaxKind.ModuleDeclaration) + export interface ModuleDeclaration extends DeclarationStatement { name: Identifier | LiteralExpression; body: ModuleBlock | ModuleDeclaration; } + // @kind(SyntaxKind.ModuleBlock) export interface ModuleBlock extends Node, Statement { statements: NodeArray; } - export interface ImportEqualsDeclaration extends Declaration, Statement { + // @kind(SyntaxKind.ImportEqualsDeclaration) + export interface ImportEqualsDeclaration extends DeclarationStatement { name: Identifier; // 'EntityName' for an internal module reference, 'ExternalModuleReference' for an external @@ -1090,6 +1292,7 @@ namespace ts { moduleReference: EntityName | ExternalModuleReference; } + // @kind(SyntaxKind.ExternalModuleReference) export interface ExternalModuleReference extends Node { expression?: Expression; } @@ -1098,6 +1301,7 @@ namespace ts { // import "mod" => importClause = undefined, moduleSpecifier = "mod" // In rest of the cases, module specifier is string literal corresponding to module // ImportClause information is shown at its declaration below. + // @kind(SyntaxKind.ImportDeclaration) export interface ImportDeclaration extends Statement { importClause?: ImportClause; moduleSpecifier: Expression; @@ -1109,36 +1313,51 @@ namespace ts { // import d, * as ns from "mod" => name = d, namedBinding: NamespaceImport = { name: ns } // import { a, b as x } from "mod" => name = undefined, namedBinding: NamedImports = { elements: [{ name: a }, { name: x, propertyName: b}]} // import d, { a, b as x } from "mod" => name = d, namedBinding: NamedImports = { elements: [{ name: a }, { name: x, propertyName: b}]} + // @kind(SyntaxKind.ImportClause) export interface ImportClause extends Declaration { name?: Identifier; // Default binding namedBindings?: NamespaceImport | NamedImports; } + // @kind(SyntaxKind.NamespaceImport) export interface NamespaceImport extends Declaration { name: Identifier; } - export interface ExportDeclaration extends Declaration, Statement { + // @kind(SyntaxKind.ExportDeclaration) + export interface ExportDeclaration extends DeclarationStatement { exportClause?: NamedExports; moduleSpecifier?: Expression; } - export interface NamedImportsOrExports extends Node { - elements: NodeArray; + // @kind(SyntaxKind.NamedImports) + export interface NamedImports extends Node { + elements: NodeArray; } - export type NamedImports = NamedImportsOrExports; - export type NamedExports = NamedImportsOrExports; + // @kind(SyntaxKind.NamedExports) + export interface NamedExports extends Node { + elements: NodeArray; + } + + export type NamedImportsOrExports = NamedImports | NamedExports; - export interface ImportOrExportSpecifier extends Declaration { + // @kind(SyntaxKind.ImportSpecifier) + export interface ImportSpecifier extends Declaration { propertyName?: Identifier; // Name preceding "as" keyword (or undefined when "as" is absent) name: Identifier; // Declared name } - export type ImportSpecifier = ImportOrExportSpecifier; - export type ExportSpecifier = ImportOrExportSpecifier; + // @kind(SyntaxKind.ExportSpecifier) + export interface ExportSpecifier extends Declaration { + propertyName?: Identifier; // Name preceding "as" keyword (or undefined when "as" is absent) + name: Identifier; // Declared name + } + + export type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier; - export interface ExportAssignment extends Declaration, Statement { + // @kind(SyntaxKind.ExportAssignment) + export interface ExportAssignment extends DeclarationStatement { isExportEquals?: boolean; expression: Expression; } @@ -1153,6 +1372,7 @@ namespace ts { } // represents a top level: { type } expression in a JSDoc comment. + // @kind(SyntaxKind.JSDocTypeExpression) export interface JSDocTypeExpression extends Node { type: JSDocType; } @@ -1161,90 +1381,111 @@ namespace ts { _jsDocTypeBrand: any; } + // @kind(SyntaxKind.JSDocAllType) export interface JSDocAllType extends JSDocType { _JSDocAllTypeBrand: any; } + // @kind(SyntaxKind.JSDocUnknownType) export interface JSDocUnknownType extends JSDocType { _JSDocUnknownTypeBrand: any; } + // @kind(SyntaxKind.JSDocArrayType) export interface JSDocArrayType extends JSDocType { elementType: JSDocType; } + // @kind(SyntaxKind.JSDocUnionType) export interface JSDocUnionType extends JSDocType { types: NodeArray; } + // @kind(SyntaxKind.JSDocTupleType) export interface JSDocTupleType extends JSDocType { types: NodeArray; } + // @kind(SyntaxKind.JSDocNonNullableType) export interface JSDocNonNullableType extends JSDocType { type: JSDocType; } + // @kind(SyntaxKind.JSDocNullableType) export interface JSDocNullableType extends JSDocType { type: JSDocType; } + // @kind(SyntaxKind.JSDocRecordType) export interface JSDocRecordType extends JSDocType, TypeLiteralNode { members: NodeArray; } + // @kind(SyntaxKind.JSDocTypeReference) export interface JSDocTypeReference extends JSDocType { name: EntityName; typeArguments: NodeArray; } + // @kind(SyntaxKind.JSDocOptionalType) export interface JSDocOptionalType extends JSDocType { type: JSDocType; } + // @kind(SyntaxKind.JSDocFunctionType) export interface JSDocFunctionType extends JSDocType, SignatureDeclaration { parameters: NodeArray; type: JSDocType; } + // @kind(SyntaxKind.JSDocVariadicType) export interface JSDocVariadicType extends JSDocType { type: JSDocType; } + // @kind(SyntaxKind.JSDocConstructorType) export interface JSDocConstructorType extends JSDocType { type: JSDocType; } + // @kind(SyntaxKind.JSDocThisType) export interface JSDocThisType extends JSDocType { type: JSDocType; } - export interface JSDocRecordMember extends PropertyDeclaration { + // @kind(SyntaxKind.JSDocRecordMember) + export interface JSDocRecordMember extends PropertySignature { name: Identifier | LiteralExpression; type?: JSDocType; } + // @kind(SyntaxKind.JSDocComment) export interface JSDocComment extends Node { tags: NodeArray; } + // @kind(SyntaxKind.JSDocTag) export interface JSDocTag extends Node { atToken: Node; tagName: Identifier; } + // @kind(SyntaxKind.JSDocTemplateTag) export interface JSDocTemplateTag extends JSDocTag { typeParameters: NodeArray; } + // @kind(SyntaxKind.JSDocReturnTag) export interface JSDocReturnTag extends JSDocTag { typeExpression: JSDocTypeExpression; } + // @kind(SyntaxKind.JSDocTypeTag) export interface JSDocTypeTag extends JSDocTag { typeExpression: JSDocTypeExpression; } + // @kind(SyntaxKind.JSDocParameterTag) export interface JSDocParameterTag extends JSDocTag { preParameterName?: Identifier; typeExpression?: JSDocTypeExpression; @@ -1252,7 +1493,13 @@ namespace ts { isBracketed: boolean; } + export interface AmdDependency { + path: string; + name: string; + } + // Source files are declarations when they are external modules. + // @kind(SyntaxKind.SourceFile) export interface SourceFile extends Declaration { statements: NodeArray; endOfFileToken: Node; @@ -1261,7 +1508,7 @@ namespace ts { /* internal */ path: Path; text: string; - amdDependencies: {path: string; name: string}[]; + amdDependencies: AmdDependency[]; moduleName: string; referencedFiles: FileReference[]; languageVariant: LanguageVariant; @@ -2336,7 +2583,7 @@ namespace ts { export interface ModuleResolutionHost { fileExists(fileName: string): boolean; // readFile function is used to read arbitrary text files on disk, i.e. when resolution procedure needs the content of 'package.json' - // to determine location of bundled typings for node module + // to determine location of bundled typings for node module readFile(fileName: string): string; } @@ -2344,7 +2591,7 @@ namespace ts { resolvedFileName: string; /* * Denotes if 'resolvedFileName' is isExternalLibraryImport and thus should be proper external module: - * - be a .d.ts file + * - be a .d.ts file * - use top level imports\exports * - don't use tripleslash references */ @@ -2367,11 +2614,11 @@ namespace ts { getNewLine(): string; /* - * CompilerHost must either implement resolveModuleNames (in case if it wants to be completely in charge of - * module name resolution) or provide implementation for methods from ModuleResolutionHost (in this case compiler + * CompilerHost must either implement resolveModuleNames (in case if it wants to be completely in charge of + * module name resolution) or provide implementation for methods from ModuleResolutionHost (in this case compiler * will appply built-in module resolution logic and use members of ModuleResolutionHost to ask host specific questions). - * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just - * 'throw new Error("NotImplemented")' + * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just + * 'throw new Error("NotImplemented")' */ resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[]; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 17d780df57458..199ca4e636f41 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1273,7 +1273,7 @@ namespace ts { } // True if the given identifier, string literal, or number literal is the name of a declaration node - export function isDeclarationName(name: Node): boolean { + export function isDeclarationName(name: Node): name is Identifier | StringLiteral | LiteralExpression { if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) { return false; } @@ -1483,7 +1483,7 @@ namespace ts { return node.kind === SyntaxKind.Identifier && (node).text === "Symbol"; } - export function isModifier(token: SyntaxKind): boolean { + export function isModifierKind(token: SyntaxKind): boolean { switch (token) { case SyntaxKind.AbstractKeyword: case SyntaxKind.AsyncKeyword: diff --git a/src/services/services.ts b/src/services/services.ts index 113a52459e9cb..529a70b14536b 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -132,43 +132,43 @@ namespace ts { let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); let emptyArray: any[] = []; - + const jsDocTagNames = [ - "augments", - "author", - "argument", - "borrows", - "class", - "constant", - "constructor", - "constructs", - "default", - "deprecated", - "description", - "event", - "example", - "extends", - "field", - "fileOverview", - "function", - "ignore", - "inner", - "lends", - "link", - "memberOf", - "name", - "namespace", - "param", - "private", - "property", - "public", - "requires", - "returns", - "see", - "since", - "static", - "throws", - "type", + "augments", + "author", + "argument", + "borrows", + "class", + "constant", + "constructor", + "constructs", + "default", + "deprecated", + "description", + "event", + "example", + "extends", + "field", + "fileOverview", + "function", + "ignore", + "inner", + "lends", + "link", + "memberOf", + "name", + "namespace", + "param", + "private", + "property", + "public", + "requires", + "returns", + "see", + "since", + "static", + "throws", + "type", "version" ]; let jsDocCompletionEntries: CompletionEntry[]; @@ -816,7 +816,7 @@ namespace ts { constructor(kind: SyntaxKind, pos: number, end: number) { super(kind, pos, end) } - + public update(newText: string, textChangeRange: TextChangeRange): SourceFile { return updateSourceFile(this, newText, textChangeRange); } @@ -1030,7 +1030,7 @@ namespace ts { /* * LS host can optionally implement this method if it wants to be completely in charge of module name resolution. - * if implementation is omitted then language service will use built-in module resolution logic and get answers to + * if implementation is omitted then language service will use built-in module resolution logic and get answers to * host specific questions using 'getScriptSnapshot'. */ resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[]; @@ -1854,7 +1854,7 @@ namespace ts { * - allowNonTsExtensions = true * - noLib = true * - noResolve = true - */ + */ export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); @@ -2574,7 +2574,7 @@ namespace ts { } } - export function createLanguageService(host: LanguageServiceHost, + export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService { let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); @@ -2662,10 +2662,10 @@ namespace ts { getDefaultLibFileName: (options) => host.getDefaultLibFileName(options), writeFile: (fileName, data, writeByteOrderMark) => { }, getCurrentDirectory: () => currentDirectory, - fileExists: (fileName): boolean => { + fileExists: (fileName): boolean => { // stub missing host functionality Debug.assert(!host.resolveModuleNames); - return hostCache.getOrCreateEntry(fileName) !== undefined; + return hostCache.getOrCreateEntry(fileName) !== undefined; }, readFile: (fileName): string => { // stub missing host functionality @@ -3068,7 +3068,7 @@ namespace ts { log("getCompletionData: Is inside comment: " + (new Date().getTime() - start)); if (insideComment) { - // The current position is next to the '@' sign, when no tag name being provided yet. + // The current position is next to the '@' sign, when no tag name being provided yet. // Provide a full list of tag names if (hasDocComment(sourceFile, position) && sourceFile.text.charCodeAt(position - 1) === CharacterCodes.at) { isJsDocTagName = true; @@ -3101,7 +3101,7 @@ namespace ts { } if (!insideJsDocTagExpression) { - // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal + // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal // comment or the plain text part of a jsDoc comment, so no completion should be available log("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment."); return undefined; @@ -3622,8 +3622,8 @@ namespace ts { case SyntaxKind.CloseBraceToken: if (parent && - parent.kind === SyntaxKind.JsxExpression && - parent.parent && + parent.kind === SyntaxKind.JsxExpression && + parent.parent && (parent.parent.kind === SyntaxKind.JsxAttribute)) { return parent.parent.parent; } @@ -3672,7 +3672,7 @@ namespace ts { containingNodeKind === SyntaxKind.InterfaceDeclaration || // interface A Date: Tue, 10 Nov 2015 13:36:19 -0800 Subject: [PATCH 181/353] Add file content as a parameter for the tsserver open command --- src/server/editorServices.ts | 10 ++++++---- src/server/protocol.d.ts | 1 + src/server/session.ts | 10 +++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 333cea2745d6f..45d987ea53456 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1006,14 +1006,15 @@ namespace ts.server { /** * @param filename is absolute pathname + * @param fileContent is a known version of the file content that is more up to date */ - openFile(fileName: string, openedByClient: boolean) { + openFile(fileName: string, openedByClient: boolean, fileContent?: string) { fileName = ts.normalizePath(fileName); let info = ts.lookUp(this.filenameToScriptInfo, fileName); if (!info) { let content: string; if (this.host.fileExists(fileName)) { - content = this.host.readFile(fileName); + content = fileContent ? fileContent : this.host.readFile(fileName); } if (!content) { if (openedByClient) { @@ -1060,10 +1061,11 @@ namespace ts.server { /** * Open file whose contents is managed by the client * @param filename is absolute pathname + * @param fileContent is a known version of the file content that is more up to date */ - openClientFile(fileName: string) { + openClientFile(fileName: string, fileContent?: string) { this.openOrUpdateConfiguredProjectForFile(fileName); - const info = this.openFile(fileName, true); + const info = this.openFile(fileName, true, fileContent); this.addOpenFile(info); this.printProjects(); return info; diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts index ad1fc5e92de2a..6354a3a37aeb0 100644 --- a/src/server/protocol.d.ts +++ b/src/server/protocol.d.ts @@ -513,6 +513,7 @@ declare namespace ts.server.protocol { * Information found in an "open" request. */ export interface OpenRequestArgs extends FileRequestArgs { + fileContent?: string; } /** diff --git a/src/server/session.ts b/src/server/session.ts index 770256cc9f700..c589c528ec22f 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -532,9 +532,13 @@ namespace ts.server { }; } - private openClientFile(fileName: string) { + /** + * @param fileName is the name of the file to be opened + * @param fileContent is a version of the file content that is known to be more up to date + */ + private openClientFile(fileName: string, fileContent?: string) { const file = ts.normalizePath(fileName); - this.projectService.openClientFile(file); + this.projectService.openClientFile(file, fileContent); } private getQuickInfo(line: number, offset: number, fileName: string): protocol.QuickInfoResponseBody { @@ -968,7 +972,7 @@ namespace ts.server { }, [CommandNames.Open]: (request: protocol.Request) => { const openArgs = request.arguments; - this.openClientFile(openArgs.file); + this.openClientFile(openArgs.file, openArgs.fileContent); return {responseRequired: false}; }, [CommandNames.Quickinfo]: (request: protocol.Request) => { From 2a370c9aa7ad5d1d12fb83508f99cd1f08b42d2b Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 14:40:19 -0800 Subject: [PATCH 182/353] Added tests for string literal types used as generic constraints. --- ...LiteralTypesAsTypeParameterConstraint01.ts | 19 +++++++++++++++++++ ...LiteralTypesAsTypeParameterConstraint02.ts | 8 ++++++++ 2 files changed, 27 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts new file mode 100644 index 0000000000000..53f516f4209b9 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts @@ -0,0 +1,19 @@ +// @declaration: true + +function foo(f: (x: T) => T) { + return f; +} + +function bar(f: (x: T) => T) { + return f; +} + +let f = foo(x => x); +let fResult = f("foo"); + +let g = foo((x => x)); +let gResult = g("foo"); + +let h = bar(x => x); +let hResult = h("foo"); +hResult = h("bar"); \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts new file mode 100644 index 0000000000000..fb3a019402dae --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts @@ -0,0 +1,8 @@ +// @declaration: true + +function foo(f: (x: T) => T) { + return f; +} + +let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo"); +let fResult = f("foo"); \ No newline at end of file From ebd7d2d93e914819f1b15b4e7e75d7da3905adad Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 10 Nov 2015 16:48:08 -0800 Subject: [PATCH 183/353] extract method --- src/harness/compilerRunner.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index f7bb23527dddd..4a599e968121f 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -40,6 +40,10 @@ class CompilerBaselineRunner extends RunnerBase { this.basePath += "/" + this.testSuiteName; } + private makeUnitName(name: string, root: string) { + return ts.isRootedDiskPath(name) ? name : (root + name); + }; + public checkTestCodeOutput(fileName: string) { describe("compiler tests for " + fileName, () => { // Mocha holds onto the closure environment of the describe callback even after the test is done. @@ -74,16 +78,16 @@ class CompilerBaselineRunner extends RunnerBase { toBeCompiled = []; otherFiles = []; if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) { - toBeCompiled.push({ unitName: ts.isRootedDiskPath(lastUnit.name) ? lastUnit.name : rootDir + lastUnit.name, content: lastUnit.content }); + toBeCompiled.push({ unitName: this.makeUnitName(lastUnit.name, rootDir), content: lastUnit.content }); units.forEach(unit => { if (unit.name !== lastUnit.name) { - otherFiles.push({ unitName: ts.isRootedDiskPath(unit.name) ? unit.name : rootDir + unit.name, content: unit.content }); + otherFiles.push({ unitName: this.makeUnitName(unit.name, rootDir), content: unit.content }); } }); } else { toBeCompiled = units.map(unit => { - return { unitName: ts.isRootedDiskPath(unit.name) ? unit.name : rootDir + unit.name, content: unit.content }; + return { unitName: this.makeUnitName(unit.name, rootDir), content: unit.content }; }); } From fe3fb178544d4600fe70248b7ce0797fd0099ce5 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 10 Nov 2015 17:36:37 -0800 Subject: [PATCH 184/353] Use printVersion instead --- src/compiler/tsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 9d79d435a04aa..636f76b379964 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -180,7 +180,7 @@ namespace ts { } if (commandLine.options.version) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version)); + printVersion(); return sys.exit(ExitStatus.Success); } From 9d3d49d636e69715c45bcd5d3632531a61874927 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 16:17:28 -0800 Subject: [PATCH 185/353] Only get the apparent type when necessary. --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e0e9a6e620f54..4fe04cae13a46 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6966,7 +6966,7 @@ namespace ts { else if (operator === SyntaxKind.BarBarToken) { // When an || expression has a contextual type, the operands are contextually typed by that type. When an || // expression has no contextual type, the right operand is contextually typed by the type of the left operand. - let type = getApparentTypeOfContextualType(binaryExpression); + let type = getContextualType(binaryExpression); if (!type && node === binaryExpression.right) { type = checkExpression(binaryExpression.left); } @@ -7081,7 +7081,7 @@ namespace ts { // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type. function getContextualTypeForConditionalOperand(node: Expression): Type { const conditional = node.parent; - return node === conditional.whenTrue || node === conditional.whenFalse ? getApparentTypeOfContextualType(conditional) : undefined; + return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined; } function getContextualTypeForJsxExpression(expr: JsxExpression | JsxSpreadAttribute): Type { @@ -7160,7 +7160,7 @@ namespace ts { Debug.assert(parent.parent.kind === SyntaxKind.TemplateExpression); return getContextualTypeForSubstitutionExpression(parent.parent, node); case SyntaxKind.ParenthesizedExpression: - return getApparentTypeOfContextualType(parent); + return getContextualType(parent); case SyntaxKind.JsxExpression: case SyntaxKind.JsxSpreadAttribute: return getContextualTypeForJsxExpression(parent); From ce455dac2b3ce3b0255be7441b2f84a24f9369b1 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 22:43:07 -0800 Subject: [PATCH 186/353] Accepted baselines. --- ...esAndParenthesizedExpressions01.errors.txt | 17 ----- ...TypesAndParenthesizedExpressions01.symbols | 19 +++++ ...alTypesAndParenthesizedExpressions01.types | 33 ++++++++ ...LiteralTypesAsTypeParameterConstraint01.js | 68 +++++++++++++++++ ...alTypesAsTypeParameterConstraint01.symbols | 60 +++++++++++++++ ...eralTypesAsTypeParameterConstraint01.types | 76 +++++++++++++++++++ ...ypesAsTypeParameterConstraint02.errors.txt | 15 ++++ ...LiteralTypesAsTypeParameterConstraint02.js | 21 +++++ 8 files changed, 292 insertions(+), 17 deletions(-) delete mode 100644 tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types create mode 100644 tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js create mode 100644 tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types create mode 100644 tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt deleted file mode 100644 index 93d8a213d0fee..0000000000000 --- a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts(4,5): error TS2322: Type 'string' is not assignable to type '"foo"'. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts(6,5): error TS2322: Type 'string' is not assignable to type '"foo"'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts (2 errors) ==== - - declare function myRandBool(): boolean; - - let a: "foo" = ("foo"); - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. - let b: "foo" | "bar" = ("foo"); - let c: "foo" = (myRandBool ? "foo" : ("foo")); - ~ -!!! error TS2322: Type 'string' is not assignable to type '"foo"'. - let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); - \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols new file mode 100644 index 0000000000000..2206a5185c1af --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.symbols @@ -0,0 +1,19 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts === + +declare function myRandBool(): boolean; +>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0)) + +let a: "foo" = ("foo"); +>a : Symbol(a, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 3, 3)) + +let b: "foo" | "bar" = ("foo"); +>b : Symbol(b, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 4, 3)) + +let c: "foo" = (myRandBool ? "foo" : ("foo")); +>c : Symbol(c, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 5, 3)) +>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0)) + +let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); +>d : Symbol(d, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 6, 3)) +>myRandBool : Symbol(myRandBool, Decl(stringLiteralTypesAndParenthesizedExpressions01.ts, 0, 0)) + diff --git a/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types new file mode 100644 index 0000000000000..0bb2e1dd3c7b8 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAndParenthesizedExpressions01.types @@ -0,0 +1,33 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01.ts === + +declare function myRandBool(): boolean; +>myRandBool : () => boolean + +let a: "foo" = ("foo"); +>a : "foo" +>("foo") : "foo" +>"foo" : "foo" + +let b: "foo" | "bar" = ("foo"); +>b : "foo" | "bar" +>("foo") : "foo" +>"foo" : "foo" + +let c: "foo" = (myRandBool ? "foo" : ("foo")); +>c : "foo" +>(myRandBool ? "foo" : ("foo")) : "foo" +>myRandBool ? "foo" : ("foo") : "foo" +>myRandBool : () => boolean +>"foo" : "foo" +>("foo") : "foo" +>"foo" : "foo" + +let d: "foo" | "bar" = (myRandBool ? "foo" : ("bar")); +>d : "foo" | "bar" +>(myRandBool ? "foo" : ("bar")) : "foo" | "bar" +>myRandBool ? "foo" : ("bar") : "foo" | "bar" +>myRandBool : () => boolean +>"foo" : "foo" +>("bar") : "bar" +>"bar" : "bar" + diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js new file mode 100644 index 0000000000000..558f6bdf4c2fd --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js @@ -0,0 +1,68 @@ +//// [stringLiteralTypesAsTypeParameterConstraint01.ts] + +function foo(f: (x: T) => T) { + return f; +} + +function bar(f: (x: T) => T) { + return f; +} + +let f = foo(x => x); +let fResult = f("foo"); + +let g = foo((x => x)); +let gResult = g("foo"); + +let h = bar(x => x); +let hResult = h("foo"); +hResult = h("bar"); + +//// [stringLiteralTypesAsTypeParameterConstraint01.js] +function foo(f) { + return f; +} +function bar(f) { + return f; +} +var f = foo(function (x) { return x; }); +var fResult = f("foo"); +var g = foo((function (x) { return x; })); +var gResult = g("foo"); +var h = bar(function (x) { return x; }); +var hResult = h("foo"); +hResult = h("bar"); + + +//// [stringLiteralTypesAsTypeParameterConstraint01.d.ts] +declare function foo(f: (x: T) => T): (x: T) => T; +declare function bar(f: (x: T) => T): (x: T) => T; +declare let f: (x: "foo") => "foo"; +declare let fResult: "foo"; +declare let g: (x: "foo") => "foo"; +declare let gResult: "foo"; +declare let h: (x: "foo" | "bar") => "foo" | "bar"; +declare let hResult: "foo" | "bar"; + + +//// [DtsFileErrors] + + +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(3,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(5,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts (2 errors) ==== + declare function foo(f: (x: T) => T): (x: T) => T; + declare function bar(f: (x: T) => T): (x: T) => T; + declare let f: (x: "foo") => "foo"; + ~~~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + declare let fResult: "foo"; + declare let g: (x: "foo") => "foo"; + ~~~~~~~~~~~~~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + declare let gResult: "foo"; + declare let h: (x: "foo" | "bar") => "foo" | "bar"; + declare let hResult: "foo" | "bar"; + \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols new file mode 100644 index 0000000000000..fd633b6e4d912 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.symbols @@ -0,0 +1,60 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts === + +function foo(f: (x: T) => T) { +>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13)) +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 30)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 34)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 13)) + + return f; +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 1, 30)) +} + +function bar(f: (x: T) => T) { +>bar : Symbol(bar, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 3, 1)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13)) +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 38)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 42)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13)) +>T : Symbol(T, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 13)) + + return f; +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 5, 38)) +} + +let f = foo(x => x); +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 3)) +>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 12)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 12)) + +let fResult = f("foo"); +>fResult : Symbol(fResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 10, 3)) +>f : Symbol(f, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 9, 3)) + +let g = foo((x => x)); +>g : Symbol(g, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 3)) +>foo : Symbol(foo, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 0, 0)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 13)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 13)) + +let gResult = g("foo"); +>gResult : Symbol(gResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 13, 3)) +>g : Symbol(g, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 12, 3)) + +let h = bar(x => x); +>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3)) +>bar : Symbol(bar, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 3, 1)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 12)) +>x : Symbol(x, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 12)) + +let hResult = h("foo"); +>hResult : Symbol(hResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 16, 3)) +>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3)) + +hResult = h("bar"); +>hResult : Symbol(hResult, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 16, 3)) +>h : Symbol(h, Decl(stringLiteralTypesAsTypeParameterConstraint01.ts, 15, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types new file mode 100644 index 0000000000000..fe9163fc81911 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types @@ -0,0 +1,76 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts === + +function foo(f: (x: T) => T) { +>foo : (f: (x: T) => T) => (x: T) => T +>T : T +>f : (x: T) => T +>x : T +>T : T +>T : T + + return f; +>f : (x: T) => T +} + +function bar(f: (x: T) => T) { +>bar : (f: (x: T) => T) => (x: T) => T +>T : T +>f : (x: T) => T +>x : T +>T : T +>T : T + + return f; +>f : (x: T) => T +} + +let f = foo(x => x); +>f : (x: "foo") => "foo" +>foo(x => x) : (x: "foo") => "foo" +>foo : (f: (x: T) => T) => (x: T) => T +>x => x : (x: "foo") => "foo" +>x : "foo" +>x : "foo" + +let fResult = f("foo"); +>fResult : "foo" +>f("foo") : "foo" +>f : (x: "foo") => "foo" +>"foo" : "foo" + +let g = foo((x => x)); +>g : (x: "foo") => "foo" +>foo((x => x)) : (x: "foo") => "foo" +>foo : (f: (x: T) => T) => (x: T) => T +>(x => x) : (x: "foo") => "foo" +>x => x : (x: "foo") => "foo" +>x : "foo" +>x : "foo" + +let gResult = g("foo"); +>gResult : "foo" +>g("foo") : "foo" +>g : (x: "foo") => "foo" +>"foo" : "foo" + +let h = bar(x => x); +>h : (x: "foo" | "bar") => "foo" | "bar" +>bar(x => x) : (x: "foo" | "bar") => "foo" | "bar" +>bar : (f: (x: T) => T) => (x: T) => T +>x => x : (x: "foo" | "bar") => "foo" | "bar" +>x : "foo" | "bar" +>x : "foo" | "bar" + +let hResult = h("foo"); +>hResult : "foo" | "bar" +>h("foo") : "foo" | "bar" +>h : (x: "foo" | "bar") => "foo" | "bar" +>"foo" : "foo" + +hResult = h("bar"); +>hResult = h("bar") : "foo" | "bar" +>hResult : "foo" | "bar" +>h("bar") : "foo" | "bar" +>h : (x: "foo" | "bar") => "foo" | "bar" +>"bar" : "bar" + diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt new file mode 100644 index 0000000000000..ed6450ad3293f --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.errors.txt @@ -0,0 +1,15 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts(6,13): error TS2345: Argument of type '(y: "foo" | "bar") => string' is not assignable to parameter of type '(x: "foo") => "foo"'. + Type 'string' is not assignable to type '"foo"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts (1 errors) ==== + + function foo(f: (x: T) => T) { + return f; + } + + let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '(y: "foo" | "bar") => string' is not assignable to parameter of type '(x: "foo") => "foo"'. +!!! error TS2345: Type 'string' is not assignable to type '"foo"'. + let fResult = f("foo"); \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js new file mode 100644 index 0000000000000..c024ac6bc43b2 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.js @@ -0,0 +1,21 @@ +//// [stringLiteralTypesAsTypeParameterConstraint02.ts] + +function foo(f: (x: T) => T) { + return f; +} + +let f = foo((y: "foo" | "bar") => y === "foo" ? y : "foo"); +let fResult = f("foo"); + +//// [stringLiteralTypesAsTypeParameterConstraint02.js] +function foo(f) { + return f; +} +var f = foo(function (y) { return y === "foo" ? y : "foo"; }); +var fResult = f("foo"); + + +//// [stringLiteralTypesAsTypeParameterConstraint02.d.ts] +declare function foo(f: (x: T) => T): (x: T) => T; +declare let f: any; +declare let fResult: any; From b93394a7acc9b56cd9e97dccd311c2419762b76d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 10 Nov 2015 23:15:48 -0800 Subject: [PATCH 187/353] Added to comment. --- src/compiler/checker.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4fe04cae13a46..8f751f25523b6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7114,9 +7114,16 @@ namespace ts { /** * Woah! Do you really want to use this function? * - * Unless you're trying to get the *non-apparent* type for a value-literal type, + * Unless you're trying to get the *non-apparent* type for a + * value-literal type or you're authoring relevant portions of this algorithm, * you probably meant to use 'getApparentTypeOfContextualType'. - * Otherwise this is slightly less useful. + * Otherwise this may not be very useful. + * + * In cases where you *are* working on this function, you should understand + * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'. + * + * - Use 'getContextualType' when you are simply going to propagate the result to the expression. + * - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type. * * @param node the expression whose contextual type will be returned. * @returns the contextual type of an expression. From e62603ba8522eca6529eccfd84480e8a1a4c7a6e Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 11 Nov 2015 08:51:37 -0800 Subject: [PATCH 188/353] Move export default check before module merge one As suggested by Anders. --- src/compiler/checker.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 05ced970793eb..2bbed26f23cb7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -486,10 +486,19 @@ namespace ts { if (location.kind === SyntaxKind.SourceFile || (location.kind === SyntaxKind.ModuleDeclaration && (location).name.kind === SyntaxKind.StringLiteral)) { - // It's an external module. Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope, except 'default'. - // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope, - // unless it is 'default'. + // It's an external module. First see if the module has an export default and if the local + // name of that export default matches. + if (result = moduleExports["default"]) { + const localSymbol = getLocalSymbolForExportDefault(result); + if (localSymbol && (result.flags & meaning) && localSymbol.name === name) { + break loop; + } + result = undefined; + } + + // Because of module/namespace merging, a module's exports are in scope, + // yet we never want to treat an export specifier as putting a member in scope. + // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol // on an export specifier is that it might find the export specifier itself, and try to @@ -498,19 +507,11 @@ namespace ts { // 2. We check === SymbolFlags.Alias in order to check that the symbol is *purely* // an alias. If we used &, we'd be throwing out symbols that have non alias aspects, // which is not the desired behavior. - const isLocalSymbolForExportDefault = doesNameResolveToLocalSymbolForExportDefault(moduleExports, meaning, name); if (hasProperty(moduleExports, name) && moduleExports[name].flags === SymbolFlags.Alias && - !isLocalSymbolForExportDefault && getDeclarationOfKind(moduleExports[name], SyntaxKind.ExportSpecifier)) { break; } - - if (isLocalSymbolForExportDefault) { - result = moduleExports["default"]; - break loop; - } - result = undefined; } if (result = getSymbol(moduleExports, name, meaning & SymbolFlags.ModuleMember)) { From b9778e6d20b9a96f40ece46d08d23df8cfc4c6bd Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 11 Nov 2015 10:31:09 -0800 Subject: [PATCH 189/353] cr feedback --- src/server/editorServices.ts | 6 +++--- src/server/session.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 45d987ea53456..889c96b6c4ec8 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1006,7 +1006,7 @@ namespace ts.server { /** * @param filename is absolute pathname - * @param fileContent is a known version of the file content that is more up to date + * @param fileContent is a known version of the file content that is more up to date than the one on disk */ openFile(fileName: string, openedByClient: boolean, fileContent?: string) { fileName = ts.normalizePath(fileName); @@ -1014,7 +1014,7 @@ namespace ts.server { if (!info) { let content: string; if (this.host.fileExists(fileName)) { - content = fileContent ? fileContent : this.host.readFile(fileName); + content = fileContent || this.host.readFile(fileName); } if (!content) { if (openedByClient) { @@ -1061,7 +1061,7 @@ namespace ts.server { /** * Open file whose contents is managed by the client * @param filename is absolute pathname - * @param fileContent is a known version of the file content that is more up to date + * @param fileContent is a known version of the file content that is more up to date than the one on disk */ openClientFile(fileName: string, fileContent?: string) { this.openOrUpdateConfiguredProjectForFile(fileName); diff --git a/src/server/session.ts b/src/server/session.ts index c589c528ec22f..f04f73f644cba 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -534,7 +534,7 @@ namespace ts.server { /** * @param fileName is the name of the file to be opened - * @param fileContent is a version of the file content that is known to be more up to date + * @param fileContent is a version of the file content that is known to be more up to date than the one on disk */ private openClientFile(fileName: string, fileContent?: string) { const file = ts.normalizePath(fileName); From 9472c0be9951bd2926d6e2200f8ce8c28da13dc4 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 11 Nov 2015 10:53:24 -0800 Subject: [PATCH 190/353] Remove now-unused function `doesNameResolveToLocalSymbolForExportDefault` is no longer used, so delete it. --- src/compiler/checker.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2bbed26f23cb7..175807ac686bc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -677,12 +677,6 @@ namespace ts { return result; } - function doesNameResolveToLocalSymbolForExportDefault(exports: SymbolTable, meaning: SymbolFlags, name: string): boolean { - const defaultExport = exports["default"]; - const localSymbol = getLocalSymbolForExportDefault(defaultExport); - return defaultExport && (defaultExport.flags & meaning) && localSymbol && localSymbol.name === name; - } - function checkResolvedBlockScopedVariable(result: Symbol, errorLocation: Node): void { Debug.assert((result.flags & SymbolFlags.BlockScopedVariable) !== 0); // Block-scoped variables cannot be used before their definition From 87230bcc1bb166fef8f22363f1695beaf5999dec Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 11 Nov 2015 10:55:33 -0800 Subject: [PATCH 191/353] Use 'getContextualType' for 'getContextualType'. --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e22bb18085cca..37cbc632f208d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -81,7 +81,7 @@ namespace ts { symbolToString, getAugmentedPropertiesOfType, getRootSymbols, - getContextualType: getApparentTypeOfContextualType, + getContextualType, getFullyQualifiedName, getResolvedSignature, getConstantValue, From 5ea25ba9a09f5a9860b92093012a3cedd32bf664 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 10:57:32 -0800 Subject: [PATCH 192/353] remove whitespace --- src/harness/compilerRunner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 4a599e968121f..011b10e4e6b27 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -43,7 +43,7 @@ class CompilerBaselineRunner extends RunnerBase { private makeUnitName(name: string, root: string) { return ts.isRootedDiskPath(name) ? name : (root + name); }; - + public checkTestCodeOutput(fileName: string) { describe("compiler tests for " + fileName, () => { // Mocha holds onto the closure environment of the describe callback even after the test is done. From df1dd00f35542884a9fc85501c48d599b181ac82 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 11 Nov 2015 12:19:47 -0800 Subject: [PATCH 193/353] Added test. --- ...sPropertyContextuallyTypedByTypeParam01.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts diff --git a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts new file mode 100644 index 0000000000000..357b355971de6 --- /dev/null +++ b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts @@ -0,0 +1,28 @@ +/// + +////interface IFoo { +//// [|a|]: string; +////} +////class C { +//// method() { +//// var x: T = { +//// [|a|]: "" +//// }; +//// x.[|a|]; +//// } +////} +//// +//// +////var x: IFoo = { +//// [|a|]: "ss" +////}; + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + + verify.referencesCountIs(ranges.length); + for (let expectedReference of ranges) { + verify.referencesAtPositionContains(expectedReference); + } +} \ No newline at end of file From d3f338cb8b174ad43d5f1f8b32fb7fdbc843e5b9 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 11 Nov 2015 12:24:40 -0800 Subject: [PATCH 194/353] Updated LKG. --- lib/tsc.js | 12720 ++++++++++++++++++---------------- lib/tsserver.js | 1588 +++-- lib/typescript.d.ts | 19 +- lib/typescript.js | 10528 +++++++++++++++------------- lib/typescriptServices.d.ts | 19 +- lib/typescriptServices.js | 10528 +++++++++++++++------------- 6 files changed, 18764 insertions(+), 16638 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index bbbcedf0f47a9..87a413af7294e 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -665,7 +665,7 @@ var ts; } ts.fileExtensionIs = fileExtensionIs; ts.supportedExtensions = [".ts", ".tsx", ".d.ts"]; - ts.moduleFileExtensions = ts.supportedExtensions; + ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx"); function isSupportedSourceFileName(fileName) { if (!fileName) { return false; @@ -716,17 +716,16 @@ var ts; } function Signature(checker) { } + function Node(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0; + this.parent = undefined; + } ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0; - this.parent = undefined; - } - Node.prototype = { kind: kind }; - return Node; - }, + getNodeConstructor: function () { return Node; }, + getSourceFileConstructor: function () { return Node; }, getSymbolConstructor: function () { return Symbol; }, getTypeConstructor: function () { return Type; }, getSignatureConstructor: function () { return Signature; } @@ -1003,7 +1002,16 @@ var ts; if (writeByteOrderMark) { data = "\uFEFF" + data; } - _fs.writeFileSync(fileName, data, "utf8"); + var fd; + try { + fd = _fs.openSync(fileName, "w"); + _fs.writeSync(fd, data, undefined, "utf8"); + } + finally { + if (fd !== undefined) { + _fs.closeSync(fd); + } + } } function getCanonicalPath(path) { return useCaseSensitiveFileNames ? path.toLowerCase() : path; @@ -1688,6 +1696,7 @@ var ts; Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." }, Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" }, Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." }, + Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." }, @@ -2148,7 +2157,7 @@ var ts; function getCommentRanges(text, pos, trailing) { var result; var collecting = trailing || pos === 0; - while (true) { + while (pos < text.length) { var ch = text.charCodeAt(pos); switch (ch) { case 13: @@ -2217,6 +2226,7 @@ var ts; } return result; } + return result; } function getLeadingCommentRanges(text, pos) { return getCommentRanges(text, pos, false); @@ -2312,7 +2322,7 @@ var ts; error(ts.Diagnostics.Digit_expected); } } - return +(text.substring(start, end)); + return "" + +(text.substring(start, end)); } function scanOctalDigits() { var start = pos; @@ -2704,7 +2714,7 @@ var ts; return pos++, token = 36; case 46: if (isDigit(text.charCodeAt(pos + 1))) { - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8; } if (text.charCodeAt(pos + 1) === 46 && text.charCodeAt(pos + 2) === 46) { @@ -2801,7 +2811,7 @@ var ts; case 55: case 56: case 57: - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8; case 58: return pos++, token = 54; @@ -3094,3102 +3104,2150 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - ts.bindTime = 0; - function or(state1, state2) { - return (state1 | state2) & 2 - ? 2 - : (state1 & state2) & 8 - ? 8 - : 4; - } - function getModuleInstanceState(node) { - if (node.kind === 215 || node.kind === 216) { - return 0; + function getDeclarationOfKind(symbol, kind) { + var declarations = symbol.declarations; + if (declarations) { + for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { + var declaration = declarations_1[_i]; + if (declaration.kind === kind) { + return declaration; + } + } } - else if (ts.isConstEnumDeclaration(node)) { - return 2; + return undefined; + } + ts.getDeclarationOfKind = getDeclarationOfKind; + var stringWriters = []; + function getSingleLineStringWriter() { + if (stringWriters.length === 0) { + var str = ""; + var writeText = function (text) { return str += text; }; + return { + string: function () { return str; }, + writeKeyword: writeText, + writeOperator: writeText, + writePunctuation: writeText, + writeSpace: writeText, + writeStringLiteral: writeText, + writeParameter: writeText, + writeSymbol: writeText, + writeLine: function () { return str += " "; }, + increaseIndent: function () { }, + decreaseIndent: function () { }, + clear: function () { return str = ""; }, + trackSymbol: function () { }, + reportInaccessibleThisError: function () { } + }; } - else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 2)) { - return 0; + return stringWriters.pop(); + } + ts.getSingleLineStringWriter = getSingleLineStringWriter; + function releaseStringWriter(writer) { + writer.clear(); + stringWriters.push(writer); + } + ts.releaseStringWriter = releaseStringWriter; + function getFullWidth(node) { + return node.end - node.pos; + } + ts.getFullWidth = getFullWidth; + function arrayIsEqualTo(array1, array2, equaler) { + if (!array1 || !array2) { + return array1 === array2; } - else if (node.kind === 219) { - var state = 0; - ts.forEachChild(node, function (n) { - switch (getModuleInstanceState(n)) { - case 0: - return false; - case 2: - state = 2; - return false; - case 1: - state = 1; - return true; - } - }); - return state; + if (array1.length !== array2.length) { + return false; } - else if (node.kind === 218) { - return getModuleInstanceState(node.body); + for (var i = 0; i < array1.length; ++i) { + var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; + if (!equals) { + return false; + } } - else { - return 1; + return true; + } + ts.arrayIsEqualTo = arrayIsEqualTo; + function hasResolvedModule(sourceFile, moduleNameText) { + return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); + } + ts.hasResolvedModule = hasResolvedModule; + function getResolvedModule(sourceFile, moduleNameText) { + return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; + } + ts.getResolvedModule = getResolvedModule; + function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { + if (!sourceFile.resolvedModules) { + sourceFile.resolvedModules = {}; } + sourceFile.resolvedModules[moduleNameText] = resolvedModule; } - ts.getModuleInstanceState = getModuleInstanceState; - var binder = createBinder(); - function bindSourceFile(file, options) { - var start = new Date().getTime(); - binder(file, options); - ts.bindTime += new Date().getTime() - start; + ts.setResolvedModule = setResolvedModule; + function containsParseError(node) { + aggregateChildData(node); + return (node.parserContextFlags & 64) !== 0; } - ts.bindSourceFile = bindSourceFile; - function createBinder() { - var file; - var options; - var parent; - var container; - var blockScopeContainer; - var lastContainer; - var seenThisKeyword; - var hasExplicitReturn; - var currentReachabilityState; - var labelStack; - var labelIndexMap; - var implicitLabels; - var inStrictMode; - var symbolCount = 0; - var Symbol; - var classifiableNames; - function bindSourceFile(f, opts) { - file = f; - options = opts; - inStrictMode = !!file.externalModuleIndicator; - classifiableNames = {}; - Symbol = ts.objectAllocator.getSymbolConstructor(); - if (!file.locals) { - bind(file); - file.symbolCount = symbolCount; - file.classifiableNames = classifiableNames; + ts.containsParseError = containsParseError; + function aggregateChildData(node) { + if (!(node.parserContextFlags & 128)) { + var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) || + ts.forEachChild(node, containsParseError); + if (thisNodeOrAnySubNodesHasError) { + node.parserContextFlags |= 64; } - parent = undefined; - container = undefined; - blockScopeContainer = undefined; - lastContainer = undefined; - seenThisKeyword = false; - hasExplicitReturn = false; - labelStack = undefined; - labelIndexMap = undefined; - implicitLabels = undefined; + node.parserContextFlags |= 128; } - return bindSourceFile; - function createSymbol(flags, name) { - symbolCount++; - return new Symbol(flags, name); + } + function getSourceFileOfNode(node) { + while (node && node.kind !== 248) { + node = node.parent; } - function addDeclarationToSymbol(symbol, node, symbolFlags) { - symbol.flags |= symbolFlags; - node.symbol = symbol; - if (!symbol.declarations) { - symbol.declarations = []; - } - symbol.declarations.push(node); - if (symbolFlags & 1952 && !symbol.exports) { - symbol.exports = {}; - } - if (symbolFlags & 6240 && !symbol.members) { - symbol.members = {}; - } - if (symbolFlags & 107455 && !symbol.valueDeclaration) { - symbol.valueDeclaration = node; - } + return node; + } + ts.getSourceFileOfNode = getSourceFileOfNode; + function getStartPositionOfLine(line, sourceFile) { + ts.Debug.assert(line >= 0); + return ts.getLineStarts(sourceFile)[line]; + } + ts.getStartPositionOfLine = getStartPositionOfLine; + function nodePosToString(node) { + var file = getSourceFileOfNode(node); + var loc = ts.getLineAndCharacterOfPosition(file, node.pos); + return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; + } + ts.nodePosToString = nodePosToString; + function getStartPosOfNode(node) { + return node.pos; + } + ts.getStartPosOfNode = getStartPosOfNode; + function nodeIsMissing(node) { + if (!node) { + return true; } - function getDeclarationName(node) { - if (node.name) { - if (node.kind === 218 && node.name.kind === 9) { - return "\"" + node.name.text + "\""; - } - if (node.name.kind === 136) { - var nameExpression = node.name.expression; - ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression)); - return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text); - } - return node.name.text; - } - switch (node.kind) { - case 144: - return "__constructor"; - case 152: - case 147: - return "__call"; - case 153: - case 148: - return "__new"; - case 149: - return "__index"; - case 228: - return "__export"; - case 227: - return node.isExportEquals ? "export=" : "default"; - case 213: - case 214: - return node.flags & 512 ? "default" : undefined; - } + return node.pos === node.end && node.pos >= 0 && node.kind !== 1; + } + ts.nodeIsMissing = nodeIsMissing; + function nodeIsPresent(node) { + return !nodeIsMissing(node); + } + ts.nodeIsPresent = nodeIsPresent; + function getTokenPosOfNode(node, sourceFile) { + if (nodeIsMissing(node)) { + return node.pos; } - function getDisplayName(node) { - return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node); - } - function declareSymbol(symbolTable, parent, node, includes, excludes) { - ts.Debug.assert(!ts.hasDynamicName(node)); - var isDefaultExport = node.flags & 512; - var name = isDefaultExport && parent ? "default" : getDeclarationName(node); - var symbol; - if (name !== undefined) { - symbol = ts.hasProperty(symbolTable, name) - ? symbolTable[name] - : (symbolTable[name] = createSymbol(0, name)); - if (name && (includes & 788448)) { - classifiableNames[name] = name; - } - if (symbol.flags & excludes) { - if (node.name) { - node.name.parent = node; - } - var message = symbol.flags & 2 - ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 - : ts.Diagnostics.Duplicate_identifier_0; - ts.forEach(symbol.declarations, function (declaration) { - if (declaration.flags & 512) { - message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports; - } - }); - ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); - }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); - symbol = createSymbol(0, name); - } - } - else { - symbol = createSymbol(0, "__missing"); - } - addDeclarationToSymbol(symbol, node, includes); - symbol.parent = parent; - return symbol; + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); + } + ts.getTokenPosOfNode = getTokenPosOfNode; + function getNonDecoratorTokenPosOfNode(node, sourceFile) { + if (nodeIsMissing(node) || !node.decorators) { + return getTokenPosOfNode(node, sourceFile); } - function declareModuleMember(node, symbolFlags, symbolExcludes) { - var hasExportModifier = ts.getCombinedNodeFlags(node) & 2; - if (symbolFlags & 8388608) { - if (node.kind === 230 || (node.kind === 221 && hasExportModifier)) { - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - else { - if (hasExportModifier || container.flags & 131072) { - var exportKind = (symbolFlags & 107455 ? 1048576 : 0) | - (symbolFlags & 793056 ? 2097152 : 0) | - (symbolFlags & 1536 ? 4194304 : 0); - var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes); - local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - node.localSymbol = local; - return local; - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } - } + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); + } + ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; + function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + if (nodeIsMissing(node)) { + return ""; } - function bindChildren(node) { - var saveParent = parent; - var saveContainer = container; - var savedBlockScopeContainer = blockScopeContainer; - parent = node; - var containerFlags = getContainerFlags(node); - if (containerFlags & 1) { - container = blockScopeContainer = node; - if (containerFlags & 4) { - container.locals = {}; - } - addToContainerChain(container); - } - else if (containerFlags & 2) { - blockScopeContainer = node; - blockScopeContainer.locals = undefined; - } - var savedReachabilityState; - var savedLabelStack; - var savedLabels; - var savedImplicitLabels; - var savedHasExplicitReturn; - var kind = node.kind; - var flags = node.flags; - flags &= ~1572864; - if (kind === 215) { - seenThisKeyword = false; - } - var saveState = kind === 248 || kind === 219 || ts.isFunctionLikeKind(kind); - if (saveState) { - savedReachabilityState = currentReachabilityState; - savedLabelStack = labelStack; - savedLabels = labelIndexMap; - savedImplicitLabels = implicitLabels; - savedHasExplicitReturn = hasExplicitReturn; - currentReachabilityState = 2; - hasExplicitReturn = false; - labelStack = labelIndexMap = implicitLabels = undefined; - } - bindReachableStatement(node); - if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) { - flags |= 524288; - if (hasExplicitReturn) { - flags |= 1048576; - } - } - if (kind === 215) { - flags = seenThisKeyword ? flags | 262144 : flags & ~262144; - } - node.flags = flags; - if (saveState) { - hasExplicitReturn = savedHasExplicitReturn; - currentReachabilityState = savedReachabilityState; - labelStack = savedLabelStack; - labelIndexMap = savedLabels; - implicitLabels = savedImplicitLabels; - } - container = saveContainer; - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; + var text = sourceFile.text; + return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); + } + ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; + function getTextOfNodeFromSourceText(sourceText, node) { + if (nodeIsMissing(node)) { + return ""; } - function bindReachableStatement(node) { - if (checkUnreachable(node)) { - ts.forEachChild(node, bind); - return; + return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); + } + ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; + function getTextOfNode(node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); + } + ts.getTextOfNode = getTextOfNode; + function escapeIdentifier(identifier) { + return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier; + } + ts.escapeIdentifier = escapeIdentifier; + function unescapeIdentifier(identifier) { + return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier; + } + ts.unescapeIdentifier = unescapeIdentifier; + function makeIdentifierFromModuleName(moduleName) { + return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); + } + ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 24576) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + function getEnclosingBlockScopeContainer(node) { + var current = node.parent; + while (current) { + if (isFunctionLike(current)) { + return current; } - switch (node.kind) { - case 198: - bindWhileStatement(node); - break; - case 197: - bindDoStatement(node); - break; + switch (current.kind) { + case 248: + case 220: + case 244: + case 218: case 199: - bindForStatement(node); - break; case 200: case 201: - bindForInOrForOfStatement(node); - break; - case 196: - bindIfStatement(node); - break; - case 204: - case 208: - bindReturnOrThrow(node); - break; - case 203: - case 202: - bindBreakOrContinueStatement(node); - break; - case 209: - bindTryStatement(node); - break; - case 206: - bindSwitchStatement(node); - break; - case 220: - bindCaseBlock(node); - break; - case 207: - bindLabeledStatement(node); - break; - default: - ts.forEachChild(node, bind); - break; + return current; + case 192: + if (!isFunctionLike(current.parent)) { + return current; + } } + current = current.parent; } - function bindWhileStatement(n) { - var preWhileState = n.expression.kind === 84 ? 4 : currentReachabilityState; - var postWhileState = n.expression.kind === 99 ? 4 : currentReachabilityState; - bind(n.expression); - currentReachabilityState = preWhileState; - var postWhileLabel = pushImplicitLabel(); - bind(n.statement); - popImplicitLabel(postWhileLabel, postWhileState); - } - function bindDoStatement(n) { - var preDoState = currentReachabilityState; - var postDoLabel = pushImplicitLabel(); - bind(n.statement); - var postDoState = n.expression.kind === 99 ? 4 : preDoState; - popImplicitLabel(postDoLabel, postDoState); - bind(n.expression); - } - function bindForStatement(n) { - var preForState = currentReachabilityState; - var postForLabel = pushImplicitLabel(); - bind(n.initializer); - bind(n.condition); - bind(n.incrementor); - bind(n.statement); - var isInfiniteLoop = (!n.condition || n.condition.kind === 99); - var postForState = isInfiniteLoop ? 4 : preForState; - popImplicitLabel(postForLabel, postForState); - } - function bindForInOrForOfStatement(n) { - var preStatementState = currentReachabilityState; - var postStatementLabel = pushImplicitLabel(); - bind(n.initializer); - bind(n.expression); - bind(n.statement); - popImplicitLabel(postStatementLabel, preStatementState); - } - function bindIfStatement(n) { - var ifTrueState = n.expression.kind === 84 ? 4 : currentReachabilityState; - var ifFalseState = n.expression.kind === 99 ? 4 : currentReachabilityState; - currentReachabilityState = ifTrueState; - bind(n.expression); - bind(n.thenStatement); - if (n.elseStatement) { - var preElseState = currentReachabilityState; - currentReachabilityState = ifFalseState; - bind(n.elseStatement); - currentReachabilityState = or(currentReachabilityState, preElseState); - } - else { - currentReachabilityState = or(currentReachabilityState, ifFalseState); - } - } - function bindReturnOrThrow(n) { - bind(n.expression); - if (n.kind === 204) { - hasExplicitReturn = true; - } - currentReachabilityState = 4; - } - function bindBreakOrContinueStatement(n) { - bind(n.label); - var isValidJump = jumpToLabel(n.label, n.kind === 203 ? currentReachabilityState : 4); - if (isValidJump) { - currentReachabilityState = 4; - } + } + ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer; + function isCatchClauseVariableDeclaration(declaration) { + return declaration && + declaration.kind === 211 && + declaration.parent && + declaration.parent.kind === 244; + } + ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; + function declarationNameToString(name) { + return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); + } + ts.declarationNameToString = declarationNameToString; + function createDiagnosticForNode(node, message, arg0, arg1, arg2) { + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); + } + ts.createDiagnosticForNode = createDiagnosticForNode; + function createDiagnosticForNodeFromMessageChain(node, messageChain) { + var sourceFile = getSourceFileOfNode(node); + var span = getErrorSpanForNode(sourceFile, node); + return { + file: sourceFile, + start: span.start, + length: span.length, + code: messageChain.code, + category: messageChain.category, + messageText: messageChain.next ? messageChain : messageChain.messageText + }; + } + ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; + function getSpanOfTokenAtPosition(sourceFile, pos) { + var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos); + scanner.scan(); + var start = scanner.getTokenPos(); + return ts.createTextSpanFromBounds(start, scanner.getTextPos()); + } + ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; + function getErrorSpanForNode(sourceFile, node) { + var errorNode = node; + switch (node.kind) { + case 248: + var pos_1 = ts.skipTrivia(sourceFile.text, 0, false); + if (pos_1 === sourceFile.text.length) { + return ts.createTextSpan(0, 0); + } + return getSpanOfTokenAtPosition(sourceFile, pos_1); + case 211: + case 163: + case 214: + case 186: + case 215: + case 218: + case 217: + case 247: + case 213: + case 173: + errorNode = node.name; + break; } - function bindTryStatement(n) { - var preTryState = currentReachabilityState; - bind(n.tryBlock); - var postTryState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.catchClause); - var postCatchState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.finallyBlock); - currentReachabilityState = or(postTryState, postCatchState); + if (errorNode === undefined) { + return getSpanOfTokenAtPosition(sourceFile, node.pos); } - function bindSwitchStatement(n) { - var preSwitchState = currentReachabilityState; - var postSwitchLabel = pushImplicitLabel(); - bind(n.expression); - bind(n.caseBlock); - var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242; }); - var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState; - popImplicitLabel(postSwitchLabel, postSwitchState); + var pos = nodeIsMissing(errorNode) + ? errorNode.pos + : ts.skipTrivia(sourceFile.text, errorNode.pos); + return ts.createTextSpanFromBounds(pos, errorNode.end); + } + ts.getErrorSpanForNode = getErrorSpanForNode; + function isExternalModule(file) { + return file.externalModuleIndicator !== undefined; + } + ts.isExternalModule = isExternalModule; + function isExternalOrCommonJsModule(file) { + return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined; + } + ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule; + function isDeclarationFile(file) { + return (file.flags & 4096) !== 0; + } + ts.isDeclarationFile = isDeclarationFile; + function isConstEnumDeclaration(node) { + return node.kind === 217 && isConst(node); + } + ts.isConstEnumDeclaration = isConstEnumDeclaration; + function walkUpBindingElementsAndPatterns(node) { + while (node && (node.kind === 163 || isBindingPattern(node))) { + node = node.parent; } - function bindCaseBlock(n) { - var startState = currentReachabilityState; - for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { - var clause = _a[_i]; - currentReachabilityState = startState; - bind(clause); - if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) { - errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); - } - } + return node; + } + function getCombinedNodeFlags(node) { + node = walkUpBindingElementsAndPatterns(node); + var flags = node.flags; + if (node.kind === 211) { + node = node.parent; } - function bindLabeledStatement(n) { - bind(n.label); - var ok = pushNamedLabel(n.label); - bind(n.statement); - if (ok) { - popNamedLabel(n.label, currentReachabilityState); - } + if (node && node.kind === 212) { + flags |= node.flags; + node = node.parent; } - function getContainerFlags(node) { - switch (node.kind) { - case 186: - case 214: - case 215: - case 217: - case 155: - case 165: - return 1; - case 147: - case 148: - case 149: - case 143: - case 142: - case 213: - case 144: - case 145: - case 146: - case 152: - case 153: - case 173: - case 174: - case 218: - case 248: - case 216: - return 5; - case 244: - case 199: - case 200: - case 201: - case 220: - return 2; - case 192: - return ts.isFunctionLike(node.parent) ? 0 : 2; - } - return 0; + if (node && node.kind === 193) { + flags |= node.flags; } - function addToContainerChain(next) { - if (lastContainer) { - lastContainer.nextContainer = next; - } - lastContainer = next; + return flags; + } + ts.getCombinedNodeFlags = getCombinedNodeFlags; + function isConst(node) { + return !!(getCombinedNodeFlags(node) & 16384); + } + ts.isConst = isConst; + function isLet(node) { + return !!(getCombinedNodeFlags(node) & 8192); + } + ts.isLet = isLet; + function isPrologueDirective(node) { + return node.kind === 195 && node.expression.kind === 9; + } + ts.isPrologueDirective = isPrologueDirective; + function getLeadingCommentRangesOfNode(node, sourceFileOfNode) { + return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos); + } + ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; + function getLeadingCommentRangesOfNodeFromText(node, text) { + return ts.getLeadingCommentRanges(text, node.pos); + } + ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText; + function getJsDocComments(node, sourceFileOfNode) { + return getJsDocCommentsFromText(node, sourceFileOfNode.text); + } + ts.getJsDocComments = getJsDocComments; + function getJsDocCommentsFromText(node, text) { + var commentRanges = (node.kind === 138 || node.kind === 137) ? + ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) : + getLeadingCommentRangesOfNodeFromText(node, text); + return ts.filter(commentRanges, isJsDocComment); + function isJsDocComment(comment) { + return text.charCodeAt(comment.pos + 1) === 42 && + text.charCodeAt(comment.pos + 2) === 42 && + text.charCodeAt(comment.pos + 3) !== 47; } - function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { - declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); + } + ts.getJsDocCommentsFromText = getJsDocCommentsFromText; + ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*/; + ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; + function isTypeNode(node) { + if (151 <= node.kind && node.kind <= 160) { + return true; } - function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { - switch (container.kind) { - case 218: - return declareModuleMember(node, symbolFlags, symbolExcludes); - case 248: - return declareSourceFileMember(node, symbolFlags, symbolExcludes); - case 186: - case 214: - return declareClassMember(node, symbolFlags, symbolExcludes); - case 217: - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - case 155: - case 165: - case 215: - return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - case 152: - case 153: - case 147: - case 148: - case 149: - case 143: - case 142: - case 144: - case 145: - case 146: - case 213: - case 173: - case 174: - case 216: - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - function declareClassMember(node, symbolFlags, symbolExcludes) { - return node.flags & 64 - ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) - : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - } - function declareSourceFileMember(node, symbolFlags, symbolExcludes) { - return ts.isExternalModule(file) - ? declareModuleMember(node, symbolFlags, symbolExcludes) - : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); - } - function hasExportDeclarations(node) { - var body = node.kind === 248 ? node : node.body; - if (body.kind === 248 || body.kind === 219) { - for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { - var stat = _a[_i]; - if (stat.kind === 228 || stat.kind === 227) { - return true; - } + switch (node.kind) { + case 117: + case 128: + case 130: + case 120: + case 131: + return true; + case 103: + return node.parent.kind !== 177; + case 9: + return node.parent.kind === 138; + case 188: + return !isExpressionWithTypeArgumentsInClassExtendsClause(node); + case 69: + if (node.parent.kind === 135 && node.parent.right === node) { + node = node.parent; } - } - return false; - } - function setExportContextFlag(node) { - if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { - node.flags |= 131072; - } - else { - node.flags &= ~131072; - } - } - function bindModuleDeclaration(node) { - setExportContextFlag(node); - if (node.name.kind === 9) { - declareSymbolAndAddToSymbolTable(node, 512, 106639); - } - else { - var state = getModuleInstanceState(node); - if (state === 0) { - declareSymbolAndAddToSymbolTable(node, 1024, 0); + else if (node.parent.kind === 166 && node.parent.name === node) { + node = node.parent; } - else { - declareSymbolAndAddToSymbolTable(node, 512, 106639); - if (node.symbol.flags & (16 | 32 | 256)) { - node.symbol.constEnumOnlyModule = false; - } - else { - var currentModuleIsConstEnumOnly = state === 2; - if (node.symbol.constEnumOnlyModule === undefined) { - node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; - } - else { - node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; - } - } + ts.Debug.assert(node.kind === 69 || node.kind === 135 || node.kind === 166, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'."); + case 135: + case 166: + case 97: + var parent_1 = node.parent; + if (parent_1.kind === 154) { + return false; } - } - } - function bindFunctionOrConstructorType(node) { - var symbol = createSymbol(131072, getDeclarationName(node)); - addDeclarationToSymbol(symbol, node, 131072); - var typeLiteralSymbol = createSymbol(2048, "__type"); - addDeclarationToSymbol(typeLiteralSymbol, node, 2048); - typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); - var _a; - } - function bindObjectLiteralExpression(node) { - if (inStrictMode) { - var seen = {}; - for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { - var prop = _a[_i]; - if (prop.name.kind !== 69) { - continue; - } - var identifier = prop.name; - var currentKind = prop.kind === 245 || prop.kind === 246 || prop.kind === 143 - ? 1 - : 2; - var existingKind = seen[identifier.text]; - if (!existingKind) { - seen[identifier.text] = currentKind; - continue; - } - if (currentKind === 1 && existingKind === 1) { - var span = ts.getErrorSpanForNode(file, identifier); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); - } + if (151 <= parent_1.kind && parent_1.kind <= 160) { + return true; + } + switch (parent_1.kind) { + case 188: + return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1); + case 137: + return node === parent_1.constraint; + case 141: + case 140: + case 138: + case 211: + return node === parent_1.type; + case 213: + case 173: + case 174: + case 144: + case 143: + case 142: + case 145: + case 146: + return node === parent_1.type; + case 147: + case 148: + case 149: + return node === parent_1.type; + case 171: + return node === parent_1.type; + case 168: + case 169: + return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0; + case 170: + return false; } - } - return bindAnonymousDeclaration(node, 4096, "__object"); } - function bindAnonymousDeclaration(node, symbolFlags, name) { - var symbol = createSymbol(symbolFlags, name); - addDeclarationToSymbol(symbol, node, symbolFlags); + return false; + } + ts.isTypeNode = isTypeNode; + function forEachReturnStatement(body, visitor) { + return traverse(body); + function traverse(node) { + switch (node.kind) { + case 204: + return visitor(node); + case 220: + case 192: + case 196: + case 197: + case 198: + case 199: + case 200: + case 201: + case 205: + case 206: + case 241: + case 242: + case 207: + case 209: + case 244: + return ts.forEachChild(node, traverse); + } } - function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { - switch (blockScopeContainer.kind) { - case 218: - declareModuleMember(node, symbolFlags, symbolExcludes); - break; - case 248: - if (ts.isExternalModule(container)) { - declareModuleMember(node, symbolFlags, symbolExcludes); - break; + } + ts.forEachReturnStatement = forEachReturnStatement; + function forEachYieldExpression(body, visitor) { + return traverse(body); + function traverse(node) { + switch (node.kind) { + case 184: + visitor(node); + var operand = node.expression; + if (operand) { + traverse(operand); } + case 217: + case 215: + case 218: + case 216: + case 214: + case 186: + return; default: - if (!blockScopeContainer.locals) { - blockScopeContainer.locals = {}; - addToContainerChain(blockScopeContainer); + if (isFunctionLike(node)) { + var name_5 = node.name; + if (name_5 && name_5.kind === 136) { + traverse(name_5.expression); + return; + } + } + else if (!isTypeNode(node)) { + ts.forEachChild(node, traverse); } - declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); } } - function bindBlockScopedVariableDeclaration(node) { - bindBlockScopedDeclaration(node, 2, 107455); - } - function checkStrictModeIdentifier(node) { - if (inStrictMode && - node.originalKeywordKind >= 106 && - node.originalKeywordKind <= 114 && - !ts.isIdentifierName(node)) { - if (!file.parseDiagnostics.length) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); - } + } + ts.forEachYieldExpression = forEachYieldExpression; + function isVariableLike(node) { + if (node) { + switch (node.kind) { + case 163: + case 247: + case 138: + case 245: + case 141: + case 140: + case 246: + case 211: + return true; } } - function getStrictModeIdentifierMessage(node) { - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; - } - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; - } - function checkStrictModeBinaryExpression(node) { - if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { - checkStrictModeEvalOrArguments(node, node.left); - } - } - function checkStrictModeCatchClause(node) { - if (inStrictMode && node.variableDeclaration) { - checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); - } - } - function checkStrictModeDeleteExpression(node) { - if (inStrictMode && node.expression.kind === 69) { - var span = ts.getErrorSpanForNode(file, node.expression); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); - } + return false; + } + ts.isVariableLike = isVariableLike; + function isAccessor(node) { + return node && (node.kind === 145 || node.kind === 146); + } + ts.isAccessor = isAccessor; + function isClassLike(node) { + return node && (node.kind === 214 || node.kind === 186); + } + ts.isClassLike = isClassLike; + function isFunctionLike(node) { + return node && isFunctionLikeKind(node.kind); + } + ts.isFunctionLike = isFunctionLike; + function isFunctionLikeKind(kind) { + switch (kind) { + case 144: + case 173: + case 213: + case 174: + case 143: + case 142: + case 145: + case 146: + case 147: + case 148: + case 149: + case 152: + case 153: + return true; } - function isEvalOrArgumentsIdentifier(node) { - return node.kind === 69 && - (node.text === "eval" || node.text === "arguments"); + } + ts.isFunctionLikeKind = isFunctionLikeKind; + function introducesArgumentsExoticObject(node) { + switch (node.kind) { + case 143: + case 142: + case 144: + case 145: + case 146: + case 213: + case 173: + return true; } - function checkStrictModeEvalOrArguments(contextNode, name) { - if (name && name.kind === 69) { - var identifier = name; - if (isEvalOrArgumentsIdentifier(identifier)) { - var span = ts.getErrorSpanForNode(file, name); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); - } - } + return false; + } + ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject; + function isIterationStatement(node, lookInLabeledStatements) { + switch (node.kind) { + case 199: + case 200: + case 201: + case 197: + case 198: + return true; + case 207: + return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements); } - function getStrictModeEvalOrArgumentsMessage(node) { - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; + return false; + } + ts.isIterationStatement = isIterationStatement; + function isFunctionBlock(node) { + return node && node.kind === 192 && isFunctionLike(node.parent); + } + ts.isFunctionBlock = isFunctionBlock; + function isObjectLiteralMethod(node) { + return node && node.kind === 143 && node.parent.kind === 165; + } + ts.isObjectLiteralMethod = isObjectLiteralMethod; + function getContainingFunction(node) { + while (true) { + node = node.parent; + if (!node || isFunctionLike(node)) { + return node; } - return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; } - function checkStrictModeFunctionName(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.name); + } + ts.getContainingFunction = getContainingFunction; + function getContainingClass(node) { + while (true) { + node = node.parent; + if (!node || isClassLike(node)) { + return node; } } - function checkStrictModeNumericLiteral(node) { - if (inStrictMode && node.flags & 32768) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); + } + ts.getContainingClass = getContainingClass; + function getThisContainer(node, includeArrowFunctions) { + while (true) { + node = node.parent; + if (!node) { + return undefined; } - } - function checkStrictModePostfixUnaryExpression(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.operand); + switch (node.kind) { + case 136: + if (isClassLike(node.parent.parent)) { + return node; + } + node = node.parent; + break; + case 139: + if (node.parent.kind === 138 && isClassElement(node.parent.parent)) { + node = node.parent.parent; + } + else if (isClassElement(node.parent)) { + node = node.parent; + } + break; + case 174: + if (!includeArrowFunctions) { + continue; + } + case 213: + case 173: + case 218: + case 141: + case 140: + case 143: + case 142: + case 144: + case 145: + case 146: + case 147: + case 148: + case 149: + case 217: + case 248: + return node; } } - function checkStrictModePrefixUnaryExpression(node) { - if (inStrictMode) { - if (node.operator === 41 || node.operator === 42) { - checkStrictModeEvalOrArguments(node, node.operand); - } + } + ts.getThisContainer = getThisContainer; + function getSuperContainer(node, includeFunctions) { + while (true) { + node = node.parent; + if (!node) + return node; + switch (node.kind) { + case 136: + if (isClassLike(node.parent.parent)) { + return node; + } + node = node.parent; + break; + case 139: + if (node.parent.kind === 138 && isClassElement(node.parent.parent)) { + node = node.parent.parent; + } + else if (isClassElement(node.parent)) { + node = node.parent; + } + break; + case 213: + case 173: + case 174: + if (!includeFunctions) { + continue; + } + case 141: + case 140: + case 143: + case 142: + case 144: + case 145: + case 146: + return node; } } - function checkStrictModeWithStatement(node) { - if (inStrictMode) { - errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); + } + ts.getSuperContainer = getSuperContainer; + function getEntityNameFromTypeNode(node) { + if (node) { + switch (node.kind) { + case 151: + return node.typeName; + case 188: + return node.expression; + case 69: + case 135: + return node; } } - function errorOnFirstToken(node, message, arg0, arg1, arg2) { - var span = ts.getSpanOfTokenAtPosition(file, node.pos); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); + return undefined; + } + ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode; + function getInvokedExpression(node) { + if (node.kind === 170) { + return node.tag; } - function getDestructuringParameterName(node) { - return "__" + ts.indexOf(node.parent.parameters, node); + return node.expression; + } + ts.getInvokedExpression = getInvokedExpression; + function nodeCanBeDecorated(node) { + switch (node.kind) { + case 214: + return true; + case 141: + return node.parent.kind === 214; + case 138: + return node.parent.body && node.parent.parent.kind === 214; + case 145: + case 146: + case 143: + return node.body && node.parent.kind === 214; } - function bind(node) { - if (!node) { - return; - } - node.parent = parent; - var savedInStrictMode = inStrictMode; - if (!savedInStrictMode) { - updateStrictMode(node); - } - bindWorker(node); - bindChildren(node); - inStrictMode = savedInStrictMode; + return false; + } + ts.nodeCanBeDecorated = nodeCanBeDecorated; + function nodeIsDecorated(node) { + switch (node.kind) { + case 214: + if (node.decorators) { + return true; + } + return false; + case 141: + case 138: + if (node.decorators) { + return true; + } + return false; + case 145: + if (node.body && node.decorators) { + return true; + } + return false; + case 143: + case 146: + if (node.body && node.decorators) { + return true; + } + return false; } - function updateStrictMode(node) { - switch (node.kind) { - case 248: - case 219: - updateStrictModeStatementList(node.statements); - return; - case 192: - if (ts.isFunctionLike(node.parent)) { - updateStrictModeStatementList(node.statements); - } - return; - case 214: - case 186: - inStrictMode = true; - return; - } + return false; + } + ts.nodeIsDecorated = nodeIsDecorated; + function childIsDecorated(node) { + switch (node.kind) { + case 214: + return ts.forEach(node.members, nodeOrChildIsDecorated); + case 143: + case 146: + return ts.forEach(node.parameters, nodeIsDecorated); } - function updateStrictModeStatementList(statements) { - for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { - var statement = statements_1[_i]; - if (!ts.isPrologueDirective(statement)) { - return; + return false; + } + ts.childIsDecorated = childIsDecorated; + function nodeOrChildIsDecorated(node) { + return nodeIsDecorated(node) || childIsDecorated(node); + } + ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated; + function isPropertyAccessExpression(node) { + return node.kind === 166; + } + ts.isPropertyAccessExpression = isPropertyAccessExpression; + function isElementAccessExpression(node) { + return node.kind === 167; + } + ts.isElementAccessExpression = isElementAccessExpression; + function isExpression(node) { + switch (node.kind) { + case 95: + case 93: + case 99: + case 84: + case 10: + case 164: + case 165: + case 166: + case 167: + case 168: + case 169: + case 170: + case 189: + case 171: + case 172: + case 173: + case 186: + case 174: + case 177: + case 175: + case 176: + case 179: + case 180: + case 181: + case 182: + case 185: + case 183: + case 11: + case 187: + case 233: + case 234: + case 184: + case 178: + return true; + case 135: + while (node.parent.kind === 135) { + node = node.parent; } - if (isUseStrictPrologueDirective(statement)) { - inStrictMode = true; - return; + return node.parent.kind === 154; + case 69: + if (node.parent.kind === 154) { + return true; + } + case 8: + case 9: + case 97: + var parent_2 = node.parent; + switch (parent_2.kind) { + case 211: + case 138: + case 141: + case 140: + case 247: + case 245: + case 163: + return parent_2.initializer === node; + case 195: + case 196: + case 197: + case 198: + case 204: + case 205: + case 206: + case 241: + case 208: + case 206: + return parent_2.expression === node; + case 199: + var forStatement = parent_2; + return (forStatement.initializer === node && forStatement.initializer.kind !== 212) || + forStatement.condition === node || + forStatement.incrementor === node; + case 200: + case 201: + var forInStatement = parent_2; + return (forInStatement.initializer === node && forInStatement.initializer.kind !== 212) || + forInStatement.expression === node; + case 171: + case 189: + return node === parent_2.expression; + case 190: + return node === parent_2.expression; + case 136: + return node === parent_2.expression; + case 139: + case 240: + case 239: + return true; + case 188: + return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2); + default: + if (isExpression(parent_2)) { + return true; + } } + } + return false; + } + ts.isExpression = isExpression; + function isExternalModuleNameRelative(moduleName) { + return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; + } + ts.isExternalModuleNameRelative = isExternalModuleNameRelative; + function isInstantiatedModule(node, preserveConstEnums) { + var moduleState = ts.getModuleInstanceState(node); + return moduleState === 1 || + (preserveConstEnums && moduleState === 2); + } + ts.isInstantiatedModule = isInstantiatedModule; + function isExternalModuleImportEqualsDeclaration(node) { + return node.kind === 221 && node.moduleReference.kind === 232; + } + ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration; + function getExternalModuleImportEqualsDeclarationExpression(node) { + ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node)); + return node.moduleReference.expression; + } + ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression; + function isInternalModuleImportEqualsDeclaration(node) { + return node.kind === 221 && node.moduleReference.kind !== 232; + } + ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; + function isSourceFileJavaScript(file) { + return isInJavaScriptFile(file); + } + ts.isSourceFileJavaScript = isSourceFileJavaScript; + function isInJavaScriptFile(node) { + return node && !!(node.parserContextFlags & 32); + } + ts.isInJavaScriptFile = isInJavaScriptFile; + function isRequireCall(expression) { + return expression.kind === 168 && + expression.expression.kind === 69 && + expression.expression.text === "require" && + expression.arguments.length === 1 && + expression.arguments[0].kind === 9; + } + ts.isRequireCall = isRequireCall; + function isExportsPropertyAssignment(expression) { + return isInJavaScriptFile(expression) && + (expression.kind === 181) && + (expression.operatorToken.kind === 56) && + (expression.left.kind === 166) && + (expression.left.expression.kind === 69) && + ((expression.left.expression).text === "exports"); + } + ts.isExportsPropertyAssignment = isExportsPropertyAssignment; + function isModuleExportsAssignment(expression) { + return isInJavaScriptFile(expression) && + (expression.kind === 181) && + (expression.operatorToken.kind === 56) && + (expression.left.kind === 166) && + (expression.left.expression.kind === 69) && + ((expression.left.expression).text === "module") && + (expression.left.name.text === "exports"); + } + ts.isModuleExportsAssignment = isModuleExportsAssignment; + function getExternalModuleName(node) { + if (node.kind === 222) { + return node.moduleSpecifier; + } + if (node.kind === 221) { + var reference = node.moduleReference; + if (reference.kind === 232) { + return reference.expression; } } - function isUseStrictPrologueDirective(node) { - var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); - return nodeText === "\"use strict\"" || nodeText === "'use strict'"; + if (node.kind === 228) { + return node.moduleSpecifier; } - function bindWorker(node) { + } + ts.getExternalModuleName = getExternalModuleName; + function hasQuestionToken(node) { + if (node) { switch (node.kind) { - case 69: - return checkStrictModeIdentifier(node); - case 181: - return checkStrictModeBinaryExpression(node); - case 244: - return checkStrictModeCatchClause(node); - case 175: - return checkStrictModeDeleteExpression(node); - case 8: - return checkStrictModeNumericLiteral(node); - case 180: - return checkStrictModePostfixUnaryExpression(node); - case 179: - return checkStrictModePrefixUnaryExpression(node); - case 205: - return checkStrictModeWithStatement(node); - case 97: - seenThisKeyword = true; - return; - case 137: - return declareSymbolAndAddToSymbolTable(node, 262144, 530912); case 138: - return bindParameter(node); - case 211: - case 163: - return bindVariableDeclarationOrBindingElement(node); + case 143: + case 142: + case 246: + case 245: case 141: case 140: - return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455); - case 245: - case 246: - return bindPropertyOrMethodOrAccessor(node, 4, 107455); - case 247: - return bindPropertyOrMethodOrAccessor(node, 8, 107455); - case 147: - case 148: - case 149: - return declareSymbolAndAddToSymbolTable(node, 131072, 0); - case 143: - case 142: - return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263); - case 213: - checkStrictModeFunctionName(node); - return declareSymbolAndAddToSymbolTable(node, 16, 106927); - case 144: - return declareSymbolAndAddToSymbolTable(node, 16384, 0); - case 145: - return bindPropertyOrMethodOrAccessor(node, 32768, 41919); - case 146: - return bindPropertyOrMethodOrAccessor(node, 65536, 74687); - case 152: - case 153: - return bindFunctionOrConstructorType(node); - case 155: - return bindAnonymousDeclaration(node, 2048, "__type"); - case 165: - return bindObjectLiteralExpression(node); - case 173: - case 174: - checkStrictModeFunctionName(node); - var bindingName = node.name ? node.name.text : "__function"; - return bindAnonymousDeclaration(node, 16, bindingName); - case 186: - case 214: - return bindClassLikeDeclaration(node); - case 215: - return bindBlockScopedDeclaration(node, 64, 792960); - case 216: - return bindBlockScopedDeclaration(node, 524288, 793056); - case 217: - return bindEnumDeclaration(node); - case 218: - return bindModuleDeclaration(node); - case 221: - case 224: - case 226: - case 230: - return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608); - case 223: - return bindImportClause(node); - case 228: - return bindExportDeclaration(node); - case 227: - return bindExportAssignment(node); - case 248: - return bindSourceFileIfExternalModule(); - } - } - function bindSourceFileIfExternalModule() { - setExportContextFlag(file); - if (ts.isExternalModule(file)) { - bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\""); - } - } - function bindExportAssignment(node) { - if (!container.symbol || !container.symbol.exports) { - bindAnonymousDeclaration(node, 8388608, getDeclarationName(node)); - } - else if (node.expression.kind === 69) { - declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608); - } - else { - declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608); + return node.questionToken !== undefined; } } - function bindExportDeclaration(node) { - if (!container.symbol || !container.symbol.exports) { - bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node)); - } - else if (!node.exportClause) { - declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); + return false; + } + ts.hasQuestionToken = hasQuestionToken; + function isJSDocConstructSignature(node) { + return node.kind === 261 && + node.parameters.length > 0 && + node.parameters[0].type.kind === 263; + } + ts.isJSDocConstructSignature = isJSDocConstructSignature; + function getJSDocTag(node, kind) { + if (node && node.jsDocComment) { + for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) { + var tag = _a[_i]; + if (tag.kind === kind) { + return tag; + } } } - function bindImportClause(node) { - if (node.name) { - declareSymbolAndAddToSymbolTable(node, 8388608, 8388608); + } + function getJSDocTypeTag(node) { + return getJSDocTag(node, 269); + } + ts.getJSDocTypeTag = getJSDocTypeTag; + function getJSDocReturnTag(node) { + return getJSDocTag(node, 268); + } + ts.getJSDocReturnTag = getJSDocReturnTag; + function getJSDocTemplateTag(node) { + return getJSDocTag(node, 270); + } + ts.getJSDocTemplateTag = getJSDocTemplateTag; + function getCorrespondingJSDocParameterTag(parameter) { + if (parameter.name && parameter.name.kind === 69) { + var parameterName = parameter.name.text; + var docComment = parameter.parent.jsDocComment; + if (docComment) { + return ts.forEach(docComment.tags, function (t) { + if (t.kind === 267) { + var parameterTag = t; + var name_6 = parameterTag.preParameterName || parameterTag.postParameterName; + if (name_6.text === parameterName) { + return t; + } + } + }); } } - function bindClassLikeDeclaration(node) { - if (node.kind === 214) { - bindBlockScopedDeclaration(node, 32, 899519); - } - else { - var bindingName = node.name ? node.name.text : "__class"; - bindAnonymousDeclaration(node, 32, bindingName); - if (node.name) { - classifiableNames[node.name.text] = node.name.text; + } + ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag; + function hasRestParameter(s) { + return isRestParameter(ts.lastOrUndefined(s.parameters)); + } + ts.hasRestParameter = hasRestParameter; + function isRestParameter(node) { + if (node) { + if (node.parserContextFlags & 32) { + if (node.type && node.type.kind === 262) { + return true; } - } - var symbol = node.symbol; - var prototypeSymbol = createSymbol(4 | 134217728, "prototype"); - if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { - if (node.name) { - node.name.parent = node; + var paramTag = getCorrespondingJSDocParameterTag(node); + if (paramTag && paramTag.typeExpression) { + return paramTag.typeExpression.type.kind === 262; } - file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); } - symbol.exports[prototypeSymbol.name] = prototypeSymbol; - prototypeSymbol.parent = symbol; + return node.dotDotDotToken !== undefined; } - function bindEnumDeclaration(node) { - return ts.isConst(node) - ? bindBlockScopedDeclaration(node, 128, 899967) - : bindBlockScopedDeclaration(node, 256, 899327); + return false; + } + ts.isRestParameter = isRestParameter; + function isLiteralKind(kind) { + return 8 <= kind && kind <= 11; + } + ts.isLiteralKind = isLiteralKind; + function isTextualLiteralKind(kind) { + return kind === 9 || kind === 11; + } + ts.isTextualLiteralKind = isTextualLiteralKind; + function isTemplateLiteralKind(kind) { + return 11 <= kind && kind <= 14; + } + ts.isTemplateLiteralKind = isTemplateLiteralKind; + function isBindingPattern(node) { + return !!node && (node.kind === 162 || node.kind === 161); + } + ts.isBindingPattern = isBindingPattern; + function isNodeDescendentOf(node, ancestor) { + while (node) { + if (node === ancestor) + return true; + node = node.parent; } - function bindVariableDeclarationOrBindingElement(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.name); - } - if (!ts.isBindingPattern(node.name)) { - if (ts.isBlockOrCatchScoped(node)) { - bindBlockScopedVariableDeclaration(node); - } - else if (ts.isParameterDeclaration(node)) { - declareSymbolAndAddToSymbolTable(node, 1, 107455); - } - else { - declareSymbolAndAddToSymbolTable(node, 1, 107454); - } + return false; + } + ts.isNodeDescendentOf = isNodeDescendentOf; + function isInAmbientContext(node) { + while (node) { + if (node.flags & (4 | 4096)) { + return true; } + node = node.parent; } - function bindParameter(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.name); - } - if (ts.isBindingPattern(node.name)) { - bindAnonymousDeclaration(node, 1, getDestructuringParameterName(node)); - } - else { - declareSymbolAndAddToSymbolTable(node, 1, 107455); - } - if (node.flags & 56 && - node.parent.kind === 144 && - ts.isClassLike(node.parent.parent)) { - var classDeclaration = node.parent.parent; - declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455); - } + return false; + } + ts.isInAmbientContext = isInAmbientContext; + function isDeclaration(node) { + switch (node.kind) { + case 174: + case 163: + case 214: + case 186: + case 144: + case 217: + case 247: + case 230: + case 213: + case 173: + case 145: + case 223: + case 221: + case 226: + case 215: + case 143: + case 142: + case 218: + case 224: + case 138: + case 245: + case 141: + case 140: + case 146: + case 246: + case 216: + case 137: + case 211: + return true; } - function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { - return ts.hasDynamicName(node) - ? bindAnonymousDeclaration(node, symbolFlags, "__computed") - : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); - } - function pushNamedLabel(name) { - initializeReachabilityStateIfNecessary(); - if (ts.hasProperty(labelIndexMap, name.text)) { + return false; + } + ts.isDeclaration = isDeclaration; + function isStatement(n) { + switch (n.kind) { + case 203: + case 202: + case 210: + case 197: + case 195: + case 194: + case 200: + case 201: + case 199: + case 196: + case 207: + case 204: + case 206: + case 208: + case 209: + case 193: + case 198: + case 205: + case 227: + return true; + default: return false; - } - labelIndexMap[name.text] = labelStack.push(1) - 1; - return true; } - function pushImplicitLabel() { - initializeReachabilityStateIfNecessary(); - var index = labelStack.push(1) - 1; - implicitLabels.push(index); - return index; + } + ts.isStatement = isStatement; + function isClassElement(n) { + switch (n.kind) { + case 144: + case 141: + case 143: + case 145: + case 146: + case 142: + case 149: + return true; + default: + return false; } - function popNamedLabel(label, outerState) { - var index = labelIndexMap[label.text]; - ts.Debug.assert(index !== undefined); - ts.Debug.assert(labelStack.length == index + 1); - labelIndexMap[label.text] = undefined; - setCurrentStateAtLabel(labelStack.pop(), outerState, label); + } + ts.isClassElement = isClassElement; + function isDeclarationName(name) { + if (name.kind !== 69 && name.kind !== 9 && name.kind !== 8) { + return false; } - function popImplicitLabel(implicitLabelIndex, outerState) { - if (labelStack.length !== implicitLabelIndex + 1) { - ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); - } - var i = implicitLabels.pop(); - if (implicitLabelIndex !== i) { - ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); + var parent = name.parent; + if (parent.kind === 226 || parent.kind === 230) { + if (parent.propertyName) { + return true; } - setCurrentStateAtLabel(labelStack.pop(), outerState, undefined); } - function setCurrentStateAtLabel(innerMergedState, outerState, label) { - if (innerMergedState === 1) { - if (label && !options.allowUnusedLabels) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); - } - currentReachabilityState = outerState; - } - else { - currentReachabilityState = or(innerMergedState, outerState); - } + if (isDeclaration(parent)) { + return parent.name === name; } - function jumpToLabel(label, outerState) { - initializeReachabilityStateIfNecessary(); - var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); - if (index === undefined) { + return false; + } + ts.isDeclarationName = isDeclarationName; + function isIdentifierName(node) { + var parent = node.parent; + switch (parent.kind) { + case 141: + case 140: + case 143: + case 142: + case 145: + case 146: + case 247: + case 245: + case 166: + return parent.name === node; + case 135: + if (parent.right === node) { + while (parent.kind === 135) { + parent = parent.parent; + } + return parent.kind === 154; + } return false; - } - var stateAtLabel = labelStack[index]; - labelStack[index] = stateAtLabel === 1 ? outerState : or(stateAtLabel, outerState); - return true; + case 163: + case 226: + return parent.propertyName === node; + case 230: + return true; } - function checkUnreachable(node) { - switch (currentReachabilityState) { - case 4: - var reportError = ts.isStatement(node) || - node.kind === 214 || - (node.kind === 218 && shouldReportErrorOnModuleDeclaration(node)) || - (node.kind === 217 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); - if (reportError) { - currentReachabilityState = 8; - var reportUnreachableCode = !options.allowUnreachableCode && - !ts.isInAmbientContext(node) && - (node.kind !== 193 || - ts.getCombinedNodeFlags(node.declarationList) & 24576 || - ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); - if (reportUnreachableCode) { - errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); - } - } - case 8: - return true; - default: - return false; - } - function shouldReportErrorOnModuleDeclaration(node) { - var instanceState = getModuleInstanceState(node); - return instanceState === 1 || (instanceState === 2 && options.preserveConstEnums); + return false; + } + ts.isIdentifierName = isIdentifierName; + function isAliasSymbolDeclaration(node) { + return node.kind === 221 || + node.kind === 223 && !!node.name || + node.kind === 224 || + node.kind === 226 || + node.kind === 230 || + node.kind === 227 && node.expression.kind === 69; + } + ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration; + function getClassExtendsHeritageClauseElement(node) { + var heritageClause = getHeritageClause(node.heritageClauses, 83); + return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; + } + ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement; + function getClassImplementsHeritageClauseElements(node) { + var heritageClause = getHeritageClause(node.heritageClauses, 106); + return heritageClause ? heritageClause.types : undefined; + } + ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements; + function getInterfaceBaseTypeNodes(node) { + var heritageClause = getHeritageClause(node.heritageClauses, 83); + return heritageClause ? heritageClause.types : undefined; + } + ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes; + function getHeritageClause(clauses, kind) { + if (clauses) { + for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) { + var clause = clauses_1[_i]; + if (clause.token === kind) { + return clause; + } } } - function initializeReachabilityStateIfNecessary() { - if (labelIndexMap) { - return; + return undefined; + } + ts.getHeritageClause = getHeritageClause; + function tryResolveScriptReference(host, sourceFile, reference) { + if (!host.getCompilerOptions().noResolve) { + var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName); + return host.getSourceFile(referenceFileName); + } + } + ts.tryResolveScriptReference = tryResolveScriptReference; + function getAncestor(node, kind) { + while (node) { + if (node.kind === kind) { + return node; } - currentReachabilityState = 2; - labelIndexMap = {}; - labelStack = []; - implicitLabels = []; + node = node.parent; } + return undefined; } -})(ts || (ts = {})); -var ts; -(function (ts) { - function getDeclarationOfKind(symbol, kind) { - var declarations = symbol.declarations; - if (declarations) { - for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { - var declaration = declarations_1[_i]; - if (declaration.kind === kind) { - return declaration; + ts.getAncestor = getAncestor; + function getFileReferenceFromReferencePath(comment, commentRange) { + var simpleReferenceRegEx = /^\/\/\/\s*/gim; + if (simpleReferenceRegEx.test(comment)) { + if (isNoDefaultLibRegEx.test(comment)) { + return { + isNoDefaultLib: true + }; + } + else { + var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment); + if (matchResult) { + var start = commentRange.pos; + var end = commentRange.end; + return { + fileReference: { + pos: start, + end: end, + fileName: matchResult[3] + }, + isNoDefaultLib: false + }; + } + else { + return { + diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax, + isNoDefaultLib: false + }; } } } return undefined; } - ts.getDeclarationOfKind = getDeclarationOfKind; - var stringWriters = []; - function getSingleLineStringWriter() { - if (stringWriters.length === 0) { - var str = ""; - var writeText = function (text) { return str += text; }; - return { - string: function () { return str; }, - writeKeyword: writeText, - writeOperator: writeText, - writePunctuation: writeText, - writeSpace: writeText, - writeStringLiteral: writeText, - writeParameter: writeText, - writeSymbol: writeText, - writeLine: function () { return str += " "; }, - increaseIndent: function () { }, - decreaseIndent: function () { }, - clear: function () { return str = ""; }, - trackSymbol: function () { }, - reportInaccessibleThisError: function () { } - }; - } - return stringWriters.pop(); - } - ts.getSingleLineStringWriter = getSingleLineStringWriter; - function releaseStringWriter(writer) { - writer.clear(); - stringWriters.push(writer); + ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath; + function isKeyword(token) { + return 70 <= token && token <= 134; } - ts.releaseStringWriter = releaseStringWriter; - function getFullWidth(node) { - return node.end - node.pos; + ts.isKeyword = isKeyword; + function isTrivia(token) { + return 2 <= token && token <= 7; } - ts.getFullWidth = getFullWidth; - function arrayIsEqualTo(array1, array2, equaler) { - if (!array1 || !array2) { - return array1 === array2; - } - if (array1.length !== array2.length) { - return false; - } - for (var i = 0; i < array1.length; ++i) { - var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; - if (!equals) { - return false; - } - } - return true; + ts.isTrivia = isTrivia; + function isAsyncFunctionLike(node) { + return isFunctionLike(node) && (node.flags & 256) !== 0 && !isAccessor(node); } - ts.arrayIsEqualTo = arrayIsEqualTo; - function hasResolvedModule(sourceFile, moduleNameText) { - return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); + ts.isAsyncFunctionLike = isAsyncFunctionLike; + function isStringOrNumericLiteral(kind) { + return kind === 9 || kind === 8; } - ts.hasResolvedModule = hasResolvedModule; - function getResolvedModule(sourceFile, moduleNameText) { - return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; + ts.isStringOrNumericLiteral = isStringOrNumericLiteral; + function hasDynamicName(declaration) { + return declaration.name && isDynamicName(declaration.name); } - ts.getResolvedModule = getResolvedModule; - function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { - if (!sourceFile.resolvedModules) { - sourceFile.resolvedModules = {}; - } - sourceFile.resolvedModules[moduleNameText] = resolvedModule; + ts.hasDynamicName = hasDynamicName; + function isDynamicName(name) { + return name.kind === 136 && + !isStringOrNumericLiteral(name.expression.kind) && + !isWellKnownSymbolSyntactically(name.expression); } - ts.setResolvedModule = setResolvedModule; - function containsParseError(node) { - aggregateChildData(node); - return (node.parserContextFlags & 64) !== 0; + ts.isDynamicName = isDynamicName; + function isWellKnownSymbolSyntactically(node) { + return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression); } - ts.containsParseError = containsParseError; - function aggregateChildData(node) { - if (!(node.parserContextFlags & 128)) { - var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) || - ts.forEachChild(node, containsParseError); - if (thisNodeOrAnySubNodesHasError) { - node.parserContextFlags |= 64; - } - node.parserContextFlags |= 128; + ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically; + function getPropertyNameForPropertyNameNode(name) { + if (name.kind === 69 || name.kind === 9 || name.kind === 8) { + return name.text; } - } - function getSourceFileOfNode(node) { - while (node && node.kind !== 248) { - node = node.parent; + if (name.kind === 136) { + var nameExpression = name.expression; + if (isWellKnownSymbolSyntactically(nameExpression)) { + var rightHandSideName = nameExpression.name.text; + return getPropertyNameForKnownSymbolName(rightHandSideName); + } } - return node; - } - ts.getSourceFileOfNode = getSourceFileOfNode; - function getStartPositionOfLine(line, sourceFile) { - ts.Debug.assert(line >= 0); - return ts.getLineStarts(sourceFile)[line]; + return undefined; } - ts.getStartPositionOfLine = getStartPositionOfLine; - function nodePosToString(node) { - var file = getSourceFileOfNode(node); - var loc = ts.getLineAndCharacterOfPosition(file, node.pos); - return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; + ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode; + function getPropertyNameForKnownSymbolName(symbolName) { + return "__@" + symbolName; } - ts.nodePosToString = nodePosToString; - function getStartPosOfNode(node) { - return node.pos; + ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName; + function isESSymbolIdentifier(node) { + return node.kind === 69 && node.text === "Symbol"; } - ts.getStartPosOfNode = getStartPosOfNode; - function nodeIsMissing(node) { - if (!node) { - return true; + ts.isESSymbolIdentifier = isESSymbolIdentifier; + function isModifier(token) { + switch (token) { + case 115: + case 118: + case 74: + case 122: + case 77: + case 82: + case 112: + case 110: + case 111: + case 113: + return true; } - return node.pos === node.end && node.pos >= 0 && node.kind !== 1; + return false; } - ts.nodeIsMissing = nodeIsMissing; - function nodeIsPresent(node) { - return !nodeIsMissing(node); + ts.isModifier = isModifier; + function isParameterDeclaration(node) { + var root = getRootDeclaration(node); + return root.kind === 138; } - ts.nodeIsPresent = nodeIsPresent; - function getTokenPosOfNode(node, sourceFile) { - if (nodeIsMissing(node)) { - return node.pos; + ts.isParameterDeclaration = isParameterDeclaration; + function getRootDeclaration(node) { + while (node.kind === 163) { + node = node.parent.parent; } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); + return node; } - ts.getTokenPosOfNode = getTokenPosOfNode; - function getNonDecoratorTokenPosOfNode(node, sourceFile) { - if (nodeIsMissing(node) || !node.decorators) { - return getTokenPosOfNode(node, sourceFile); - } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); + ts.getRootDeclaration = getRootDeclaration; + function nodeStartsNewLexicalEnvironment(n) { + return isFunctionLike(n) || n.kind === 218 || n.kind === 248; } - ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; - function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - if (nodeIsMissing(node)) { - return ""; + ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; + function cloneEntityName(node) { + if (node.kind === 69) { + var clone_1 = createSynthesizedNode(69); + clone_1.text = node.text; + return clone_1; } - var text = sourceFile.text; - return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); - } - ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; - function getTextOfNodeFromSourceText(sourceText, node) { - if (nodeIsMissing(node)) { - return ""; + else { + var clone_2 = createSynthesizedNode(135); + clone_2.left = cloneEntityName(node.left); + clone_2.left.parent = clone_2; + clone_2.right = cloneEntityName(node.right); + clone_2.right.parent = clone_2; + return clone_2; } - return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); - } - ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; - function getTextOfNode(node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); - } - ts.getTextOfNode = getTextOfNode; - function escapeIdentifier(identifier) { - return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier; } - ts.escapeIdentifier = escapeIdentifier; - function unescapeIdentifier(identifier) { - return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier; + ts.cloneEntityName = cloneEntityName; + function nodeIsSynthesized(node) { + return node.pos === -1; } - ts.unescapeIdentifier = unescapeIdentifier; - function makeIdentifierFromModuleName(moduleName) { - return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); + ts.nodeIsSynthesized = nodeIsSynthesized; + function createSynthesizedNode(kind, startsOnNewLine) { + var node = ts.createNode(kind, -1, -1); + node.startsOnNewLine = startsOnNewLine; + return node; } - ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; - function isBlockOrCatchScoped(declaration) { - return (getCombinedNodeFlags(declaration) & 24576) !== 0 || - isCatchClauseVariableDeclaration(declaration); + ts.createSynthesizedNode = createSynthesizedNode; + function createSynthesizedNodeArray() { + var array = []; + array.pos = -1; + array.end = -1; + return array; } - ts.isBlockOrCatchScoped = isBlockOrCatchScoped; - function getEnclosingBlockScopeContainer(node) { - var current = node.parent; - while (current) { - if (isFunctionLike(current)) { - return current; - } - switch (current.kind) { - case 248: - case 220: - case 244: - case 218: - case 199: - case 200: - case 201: - return current; - case 192: - if (!isFunctionLike(current.parent)) { - return current; - } - } - current = current.parent; + ts.createSynthesizedNodeArray = createSynthesizedNodeArray; + function createDiagnosticCollection() { + var nonFileDiagnostics = []; + var fileDiagnostics = {}; + var diagnosticsModified = false; + var modificationCount = 0; + return { + add: add, + getGlobalDiagnostics: getGlobalDiagnostics, + getDiagnostics: getDiagnostics, + getModificationCount: getModificationCount, + reattachFileDiagnostics: reattachFileDiagnostics + }; + function getModificationCount() { + return modificationCount; } - } - ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer; - function isCatchClauseVariableDeclaration(declaration) { - return declaration && - declaration.kind === 211 && - declaration.parent && - declaration.parent.kind === 244; - } - ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration; - function declarationNameToString(name) { - return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name); - } - ts.declarationNameToString = declarationNameToString; - function createDiagnosticForNode(node, message, arg0, arg1, arg2) { - var sourceFile = getSourceFileOfNode(node); - var span = getErrorSpanForNode(sourceFile, node); - return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2); - } - ts.createDiagnosticForNode = createDiagnosticForNode; - function createDiagnosticForNodeFromMessageChain(node, messageChain) { - var sourceFile = getSourceFileOfNode(node); - var span = getErrorSpanForNode(sourceFile, node); - return { - file: sourceFile, - start: span.start, - length: span.length, - code: messageChain.code, - category: messageChain.category, - messageText: messageChain.next ? messageChain : messageChain.messageText - }; - } - ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain; - function getSpanOfTokenAtPosition(sourceFile, pos) { - var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos); - scanner.scan(); - var start = scanner.getTokenPos(); - return ts.createTextSpanFromBounds(start, scanner.getTextPos()); - } - ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; - function getErrorSpanForNode(sourceFile, node) { - var errorNode = node; - switch (node.kind) { - case 248: - var pos_1 = ts.skipTrivia(sourceFile.text, 0, false); - if (pos_1 === sourceFile.text.length) { - return ts.createTextSpan(0, 0); + function reattachFileDiagnostics(newFile) { + if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) { + return; + } + for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) { + var diagnostic = _a[_i]; + diagnostic.file = newFile; + } + } + function add(diagnostic) { + var diagnostics; + if (diagnostic.file) { + diagnostics = fileDiagnostics[diagnostic.file.fileName]; + if (!diagnostics) { + diagnostics = []; + fileDiagnostics[diagnostic.file.fileName] = diagnostics; } - return getSpanOfTokenAtPosition(sourceFile, pos_1); - case 211: - case 163: - case 214: - case 186: - case 215: - case 218: - case 217: - case 247: - case 213: - case 173: - errorNode = node.name; - break; + } + else { + diagnostics = nonFileDiagnostics; + } + diagnostics.push(diagnostic); + diagnosticsModified = true; + modificationCount++; } - if (errorNode === undefined) { - return getSpanOfTokenAtPosition(sourceFile, node.pos); + function getGlobalDiagnostics() { + sortAndDeduplicate(); + return nonFileDiagnostics; + } + function getDiagnostics(fileName) { + sortAndDeduplicate(); + if (fileName) { + return fileDiagnostics[fileName] || []; + } + var allDiagnostics = []; + function pushDiagnostic(d) { + allDiagnostics.push(d); + } + ts.forEach(nonFileDiagnostics, pushDiagnostic); + for (var key in fileDiagnostics) { + if (ts.hasProperty(fileDiagnostics, key)) { + ts.forEach(fileDiagnostics[key], pushDiagnostic); + } + } + return ts.sortAndDeduplicateDiagnostics(allDiagnostics); + } + function sortAndDeduplicate() { + if (!diagnosticsModified) { + return; + } + diagnosticsModified = false; + nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics); + for (var key in fileDiagnostics) { + if (ts.hasProperty(fileDiagnostics, key)) { + fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]); + } + } } - var pos = nodeIsMissing(errorNode) - ? errorNode.pos - : ts.skipTrivia(sourceFile.text, errorNode.pos); - return ts.createTextSpanFromBounds(pos, errorNode.end); } - ts.getErrorSpanForNode = getErrorSpanForNode; - function isExternalModule(file) { - return file.externalModuleIndicator !== undefined; + ts.createDiagnosticCollection = createDiagnosticCollection; + var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; + var escapedCharsMap = { + "\0": "\\0", + "\t": "\\t", + "\v": "\\v", + "\f": "\\f", + "\b": "\\b", + "\r": "\\r", + "\n": "\\n", + "\\": "\\\\", + "\"": "\\\"", + "\u2028": "\\u2028", + "\u2029": "\\u2029", + "\u0085": "\\u0085" + }; + function escapeString(s) { + s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; + return s; + function getReplacement(c) { + return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); + } } - ts.isExternalModule = isExternalModule; - function isDeclarationFile(file) { - return (file.flags & 4096) !== 0; + ts.escapeString = escapeString; + function isIntrinsicJsxName(name) { + var ch = name.substr(0, 1); + return ch.toLowerCase() === ch; } - ts.isDeclarationFile = isDeclarationFile; - function isConstEnumDeclaration(node) { - return node.kind === 217 && isConst(node); + ts.isIntrinsicJsxName = isIntrinsicJsxName; + function get16BitUnicodeEscapeSequence(charCode) { + var hexCharCode = charCode.toString(16).toUpperCase(); + var paddedHexCode = ("0000" + hexCharCode).slice(-4); + return "\\u" + paddedHexCode; } - ts.isConstEnumDeclaration = isConstEnumDeclaration; - function walkUpBindingElementsAndPatterns(node) { - while (node && (node.kind === 163 || isBindingPattern(node))) { - node = node.parent; + var nonAsciiCharacters = /[^\u0000-\u007F]/g; + function escapeNonAsciiCharacters(s) { + return nonAsciiCharacters.test(s) ? + s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : + s; + } + ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; + var indentStrings = ["", " "]; + function getIndentString(level) { + if (indentStrings[level] === undefined) { + indentStrings[level] = getIndentString(level - 1) + indentStrings[1]; } - return node; + return indentStrings[level]; } - function getCombinedNodeFlags(node) { - node = walkUpBindingElementsAndPatterns(node); - var flags = node.flags; - if (node.kind === 211) { - node = node.parent; + ts.getIndentString = getIndentString; + function getIndentSize() { + return indentStrings[1].length; + } + ts.getIndentSize = getIndentSize; + function createTextWriter(newLine) { + var output; + var indent; + var lineStart; + var lineCount; + var linePos; + function write(s) { + if (s && s.length) { + if (lineStart) { + output += getIndentString(indent); + lineStart = false; + } + output += s; + } } - if (node && node.kind === 212) { - flags |= node.flags; - node = node.parent; + function reset() { + output = ""; + indent = 0; + lineStart = true; + lineCount = 0; + linePos = 0; } - if (node && node.kind === 193) { - flags |= node.flags; + function rawWrite(s) { + if (s !== undefined) { + if (lineStart) { + lineStart = false; + } + output += s; + } } - return flags; + function writeLiteral(s) { + if (s && s.length) { + write(s); + var lineStartsOfS = ts.computeLineStarts(s); + if (lineStartsOfS.length > 1) { + lineCount = lineCount + lineStartsOfS.length - 1; + linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS); + } + } + } + function writeLine() { + if (!lineStart) { + output += newLine; + lineCount++; + linePos = output.length; + lineStart = true; + } + } + function writeTextOfNode(text, node) { + write(getTextOfNodeFromSourceText(text, node)); + } + reset(); + return { + write: write, + rawWrite: rawWrite, + writeTextOfNode: writeTextOfNode, + writeLiteral: writeLiteral, + writeLine: writeLine, + increaseIndent: function () { return indent++; }, + decreaseIndent: function () { return indent--; }, + getIndent: function () { return indent; }, + getTextPos: function () { return output.length; }, + getLine: function () { return lineCount + 1; }, + getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; }, + getText: function () { return output; }, + reset: reset + }; } - ts.getCombinedNodeFlags = getCombinedNodeFlags; - function isConst(node) { - return !!(getCombinedNodeFlags(node) & 16384); + ts.createTextWriter = createTextWriter; + function getExternalModuleNameFromPath(host, fileName) { + var dir = host.getCurrentDirectory(); + var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, false); + return ts.removeFileExtension(relativePath); } - ts.isConst = isConst; - function isLet(node) { - return !!(getCombinedNodeFlags(node) & 8192); + ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath; + function getOwnEmitOutputFilePath(sourceFile, host, extension) { + var compilerOptions = host.getCompilerOptions(); + var emitOutputFilePathWithoutExtension; + if (compilerOptions.outDir) { + emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir)); + } + else { + emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName); + } + return emitOutputFilePathWithoutExtension + extension; } - ts.isLet = isLet; - function isPrologueDirective(node) { - return node.kind === 195 && node.expression.kind === 9; + ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath; + function getSourceFilePathInNewDir(sourceFile, host, newDirPath) { + var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory()); + sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), ""); + return ts.combinePaths(newDirPath, sourceFilePath); } - ts.isPrologueDirective = isPrologueDirective; - function getLeadingCommentRangesOfNode(node, sourceFileOfNode) { - return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos); + ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir; + function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) { + host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) { + diagnostics.push(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage)); + }); } - ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; - function getJsDocComments(node, sourceFileOfNode) { - var commentRanges = (node.kind === 138 || node.kind === 137) ? - ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) : - getLeadingCommentRangesOfNode(node, sourceFileOfNode); - return ts.filter(commentRanges, isJsDocComment); - function isJsDocComment(comment) { - return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 && - sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 && - sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47; - } + ts.writeFile = writeFile; + function getLineOfLocalPosition(currentSourceFile, pos) { + return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line; } - ts.getJsDocComments = getJsDocComments; - ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*/; - ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; - function isTypeNode(node) { - if (151 <= node.kind && node.kind <= 160) { - return true; - } - switch (node.kind) { - case 117: - case 128: - case 130: - case 120: - case 131: - return true; - case 103: - return node.parent.kind !== 177; - case 9: - return node.parent.kind === 138; - case 188: - return !isExpressionWithTypeArgumentsInClassExtendsClause(node); - case 69: - if (node.parent.kind === 135 && node.parent.right === node) { - node = node.parent; - } - else if (node.parent.kind === 166 && node.parent.name === node) { - node = node.parent; - } - ts.Debug.assert(node.kind === 69 || node.kind === 135 || node.kind === 166, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'."); - case 135: - case 166: - case 97: - var parent_1 = node.parent; - if (parent_1.kind === 154) { - return false; - } - if (151 <= parent_1.kind && parent_1.kind <= 160) { - return true; - } - switch (parent_1.kind) { - case 188: - return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1); - case 137: - return node === parent_1.constraint; - case 141: - case 140: - case 138: - case 211: - return node === parent_1.type; - case 213: - case 173: - case 174: - case 144: - case 143: - case 142: - case 145: - case 146: - return node === parent_1.type; - case 147: - case 148: - case 149: - return node === parent_1.type; - case 171: - return node === parent_1.type; - case 168: - case 169: - return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0; - case 170: - return false; - } + ts.getLineOfLocalPosition = getLineOfLocalPosition; + function getLineOfLocalPositionFromLineMap(lineMap, pos) { + return ts.computeLineAndCharacterOfPosition(lineMap, pos).line; + } + ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap; + function getFirstConstructorWithBody(node) { + return ts.forEach(node.members, function (member) { + if (member.kind === 144 && nodeIsPresent(member.body)) { + return member; + } + }); + } + ts.getFirstConstructorWithBody = getFirstConstructorWithBody; + function getSetAccessorTypeAnnotationNode(accessor) { + return accessor && accessor.parameters.length > 0 && accessor.parameters[0].type; + } + ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode; + function shouldEmitToOwnFile(sourceFile, compilerOptions) { + if (!isDeclarationFile(sourceFile)) { + if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) { + return compilerOptions.isolatedModules || !ts.fileExtensionIs(sourceFile.fileName, ".js"); + } + return false; } return false; } - ts.isTypeNode = isTypeNode; - function forEachReturnStatement(body, visitor) { - return traverse(body); - function traverse(node) { - switch (node.kind) { - case 204: - return visitor(node); - case 220: - case 192: - case 196: - case 197: - case 198: - case 199: - case 200: - case 201: - case 205: - case 206: - case 241: - case 242: - case 207: - case 209: - case 244: - return ts.forEachChild(node, traverse); + ts.shouldEmitToOwnFile = shouldEmitToOwnFile; + function getAllAccessorDeclarations(declarations, accessor) { + var firstAccessor; + var secondAccessor; + var getAccessor; + var setAccessor; + if (hasDynamicName(accessor)) { + firstAccessor = accessor; + if (accessor.kind === 145) { + getAccessor = accessor; + } + else if (accessor.kind === 146) { + setAccessor = accessor; + } + else { + ts.Debug.fail("Accessor has wrong kind"); } } - } - ts.forEachReturnStatement = forEachReturnStatement; - function forEachYieldExpression(body, visitor) { - return traverse(body); - function traverse(node) { - switch (node.kind) { - case 184: - visitor(node); - var operand = node.expression; - if (operand) { - traverse(operand); - } - case 217: - case 215: - case 218: - case 216: - case 214: - case 186: - return; - default: - if (isFunctionLike(node)) { - var name_5 = node.name; - if (name_5 && name_5.kind === 136) { - traverse(name_5.expression); - return; + else { + ts.forEach(declarations, function (member) { + if ((member.kind === 145 || member.kind === 146) + && (member.flags & 64) === (accessor.flags & 64)) { + var memberName = getPropertyNameForPropertyNameNode(member.name); + var accessorName = getPropertyNameForPropertyNameNode(accessor.name); + if (memberName === accessorName) { + if (!firstAccessor) { + firstAccessor = member; + } + else if (!secondAccessor) { + secondAccessor = member; + } + if (member.kind === 145 && !getAccessor) { + getAccessor = member; + } + if (member.kind === 146 && !setAccessor) { + setAccessor = member; } } - else if (!isTypeNode(node)) { - ts.forEachChild(node, traverse); - } - } + } + }); } + return { + firstAccessor: firstAccessor, + secondAccessor: secondAccessor, + getAccessor: getAccessor, + setAccessor: setAccessor + }; } - ts.forEachYieldExpression = forEachYieldExpression; - function isVariableLike(node) { - if (node) { - switch (node.kind) { - case 163: - case 247: - case 138: - case 245: - case 141: - case 140: - case 246: - case 211: - return true; - } + ts.getAllAccessorDeclarations = getAllAccessorDeclarations; + function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) { + if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && + getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) { + writer.writeLine(); } - return false; - } - ts.isVariableLike = isVariableLike; - function isAccessor(node) { - return node && (node.kind === 145 || node.kind === 146); - } - ts.isAccessor = isAccessor; - function isClassLike(node) { - return node && (node.kind === 214 || node.kind === 186); } - ts.isClassLike = isClassLike; - function isFunctionLike(node) { - return node && isFunctionLikeKind(node.kind); + ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments; + function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) { + var emitLeadingSpace = !trailingSeparator; + ts.forEach(comments, function (comment) { + if (emitLeadingSpace) { + writer.write(" "); + emitLeadingSpace = false; + } + writeComment(text, lineMap, writer, comment, newLine); + if (comment.hasTrailingNewLine) { + writer.writeLine(); + } + else if (trailingSeparator) { + writer.write(" "); + } + else { + emitLeadingSpace = true; + } + }); } - ts.isFunctionLike = isFunctionLike; - function isFunctionLikeKind(kind) { - switch (kind) { - case 144: - case 173: - case 213: - case 174: - case 143: - case 142: - case 145: - case 146: - case 147: - case 148: - case 149: - case 152: - case 153: - return true; + ts.emitComments = emitComments; + function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) { + var leadingComments; + var currentDetachedCommentInfo; + if (removeComments) { + if (node.pos === 0) { + leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment); + } } - } - ts.isFunctionLikeKind = isFunctionLikeKind; - function introducesArgumentsExoticObject(node) { - switch (node.kind) { - case 143: - case 142: - case 144: - case 145: - case 146: - case 213: - case 173: - return true; + else { + leadingComments = ts.getLeadingCommentRanges(text, node.pos); } - return false; - } - ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject; - function isIterationStatement(node, lookInLabeledStatements) { - switch (node.kind) { - case 199: - case 200: - case 201: - case 197: - case 198: - return true; - case 207: - return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements); + if (leadingComments) { + var detachedComments = []; + var lastComment; + for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) { + var comment = leadingComments_1[_i]; + if (lastComment) { + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end); + var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos); + if (commentLine >= lastCommentLine + 2) { + break; + } + } + detachedComments.push(comment); + lastComment = comment; + } + if (detachedComments.length) { + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end); + var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos)); + if (nodeLine >= lastCommentLine + 2) { + emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments); + emitComments(text, lineMap, writer, detachedComments, true, newLine, writeComment); + currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end }; + } + } + } + return currentDetachedCommentInfo; + function isPinnedComment(comment) { + return text.charCodeAt(comment.pos + 1) === 42 && + text.charCodeAt(comment.pos + 2) === 33; } - return false; - } - ts.isIterationStatement = isIterationStatement; - function isFunctionBlock(node) { - return node && node.kind === 192 && isFunctionLike(node.parent); - } - ts.isFunctionBlock = isFunctionBlock; - function isObjectLiteralMethod(node) { - return node && node.kind === 143 && node.parent.kind === 165; } - ts.isObjectLiteralMethod = isObjectLiteralMethod; - function getContainingFunction(node) { - while (true) { - node = node.parent; - if (!node || isFunctionLike(node)) { - return node; + ts.emitDetachedComments = emitDetachedComments; + function writeCommentRange(text, lineMap, writer, comment, newLine) { + if (text.charCodeAt(comment.pos + 1) === 42) { + var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos); + var lineCount = lineMap.length; + var firstCommentLineIndent; + for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { + var nextLineStart = (currentLine + 1) === lineCount + ? text.length + 1 + : lineMap[currentLine + 1]; + if (pos !== comment.pos) { + if (firstCommentLineIndent === undefined) { + firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos); + } + var currentWriterIndentSpacing = writer.getIndent() * getIndentSize(); + var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart); + if (spacesToEmit > 0) { + var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize(); + var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize()); + writer.rawWrite(indentSizeSpaceString); + while (numberOfSingleSpacesToEmit) { + writer.rawWrite(" "); + numberOfSingleSpacesToEmit--; + } + } + else { + writer.rawWrite(""); + } + } + writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart); + pos = nextLineStart; } } + else { + writer.write(text.substring(comment.pos, comment.end)); + } } - ts.getContainingFunction = getContainingFunction; - function getContainingClass(node) { - while (true) { - node = node.parent; - if (!node || isClassLike(node)) { - return node; + ts.writeCommentRange = writeCommentRange; + function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) { + var end = Math.min(comment.end, nextLineStart - 1); + var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, ""); + if (currentLineText) { + writer.write(currentLineText); + if (end !== comment.end) { + writer.writeLine(); } } + else { + writer.writeLiteral(newLine); + } } - ts.getContainingClass = getContainingClass; - function getThisContainer(node, includeArrowFunctions) { - while (true) { - node = node.parent; - if (!node) { - return undefined; + function calculateIndent(text, pos, end) { + var currentLineIndent = 0; + for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) { + if (text.charCodeAt(pos) === 9) { + currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); } - switch (node.kind) { - case 136: - if (isClassLike(node.parent.parent)) { - return node; - } - node = node.parent; - break; - case 139: - if (node.parent.kind === 138 && isClassElement(node.parent.parent)) { - node = node.parent.parent; - } - else if (isClassElement(node.parent)) { - node = node.parent; - } - break; - case 174: - if (!includeArrowFunctions) { - continue; - } - case 213: - case 173: - case 218: - case 141: - case 140: - case 143: - case 142: - case 144: - case 145: - case 146: - case 147: - case 148: - case 149: - case 217: - case 248: - return node; + else { + currentLineIndent++; } } + return currentLineIndent; } - ts.getThisContainer = getThisContainer; - function getSuperContainer(node, includeFunctions) { - while (true) { - node = node.parent; - if (!node) - return node; - switch (node.kind) { - case 136: - if (isClassLike(node.parent.parent)) { - return node; - } - node = node.parent; - break; - case 139: - if (node.parent.kind === 138 && isClassElement(node.parent.parent)) { - node = node.parent.parent; - } - else if (isClassElement(node.parent)) { - node = node.parent; - } - break; - case 213: - case 173: - case 174: - if (!includeFunctions) { - continue; - } - case 141: - case 140: - case 143: - case 142: - case 144: - case 145: - case 146: - return node; - } + function modifierToFlag(token) { + switch (token) { + case 113: return 64; + case 112: return 8; + case 111: return 32; + case 110: return 16; + case 115: return 128; + case 82: return 2; + case 122: return 4; + case 74: return 16384; + case 77: return 512; + case 118: return 256; } + return 0; } - ts.getSuperContainer = getSuperContainer; - function getEntityNameFromTypeNode(node) { - if (node) { - switch (node.kind) { - case 151: - return node.typeName; - case 188: - return node.expression; + ts.modifierToFlag = modifierToFlag; + function isLeftHandSideExpression(expr) { + if (expr) { + switch (expr.kind) { + case 166: + case 167: + case 169: + case 168: + case 233: + case 234: + case 170: + case 164: + case 172: + case 165: + case 186: + case 173: case 69: - case 135: - return node; + case 10: + case 8: + case 9: + case 11: + case 183: + case 84: + case 93: + case 97: + case 99: + case 95: + return true; } } - return undefined; + return false; } - ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode; - function getInvokedExpression(node) { - if (node.kind === 170) { - return node.tag; - } - return node.expression; + ts.isLeftHandSideExpression = isLeftHandSideExpression; + function isAssignmentOperator(token) { + return token >= 56 && token <= 68; } - ts.getInvokedExpression = getInvokedExpression; - function nodeCanBeDecorated(node) { - switch (node.kind) { - case 214: - return true; - case 141: - return node.parent.kind === 214; - case 138: - return node.parent.body && node.parent.parent.kind === 214; - case 145: - case 146: - case 143: - return node.body && node.parent.kind === 214; - } - return false; + ts.isAssignmentOperator = isAssignmentOperator; + function isExpressionWithTypeArgumentsInClassExtendsClause(node) { + return node.kind === 188 && + node.parent.token === 83 && + isClassLike(node.parent.parent); } - ts.nodeCanBeDecorated = nodeCanBeDecorated; - function nodeIsDecorated(node) { - switch (node.kind) { - case 214: - if (node.decorators) { - return true; - } - return false; - case 141: - case 138: - if (node.decorators) { - return true; - } - return false; - case 145: - if (node.body && node.decorators) { - return true; - } - return false; - case 143: - case 146: - if (node.body && node.decorators) { - return true; - } - return false; - } - return false; + ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause; + function isSupportedExpressionWithTypeArguments(node) { + return isSupportedExpressionWithTypeArgumentsRest(node.expression); } - ts.nodeIsDecorated = nodeIsDecorated; - function childIsDecorated(node) { - switch (node.kind) { - case 214: - return ts.forEach(node.members, nodeOrChildIsDecorated); - case 143: - case 146: - return ts.forEach(node.parameters, nodeIsDecorated); + ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments; + function isSupportedExpressionWithTypeArgumentsRest(node) { + if (node.kind === 69) { + return true; + } + else if (isPropertyAccessExpression(node)) { + return isSupportedExpressionWithTypeArgumentsRest(node.expression); + } + else { + return false; } - return false; - } - ts.childIsDecorated = childIsDecorated; - function nodeOrChildIsDecorated(node) { - return nodeIsDecorated(node) || childIsDecorated(node); - } - ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated; - function isPropertyAccessExpression(node) { - return node.kind === 166; } - ts.isPropertyAccessExpression = isPropertyAccessExpression; - function isElementAccessExpression(node) { - return node.kind === 167; + function isRightSideOfQualifiedNameOrPropertyAccess(node) { + return (node.parent.kind === 135 && node.parent.right === node) || + (node.parent.kind === 166 && node.parent.name === node); } - ts.isElementAccessExpression = isElementAccessExpression; - function isExpression(node) { - switch (node.kind) { - case 95: - case 93: - case 99: - case 84: - case 10: - case 164: - case 165: - case 166: - case 167: - case 168: - case 169: - case 170: - case 189: - case 171: - case 172: - case 173: - case 186: - case 174: - case 177: - case 175: - case 176: - case 179: - case 180: - case 181: - case 182: - case 185: - case 183: - case 11: - case 187: - case 233: - case 234: - case 184: - case 178: - return true; - case 135: - while (node.parent.kind === 135) { - node = node.parent; - } - return node.parent.kind === 154; - case 69: - if (node.parent.kind === 154) { - return true; - } - case 8: - case 9: - case 97: - var parent_2 = node.parent; - switch (parent_2.kind) { - case 211: - case 138: - case 141: - case 140: - case 247: - case 245: - case 163: - return parent_2.initializer === node; - case 195: - case 196: - case 197: - case 198: - case 204: - case 205: - case 206: - case 241: - case 208: - case 206: - return parent_2.expression === node; - case 199: - var forStatement = parent_2; - return (forStatement.initializer === node && forStatement.initializer.kind !== 212) || - forStatement.condition === node || - forStatement.incrementor === node; - case 200: - case 201: - var forInStatement = parent_2; - return (forInStatement.initializer === node && forInStatement.initializer.kind !== 212) || - forInStatement.expression === node; - case 171: - case 189: - return node === parent_2.expression; - case 190: - return node === parent_2.expression; - case 136: - return node === parent_2.expression; - case 139: - case 240: - case 239: - return true; - case 188: - return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2); - default: - if (isExpression(parent_2)) { - return true; - } - } + ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess; + function isEmptyObjectLiteralOrArrayLiteral(expression) { + var kind = expression.kind; + if (kind === 165) { + return expression.properties.length === 0; + } + if (kind === 164) { + return expression.elements.length === 0; } return false; } - ts.isExpression = isExpression; - function isExternalModuleNameRelative(moduleName) { - return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\"; - } - ts.isExternalModuleNameRelative = isExternalModuleNameRelative; - function isInstantiatedModule(node, preserveConstEnums) { - var moduleState = ts.getModuleInstanceState(node); - return moduleState === 1 || - (preserveConstEnums && moduleState === 2); - } - ts.isInstantiatedModule = isInstantiatedModule; - function isExternalModuleImportEqualsDeclaration(node) { - return node.kind === 221 && node.moduleReference.kind === 232; + ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral; + function getLocalSymbolForExportDefault(symbol) { + return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512) ? symbol.valueDeclaration.localSymbol : undefined; } - ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration; - function getExternalModuleImportEqualsDeclarationExpression(node) { - ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node)); - return node.moduleReference.expression; + ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; + function hasJavaScriptFileExtension(fileName) { + return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression; - function isInternalModuleImportEqualsDeclaration(node) { - return node.kind === 221 && node.moduleReference.kind !== 232; + ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension; + function allowsJsxExpressions(fileName) { + return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; - function getExternalModuleName(node) { - if (node.kind === 222) { - return node.moduleSpecifier; - } - if (node.kind === 221) { - var reference = node.moduleReference; - if (reference.kind === 232) { - return reference.expression; + ts.allowsJsxExpressions = allowsJsxExpressions; + function getExpandedCharCodes(input) { + var output = []; + var length = input.length; + for (var i = 0; i < length; i++) { + var charCode = input.charCodeAt(i); + if (charCode < 0x80) { + output.push(charCode); + } + else if (charCode < 0x800) { + output.push((charCode >> 6) | 192); + output.push((charCode & 63) | 128); + } + else if (charCode < 0x10000) { + output.push((charCode >> 12) | 224); + output.push(((charCode >> 6) & 63) | 128); + output.push((charCode & 63) | 128); + } + else if (charCode < 0x20000) { + output.push((charCode >> 18) | 240); + output.push(((charCode >> 12) & 63) | 128); + output.push(((charCode >> 6) & 63) | 128); + output.push((charCode & 63) | 128); + } + else { + ts.Debug.assert(false, "Unexpected code point"); } } - if (node.kind === 228) { - return node.moduleSpecifier; - } + return output; } - ts.getExternalModuleName = getExternalModuleName; - function hasQuestionToken(node) { - if (node) { - switch (node.kind) { - case 138: - case 143: - case 142: - case 246: - case 245: - case 141: - case 140: - return node.questionToken !== undefined; + var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + function convertToBase64(input) { + var result = ""; + var charCodes = getExpandedCharCodes(input); + var i = 0; + var length = charCodes.length; + var byte1, byte2, byte3, byte4; + while (i < length) { + byte1 = charCodes[i] >> 2; + byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4; + byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6; + byte4 = charCodes[i + 2] & 63; + if (i + 1 >= length) { + byte3 = byte4 = 64; } + else if (i + 2 >= length) { + byte4 = 64; + } + result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4); + i += 3; } - return false; + return result; } - ts.hasQuestionToken = hasQuestionToken; - function isJSDocConstructSignature(node) { - return node.kind === 261 && - node.parameters.length > 0 && - node.parameters[0].type.kind === 263; + ts.convertToBase64 = convertToBase64; + function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) { + return !ts.isRootedDiskPath(absoluteOrRelativePath) + ? absoluteOrRelativePath + : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, false); } - ts.isJSDocConstructSignature = isJSDocConstructSignature; - function getJSDocTag(node, kind) { - if (node && node.jsDocComment) { - for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) { - var tag = _a[_i]; - if (tag.kind === kind) { - return tag; - } - } + ts.convertToRelativePath = convertToRelativePath; + var carriageReturnLineFeed = "\r\n"; + var lineFeed = "\n"; + function getNewLineCharacter(options) { + if (options.newLine === 0) { + return carriageReturnLineFeed; + } + else if (options.newLine === 1) { + return lineFeed; + } + else if (ts.sys) { + return ts.sys.newLine; } + return carriageReturnLineFeed; } - function getJSDocTypeTag(node) { - return getJSDocTag(node, 269); + ts.getNewLineCharacter = getNewLineCharacter; +})(ts || (ts = {})); +var ts; +(function (ts) { + function getDefaultLibFileName(options) { + return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; } - ts.getJSDocTypeTag = getJSDocTypeTag; - function getJSDocReturnTag(node) { - return getJSDocTag(node, 268); + ts.getDefaultLibFileName = getDefaultLibFileName; + function textSpanEnd(span) { + return span.start + span.length; } - ts.getJSDocReturnTag = getJSDocReturnTag; - function getJSDocTemplateTag(node) { - return getJSDocTag(node, 270); + ts.textSpanEnd = textSpanEnd; + function textSpanIsEmpty(span) { + return span.length === 0; } - ts.getJSDocTemplateTag = getJSDocTemplateTag; - function getCorrespondingJSDocParameterTag(parameter) { - if (parameter.name && parameter.name.kind === 69) { - var parameterName = parameter.name.text; - var docComment = parameter.parent.jsDocComment; - if (docComment) { - return ts.forEach(docComment.tags, function (t) { - if (t.kind === 267) { - var parameterTag = t; - var name_6 = parameterTag.preParameterName || parameterTag.postParameterName; - if (name_6.text === parameterName) { - return t; - } - } - }); - } - } + ts.textSpanIsEmpty = textSpanIsEmpty; + function textSpanContainsPosition(span, position) { + return position >= span.start && position < textSpanEnd(span); } - ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag; - function hasRestParameter(s) { - return isRestParameter(ts.lastOrUndefined(s.parameters)); + ts.textSpanContainsPosition = textSpanContainsPosition; + function textSpanContainsTextSpan(span, other) { + return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span); } - ts.hasRestParameter = hasRestParameter; - function isRestParameter(node) { - if (node) { - if (node.parserContextFlags & 32) { - if (node.type && node.type.kind === 262) { - return true; - } - var paramTag = getCorrespondingJSDocParameterTag(node); - if (paramTag && paramTag.typeExpression) { - return paramTag.typeExpression.type.kind === 262; - } - } - return node.dotDotDotToken !== undefined; + ts.textSpanContainsTextSpan = textSpanContainsTextSpan; + function textSpanOverlapsWith(span, other) { + var overlapStart = Math.max(span.start, other.start); + var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other)); + return overlapStart < overlapEnd; + } + ts.textSpanOverlapsWith = textSpanOverlapsWith; + function textSpanOverlap(span1, span2) { + var overlapStart = Math.max(span1.start, span2.start); + var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2)); + if (overlapStart < overlapEnd) { + return createTextSpanFromBounds(overlapStart, overlapEnd); } - return false; + return undefined; } - ts.isRestParameter = isRestParameter; - function isLiteralKind(kind) { - return 8 <= kind && kind <= 11; + ts.textSpanOverlap = textSpanOverlap; + function textSpanIntersectsWithTextSpan(span, other) { + return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start; } - ts.isLiteralKind = isLiteralKind; - function isTextualLiteralKind(kind) { - return kind === 9 || kind === 11; + ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan; + function textSpanIntersectsWith(span, start, length) { + var end = start + length; + return start <= textSpanEnd(span) && end >= span.start; } - ts.isTextualLiteralKind = isTextualLiteralKind; - function isTemplateLiteralKind(kind) { - return 11 <= kind && kind <= 14; + ts.textSpanIntersectsWith = textSpanIntersectsWith; + function decodedTextSpanIntersectsWith(start1, length1, start2, length2) { + var end1 = start1 + length1; + var end2 = start2 + length2; + return start2 <= end1 && end2 >= start1; } - ts.isTemplateLiteralKind = isTemplateLiteralKind; - function isBindingPattern(node) { - return !!node && (node.kind === 162 || node.kind === 161); + ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith; + function textSpanIntersectsWithPosition(span, position) { + return position <= textSpanEnd(span) && position >= span.start; } - ts.isBindingPattern = isBindingPattern; - function isNodeDescendentOf(node, ancestor) { - while (node) { - if (node === ancestor) - return true; - node = node.parent; + ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition; + function textSpanIntersection(span1, span2) { + var intersectStart = Math.max(span1.start, span2.start); + var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2)); + if (intersectStart <= intersectEnd) { + return createTextSpanFromBounds(intersectStart, intersectEnd); } - return false; + return undefined; } - ts.isNodeDescendentOf = isNodeDescendentOf; - function isInAmbientContext(node) { - while (node) { - if (node.flags & (4 | 4096)) { - return true; - } - node = node.parent; + ts.textSpanIntersection = textSpanIntersection; + function createTextSpan(start, length) { + if (start < 0) { + throw new Error("start < 0"); } - return false; - } - ts.isInAmbientContext = isInAmbientContext; - function isDeclaration(node) { - switch (node.kind) { - case 174: - case 163: - case 214: - case 186: - case 144: - case 217: - case 247: - case 230: - case 213: - case 173: - case 145: - case 223: - case 221: - case 226: - case 215: - case 143: - case 142: - case 218: - case 224: - case 138: - case 245: - case 141: - case 140: - case 146: - case 246: - case 216: - case 137: - case 211: - return true; + if (length < 0) { + throw new Error("length < 0"); } - return false; + return { start: start, length: length }; } - ts.isDeclaration = isDeclaration; - function isStatement(n) { - switch (n.kind) { - case 203: - case 202: - case 210: - case 197: - case 195: - case 194: - case 200: - case 201: - case 199: - case 196: - case 207: - case 204: - case 206: - case 208: - case 209: - case 193: - case 198: - case 205: - case 227: - return true; - default: - return false; - } + ts.createTextSpan = createTextSpan; + function createTextSpanFromBounds(start, end) { + return createTextSpan(start, end - start); } - ts.isStatement = isStatement; - function isClassElement(n) { - switch (n.kind) { - case 144: - case 141: - case 143: - case 145: - case 146: - case 142: - case 149: - return true; - default: - return false; - } + ts.createTextSpanFromBounds = createTextSpanFromBounds; + function textChangeRangeNewSpan(range) { + return createTextSpan(range.span.start, range.newLength); } - ts.isClassElement = isClassElement; - function isDeclarationName(name) { - if (name.kind !== 69 && name.kind !== 9 && name.kind !== 8) { - return false; - } - var parent = name.parent; - if (parent.kind === 226 || parent.kind === 230) { - if (parent.propertyName) { - return true; - } - } - if (isDeclaration(parent)) { - return parent.name === name; - } - return false; + ts.textChangeRangeNewSpan = textChangeRangeNewSpan; + function textChangeRangeIsUnchanged(range) { + return textSpanIsEmpty(range.span) && range.newLength === 0; } - ts.isDeclarationName = isDeclarationName; - function isIdentifierName(node) { - var parent = node.parent; - switch (parent.kind) { - case 141: - case 140: - case 143: - case 142: - case 145: - case 146: - case 247: - case 245: - case 166: - return parent.name === node; - case 135: - if (parent.right === node) { - while (parent.kind === 135) { - parent = parent.parent; - } - return parent.kind === 154; - } - return false; - case 163: - case 226: - return parent.propertyName === node; - case 230: - return true; + ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged; + function createTextChangeRange(span, newLength) { + if (newLength < 0) { + throw new Error("newLength < 0"); } - return false; - } - ts.isIdentifierName = isIdentifierName; - function isAliasSymbolDeclaration(node) { - return node.kind === 221 || - node.kind === 223 && !!node.name || - node.kind === 224 || - node.kind === 226 || - node.kind === 230 || - node.kind === 227 && node.expression.kind === 69; - } - ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration; - function getClassExtendsHeritageClauseElement(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 83); - return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; - } - ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement; - function getClassImplementsHeritageClauseElements(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 106); - return heritageClause ? heritageClause.types : undefined; - } - ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements; - function getInterfaceBaseTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 83); - return heritageClause ? heritageClause.types : undefined; + return { span: span, newLength: newLength }; } - ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes; - function getHeritageClause(clauses, kind) { - if (clauses) { - for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) { - var clause = clauses_1[_i]; - if (clause.token === kind) { - return clause; - } - } + ts.createTextChangeRange = createTextChangeRange; + ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0); + function collapseTextChangeRangesAcrossMultipleVersions(changes) { + if (changes.length === 0) { + return ts.unchangedTextChangeRange; } - return undefined; - } - ts.getHeritageClause = getHeritageClause; - function tryResolveScriptReference(host, sourceFile, reference) { - if (!host.getCompilerOptions().noResolve) { - var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName); - return host.getSourceFile(referenceFileName); + if (changes.length === 1) { + return changes[0]; } - } - ts.tryResolveScriptReference = tryResolveScriptReference; - function getAncestor(node, kind) { - while (node) { - if (node.kind === kind) { - return node; - } - node = node.parent; + var change0 = changes[0]; + var oldStartN = change0.span.start; + var oldEndN = textSpanEnd(change0.span); + var newEndN = oldStartN + change0.newLength; + for (var i = 1; i < changes.length; i++) { + var nextChange = changes[i]; + var oldStart1 = oldStartN; + var oldEnd1 = oldEndN; + var newEnd1 = newEndN; + var oldStart2 = nextChange.span.start; + var oldEnd2 = textSpanEnd(nextChange.span); + var newEnd2 = oldStart2 + nextChange.newLength; + oldStartN = Math.min(oldStart1, oldStart2); + oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1)); + newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2)); } - return undefined; + return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); } - ts.getAncestor = getAncestor; - function getFileReferenceFromReferencePath(comment, commentRange) { - var simpleReferenceRegEx = /^\/\/\/\s*/gim; - if (simpleReferenceRegEx.exec(comment)) { - if (isNoDefaultLibRegEx.exec(comment)) { - return { - isNoDefaultLib: true - }; - } - else { - var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment); - if (matchResult) { - var start = commentRange.pos; - var end = commentRange.end; - return { - fileReference: { - pos: start, - end: end, - fileName: matchResult[3] - }, - isNoDefaultLib: false - }; - } - else { - return { - diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax, - isNoDefaultLib: false - }; + ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; + function getTypeParameterOwner(d) { + if (d && d.kind === 137) { + for (var current = d; current; current = current.parent) { + if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 215) { + return current; } } } - return undefined; - } - ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath; - function isKeyword(token) { - return 70 <= token && token <= 134; - } - ts.isKeyword = isKeyword; - function isTrivia(token) { - return 2 <= token && token <= 7; - } - ts.isTrivia = isTrivia; - function isAsyncFunctionLike(node) { - return isFunctionLike(node) && (node.flags & 256) !== 0 && !isAccessor(node); - } - ts.isAsyncFunctionLike = isAsyncFunctionLike; - function hasDynamicName(declaration) { - return declaration.name && - declaration.name.kind === 136 && - !isWellKnownSymbolSyntactically(declaration.name.expression); } - ts.hasDynamicName = hasDynamicName; - function isWellKnownSymbolSyntactically(node) { - return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression); - } - ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically; - function getPropertyNameForPropertyNameNode(name) { - if (name.kind === 69 || name.kind === 9 || name.kind === 8) { - return name.text; + ts.getTypeParameterOwner = getTypeParameterOwner; +})(ts || (ts = {})); +var ts; +(function (ts) { + ts.parseTime = 0; + var NodeConstructor; + var SourceFileConstructor; + function createNode(kind, pos, end) { + if (kind === 248) { + return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end); } - if (name.kind === 136) { - var nameExpression = name.expression; - if (isWellKnownSymbolSyntactically(nameExpression)) { - var rightHandSideName = nameExpression.name.text; - return getPropertyNameForKnownSymbolName(rightHandSideName); - } + else { + return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end); } - return undefined; - } - ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode; - function getPropertyNameForKnownSymbolName(symbolName) { - return "__@" + symbolName; - } - ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName; - function isESSymbolIdentifier(node) { - return node.kind === 69 && node.text === "Symbol"; } - ts.isESSymbolIdentifier = isESSymbolIdentifier; - function isModifier(token) { - switch (token) { - case 115: - case 118: - case 74: - case 122: - case 77: - case 82: - case 112: - case 110: - case 111: - case 113: - return true; + ts.createNode = createNode; + function visitNode(cbNode, node) { + if (node) { + return cbNode(node); } - return false; } - ts.isModifier = isModifier; - function isParameterDeclaration(node) { - var root = getRootDeclaration(node); - return root.kind === 138; + function visitNodeArray(cbNodes, nodes) { + if (nodes) { + return cbNodes(nodes); + } } - ts.isParameterDeclaration = isParameterDeclaration; - function getRootDeclaration(node) { - while (node.kind === 163) { - node = node.parent.parent; - } - return node; - } - ts.getRootDeclaration = getRootDeclaration; - function nodeStartsNewLexicalEnvironment(n) { - return isFunctionLike(n) || n.kind === 218 || n.kind === 248; - } - ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; - function cloneEntityName(node) { - if (node.kind === 69) { - var clone_1 = createSynthesizedNode(69); - clone_1.text = node.text; - return clone_1; - } - else { - var clone_2 = createSynthesizedNode(135); - clone_2.left = cloneEntityName(node.left); - clone_2.left.parent = clone_2; - clone_2.right = cloneEntityName(node.right); - clone_2.right.parent = clone_2; - return clone_2; - } - } - ts.cloneEntityName = cloneEntityName; - function nodeIsSynthesized(node) { - return node.pos === -1; - } - ts.nodeIsSynthesized = nodeIsSynthesized; - function createSynthesizedNode(kind, startsOnNewLine) { - var node = ts.createNode(kind, -1, -1); - node.startsOnNewLine = startsOnNewLine; - return node; - } - ts.createSynthesizedNode = createSynthesizedNode; - function createSynthesizedNodeArray() { - var array = []; - array.pos = -1; - array.end = -1; - return array; - } - ts.createSynthesizedNodeArray = createSynthesizedNodeArray; - function createDiagnosticCollection() { - var nonFileDiagnostics = []; - var fileDiagnostics = {}; - var diagnosticsModified = false; - var modificationCount = 0; - return { - add: add, - getGlobalDiagnostics: getGlobalDiagnostics, - getDiagnostics: getDiagnostics, - getModificationCount: getModificationCount, - reattachFileDiagnostics: reattachFileDiagnostics - }; - function getModificationCount() { - return modificationCount; - } - function reattachFileDiagnostics(newFile) { - if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) { - return; - } - for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) { - var diagnostic = _a[_i]; - diagnostic.file = newFile; - } - } - function add(diagnostic) { - var diagnostics; - if (diagnostic.file) { - diagnostics = fileDiagnostics[diagnostic.file.fileName]; - if (!diagnostics) { - diagnostics = []; - fileDiagnostics[diagnostic.file.fileName] = diagnostics; - } - } - else { - diagnostics = nonFileDiagnostics; - } - diagnostics.push(diagnostic); - diagnosticsModified = true; - modificationCount++; - } - function getGlobalDiagnostics() { - sortAndDeduplicate(); - return nonFileDiagnostics; - } - function getDiagnostics(fileName) { - sortAndDeduplicate(); - if (fileName) { - return fileDiagnostics[fileName] || []; - } - var allDiagnostics = []; - function pushDiagnostic(d) { - allDiagnostics.push(d); - } - ts.forEach(nonFileDiagnostics, pushDiagnostic); - for (var key in fileDiagnostics) { - if (ts.hasProperty(fileDiagnostics, key)) { - ts.forEach(fileDiagnostics[key], pushDiagnostic); - } - } - return ts.sortAndDeduplicateDiagnostics(allDiagnostics); - } - function sortAndDeduplicate() { - if (!diagnosticsModified) { - return; - } - diagnosticsModified = false; - nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics); - for (var key in fileDiagnostics) { - if (ts.hasProperty(fileDiagnostics, key)) { - fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]); - } - } - } - } - ts.createDiagnosticCollection = createDiagnosticCollection; - var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; - var escapedCharsMap = { - "\0": "\\0", - "\t": "\\t", - "\v": "\\v", - "\f": "\\f", - "\b": "\\b", - "\r": "\\r", - "\n": "\\n", - "\\": "\\\\", - "\"": "\\\"", - "\u2028": "\\u2028", - "\u2029": "\\u2029", - "\u0085": "\\u0085" - }; - function escapeString(s) { - s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s; - return s; - function getReplacement(c) { - return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0)); - } - } - ts.escapeString = escapeString; - function isIntrinsicJsxName(name) { - var ch = name.substr(0, 1); - return ch.toLowerCase() === ch; - } - ts.isIntrinsicJsxName = isIntrinsicJsxName; - function get16BitUnicodeEscapeSequence(charCode) { - var hexCharCode = charCode.toString(16).toUpperCase(); - var paddedHexCode = ("0000" + hexCharCode).slice(-4); - return "\\u" + paddedHexCode; - } - var nonAsciiCharacters = /[^\u0000-\u007F]/g; - function escapeNonAsciiCharacters(s) { - return nonAsciiCharacters.test(s) ? - s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) : - s; - } - ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters; - var indentStrings = ["", " "]; - function getIndentString(level) { - if (indentStrings[level] === undefined) { - indentStrings[level] = getIndentString(level - 1) + indentStrings[1]; - } - return indentStrings[level]; - } - ts.getIndentString = getIndentString; - function getIndentSize() { - return indentStrings[1].length; - } - ts.getIndentSize = getIndentSize; - function createTextWriter(newLine) { - var output = ""; - var indent = 0; - var lineStart = true; - var lineCount = 0; - var linePos = 0; - function write(s) { - if (s && s.length) { - if (lineStart) { - output += getIndentString(indent); - lineStart = false; - } - output += s; - } - } - function rawWrite(s) { - if (s !== undefined) { - if (lineStart) { - lineStart = false; - } - output += s; - } - } - function writeLiteral(s) { - if (s && s.length) { - write(s); - var lineStartsOfS = ts.computeLineStarts(s); - if (lineStartsOfS.length > 1) { - lineCount = lineCount + lineStartsOfS.length - 1; - linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS); - } - } - } - function writeLine() { - if (!lineStart) { - output += newLine; - lineCount++; - linePos = output.length; - lineStart = true; - } - } - function writeTextOfNode(sourceFile, node) { - write(getSourceTextOfNodeFromSourceFile(sourceFile, node)); - } - return { - write: write, - rawWrite: rawWrite, - writeTextOfNode: writeTextOfNode, - writeLiteral: writeLiteral, - writeLine: writeLine, - increaseIndent: function () { return indent++; }, - decreaseIndent: function () { return indent--; }, - getIndent: function () { return indent; }, - getTextPos: function () { return output.length; }, - getLine: function () { return lineCount + 1; }, - getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; }, - getText: function () { return output; } - }; - } - ts.createTextWriter = createTextWriter; - function getOwnEmitOutputFilePath(sourceFile, host, extension) { - var compilerOptions = host.getCompilerOptions(); - var emitOutputFilePathWithoutExtension; - if (compilerOptions.outDir) { - emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir)); - } - else { - emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName); - } - return emitOutputFilePathWithoutExtension + extension; - } - ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath; - function getSourceFilePathInNewDir(sourceFile, host, newDirPath) { - var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory()); - sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), ""); - return ts.combinePaths(newDirPath, sourceFilePath); - } - ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir; - function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) { - host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) { - diagnostics.push(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage)); - }); - } - ts.writeFile = writeFile; - function getLineOfLocalPosition(currentSourceFile, pos) { - return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line; - } - ts.getLineOfLocalPosition = getLineOfLocalPosition; - function getFirstConstructorWithBody(node) { - return ts.forEach(node.members, function (member) { - if (member.kind === 144 && nodeIsPresent(member.body)) { - return member; - } - }); - } - ts.getFirstConstructorWithBody = getFirstConstructorWithBody; - function getSetAccessorTypeAnnotationNode(accessor) { - return accessor && accessor.parameters.length > 0 && accessor.parameters[0].type; - } - ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode; - function shouldEmitToOwnFile(sourceFile, compilerOptions) { - if (!isDeclarationFile(sourceFile)) { - if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) { - return compilerOptions.isolatedModules || !ts.fileExtensionIs(sourceFile.fileName, ".js"); - } - return false; - } - return false; - } - ts.shouldEmitToOwnFile = shouldEmitToOwnFile; - function getAllAccessorDeclarations(declarations, accessor) { - var firstAccessor; - var secondAccessor; - var getAccessor; - var setAccessor; - if (hasDynamicName(accessor)) { - firstAccessor = accessor; - if (accessor.kind === 145) { - getAccessor = accessor; - } - else if (accessor.kind === 146) { - setAccessor = accessor; - } - else { - ts.Debug.fail("Accessor has wrong kind"); - } - } - else { - ts.forEach(declarations, function (member) { - if ((member.kind === 145 || member.kind === 146) - && (member.flags & 64) === (accessor.flags & 64)) { - var memberName = getPropertyNameForPropertyNameNode(member.name); - var accessorName = getPropertyNameForPropertyNameNode(accessor.name); - if (memberName === accessorName) { - if (!firstAccessor) { - firstAccessor = member; - } - else if (!secondAccessor) { - secondAccessor = member; - } - if (member.kind === 145 && !getAccessor) { - getAccessor = member; - } - if (member.kind === 146 && !setAccessor) { - setAccessor = member; - } - } - } - }); - } - return { - firstAccessor: firstAccessor, - secondAccessor: secondAccessor, - getAccessor: getAccessor, - setAccessor: setAccessor - }; - } - ts.getAllAccessorDeclarations = getAllAccessorDeclarations; - function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) { - if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && - getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) { - writer.writeLine(); - } - } - ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments; - function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) { - var emitLeadingSpace = !trailingSeparator; - ts.forEach(comments, function (comment) { - if (emitLeadingSpace) { - writer.write(" "); - emitLeadingSpace = false; - } - writeComment(currentSourceFile, writer, comment, newLine); - if (comment.hasTrailingNewLine) { - writer.writeLine(); - } - else if (trailingSeparator) { - writer.write(" "); - } - else { - emitLeadingSpace = true; - } - }); - } - ts.emitComments = emitComments; - function emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, removeComments) { - var leadingComments; - var currentDetachedCommentInfo; - if (removeComments) { - if (node.pos === 0) { - leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComment); - } - } - else { - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); - } - if (leadingComments) { - var detachedComments = []; - var lastComment; - for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) { - var comment = leadingComments_1[_i]; - if (lastComment) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end); - var commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos); - if (commentLine >= lastCommentLine + 2) { - break; - } - } - detachedComments.push(comment); - lastComment = comment; - } - if (detachedComments.length) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end); - var nodeLine = getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); - if (nodeLine >= lastCommentLine + 2) { - emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment); - currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end }; - } - } - } - return currentDetachedCommentInfo; - function isPinnedComment(comment) { - return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 33; - } - } - ts.emitDetachedComments = emitDetachedComments; - function writeCommentRange(currentSourceFile, writer, comment, newLine) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) { - var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos); - var lineCount = ts.getLineStarts(currentSourceFile).length; - var firstCommentLineIndent; - for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { - var nextLineStart = (currentLine + 1) === lineCount - ? currentSourceFile.text.length + 1 - : getStartPositionOfLine(currentLine + 1, currentSourceFile); - if (pos !== comment.pos) { - if (firstCommentLineIndent === undefined) { - firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); - } - var currentWriterIndentSpacing = writer.getIndent() * getIndentSize(); - var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart); - if (spacesToEmit > 0) { - var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize(); - var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize()); - writer.rawWrite(indentSizeSpaceString); - while (numberOfSingleSpacesToEmit) { - writer.rawWrite(" "); - numberOfSingleSpacesToEmit--; - } - } - else { - writer.rawWrite(""); - } - } - writeTrimmedCurrentLine(pos, nextLineStart); - pos = nextLineStart; - } - } - else { - writer.write(currentSourceFile.text.substring(comment.pos, comment.end)); - } - function writeTrimmedCurrentLine(pos, nextLineStart) { - var end = Math.min(comment.end, nextLineStart - 1); - var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, ""); - if (currentLineText) { - writer.write(currentLineText); - if (end !== comment.end) { - writer.writeLine(); - } - } - else { - writer.writeLiteral(newLine); - } - } - function calculateIndent(pos, end) { - var currentLineIndent = 0; - for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) { - if (currentSourceFile.text.charCodeAt(pos) === 9) { - currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); - } - else { - currentLineIndent++; - } - } - return currentLineIndent; - } - } - ts.writeCommentRange = writeCommentRange; - function modifierToFlag(token) { - switch (token) { - case 113: return 64; - case 112: return 8; - case 111: return 32; - case 110: return 16; - case 115: return 128; - case 82: return 2; - case 122: return 4; - case 74: return 16384; - case 77: return 512; - case 118: return 256; - } - return 0; - } - ts.modifierToFlag = modifierToFlag; - function isLeftHandSideExpression(expr) { - if (expr) { - switch (expr.kind) { - case 166: - case 167: - case 169: - case 168: - case 233: - case 234: - case 170: - case 164: - case 172: - case 165: - case 186: - case 173: - case 69: - case 10: - case 8: - case 9: - case 11: - case 183: - case 84: - case 93: - case 97: - case 99: - case 95: - return true; - } - } - return false; - } - ts.isLeftHandSideExpression = isLeftHandSideExpression; - function isAssignmentOperator(token) { - return token >= 56 && token <= 68; - } - ts.isAssignmentOperator = isAssignmentOperator; - function isExpressionWithTypeArgumentsInClassExtendsClause(node) { - return node.kind === 188 && - node.parent.token === 83 && - isClassLike(node.parent.parent); - } - ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause; - function isSupportedExpressionWithTypeArguments(node) { - return isSupportedExpressionWithTypeArgumentsRest(node.expression); - } - ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments; - function isSupportedExpressionWithTypeArgumentsRest(node) { - if (node.kind === 69) { - return true; - } - else if (isPropertyAccessExpression(node)) { - return isSupportedExpressionWithTypeArgumentsRest(node.expression); - } - else { - return false; - } - } - function isRightSideOfQualifiedNameOrPropertyAccess(node) { - return (node.parent.kind === 135 && node.parent.right === node) || - (node.parent.kind === 166 && node.parent.name === node); - } - ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess; - function isEmptyObjectLiteralOrArrayLiteral(expression) { - var kind = expression.kind; - if (kind === 165) { - return expression.properties.length === 0; - } - if (kind === 164) { - return expression.elements.length === 0; - } - return false; - } - ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral; - function getLocalSymbolForExportDefault(symbol) { - return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512) ? symbol.valueDeclaration.localSymbol : undefined; - } - ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; - function isJavaScript(fileName) { - return ts.fileExtensionIs(fileName, ".js"); - } - ts.isJavaScript = isJavaScript; - function isTsx(fileName) { - return ts.fileExtensionIs(fileName, ".tsx"); - } - ts.isTsx = isTsx; - function getExpandedCharCodes(input) { - var output = []; - var length = input.length; - for (var i = 0; i < length; i++) { - var charCode = input.charCodeAt(i); - if (charCode < 0x80) { - output.push(charCode); - } - else if (charCode < 0x800) { - output.push((charCode >> 6) | 192); - output.push((charCode & 63) | 128); - } - else if (charCode < 0x10000) { - output.push((charCode >> 12) | 224); - output.push(((charCode >> 6) & 63) | 128); - output.push((charCode & 63) | 128); - } - else if (charCode < 0x20000) { - output.push((charCode >> 18) | 240); - output.push(((charCode >> 12) & 63) | 128); - output.push(((charCode >> 6) & 63) | 128); - output.push((charCode & 63) | 128); - } - else { - ts.Debug.assert(false, "Unexpected code point"); - } - } - return output; - } - var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - function convertToBase64(input) { - var result = ""; - var charCodes = getExpandedCharCodes(input); - var i = 0; - var length = charCodes.length; - var byte1, byte2, byte3, byte4; - while (i < length) { - byte1 = charCodes[i] >> 2; - byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4; - byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6; - byte4 = charCodes[i + 2] & 63; - if (i + 1 >= length) { - byte3 = byte4 = 64; - } - else if (i + 2 >= length) { - byte4 = 64; - } - result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4); - i += 3; - } - return result; - } - ts.convertToBase64 = convertToBase64; - function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) { - return !ts.isRootedDiskPath(absoluteOrRelativePath) - ? absoluteOrRelativePath - : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, false); - } - ts.convertToRelativePath = convertToRelativePath; - var carriageReturnLineFeed = "\r\n"; - var lineFeed = "\n"; - function getNewLineCharacter(options) { - if (options.newLine === 0) { - return carriageReturnLineFeed; - } - else if (options.newLine === 1) { - return lineFeed; - } - else if (ts.sys) { - return ts.sys.newLine; - } - return carriageReturnLineFeed; - } - ts.getNewLineCharacter = getNewLineCharacter; -})(ts || (ts = {})); -var ts; -(function (ts) { - function getDefaultLibFileName(options) { - return options.target === 2 ? "lib.es6.d.ts" : "lib.d.ts"; - } - ts.getDefaultLibFileName = getDefaultLibFileName; - function textSpanEnd(span) { - return span.start + span.length; - } - ts.textSpanEnd = textSpanEnd; - function textSpanIsEmpty(span) { - return span.length === 0; - } - ts.textSpanIsEmpty = textSpanIsEmpty; - function textSpanContainsPosition(span, position) { - return position >= span.start && position < textSpanEnd(span); - } - ts.textSpanContainsPosition = textSpanContainsPosition; - function textSpanContainsTextSpan(span, other) { - return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span); - } - ts.textSpanContainsTextSpan = textSpanContainsTextSpan; - function textSpanOverlapsWith(span, other) { - var overlapStart = Math.max(span.start, other.start); - var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other)); - return overlapStart < overlapEnd; - } - ts.textSpanOverlapsWith = textSpanOverlapsWith; - function textSpanOverlap(span1, span2) { - var overlapStart = Math.max(span1.start, span2.start); - var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2)); - if (overlapStart < overlapEnd) { - return createTextSpanFromBounds(overlapStart, overlapEnd); - } - return undefined; - } - ts.textSpanOverlap = textSpanOverlap; - function textSpanIntersectsWithTextSpan(span, other) { - return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start; - } - ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan; - function textSpanIntersectsWith(span, start, length) { - var end = start + length; - return start <= textSpanEnd(span) && end >= span.start; - } - ts.textSpanIntersectsWith = textSpanIntersectsWith; - function decodedTextSpanIntersectsWith(start1, length1, start2, length2) { - var end1 = start1 + length1; - var end2 = start2 + length2; - return start2 <= end1 && end2 >= start1; - } - ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith; - function textSpanIntersectsWithPosition(span, position) { - return position <= textSpanEnd(span) && position >= span.start; - } - ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition; - function textSpanIntersection(span1, span2) { - var intersectStart = Math.max(span1.start, span2.start); - var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2)); - if (intersectStart <= intersectEnd) { - return createTextSpanFromBounds(intersectStart, intersectEnd); - } - return undefined; - } - ts.textSpanIntersection = textSpanIntersection; - function createTextSpan(start, length) { - if (start < 0) { - throw new Error("start < 0"); - } - if (length < 0) { - throw new Error("length < 0"); - } - return { start: start, length: length }; - } - ts.createTextSpan = createTextSpan; - function createTextSpanFromBounds(start, end) { - return createTextSpan(start, end - start); - } - ts.createTextSpanFromBounds = createTextSpanFromBounds; - function textChangeRangeNewSpan(range) { - return createTextSpan(range.span.start, range.newLength); - } - ts.textChangeRangeNewSpan = textChangeRangeNewSpan; - function textChangeRangeIsUnchanged(range) { - return textSpanIsEmpty(range.span) && range.newLength === 0; - } - ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged; - function createTextChangeRange(span, newLength) { - if (newLength < 0) { - throw new Error("newLength < 0"); - } - return { span: span, newLength: newLength }; - } - ts.createTextChangeRange = createTextChangeRange; - ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0); - function collapseTextChangeRangesAcrossMultipleVersions(changes) { - if (changes.length === 0) { - return ts.unchangedTextChangeRange; - } - if (changes.length === 1) { - return changes[0]; - } - var change0 = changes[0]; - var oldStartN = change0.span.start; - var oldEndN = textSpanEnd(change0.span); - var newEndN = oldStartN + change0.newLength; - for (var i = 1; i < changes.length; i++) { - var nextChange = changes[i]; - var oldStart1 = oldStartN; - var oldEnd1 = oldEndN; - var newEnd1 = newEndN; - var oldStart2 = nextChange.span.start; - var oldEnd2 = textSpanEnd(nextChange.span); - var newEnd2 = oldStart2 + nextChange.newLength; - oldStartN = Math.min(oldStart1, oldStart2); - oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1)); - newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2)); - } - return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN); - } - ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; - function getTypeParameterOwner(d) { - if (d && d.kind === 137) { - for (var current = d; current; current = current.parent) { - if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 215) { - return current; - } - } - } - } - ts.getTypeParameterOwner = getTypeParameterOwner; -})(ts || (ts = {})); -var ts; -(function (ts) { - var nodeConstructors = new Array(272); - ts.parseTime = 0; - function getNodeConstructor(kind) { - return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)); - } - ts.getNodeConstructor = getNodeConstructor; - function createNode(kind, pos, end) { - return new (getNodeConstructor(kind))(pos, end); - } - ts.createNode = createNode; - function visitNode(cbNode, node) { - if (node) { - return cbNode(node); - } - } - function visitNodeArray(cbNodes, nodes) { - if (nodes) { - return cbNodes(nodes); - } - } - function visitEachNode(cbNode, nodes) { - if (nodes) { - for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) { - var node = nodes_1[_i]; - var result = cbNode(node); - if (result) { - return result; - } - } + function visitEachNode(cbNode, nodes) { + if (nodes) { + for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) { + var node = nodes_1[_i]; + var result = cbNode(node); + if (result) { + return result; + } + } } } function forEachChild(node, cbNode, cbNodeArray) { @@ -6567,6 +5625,8 @@ var ts; (function (Parser) { var scanner = ts.createScanner(2, true); var disallowInAndDecoratorContext = 1 | 4; + var NodeConstructor; + var SourceFileConstructor; var sourceFile; var parseDiagnostics; var syntaxCursor; @@ -6579,13 +5639,16 @@ var ts; var contextFlags; var parseErrorBeforeNextFinishedNode = false; function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) { - initializeState(fileName, _sourceText, languageVersion, _syntaxCursor); + var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0; + initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor); var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes); clearState(); return result; } Parser.parseSourceFile = parseSourceFile; - function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) { + function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) { + NodeConstructor = ts.objectAllocator.getNodeConstructor(); + SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor(); sourceText = _sourceText; syntaxCursor = _syntaxCursor; parseDiagnostics = []; @@ -6593,12 +5656,12 @@ var ts; identifiers = {}; identifierCount = 0; nodeCount = 0; - contextFlags = ts.isJavaScript(fileName) ? 32 : 0; + contextFlags = isJavaScriptFile ? 32 : 0; parseErrorBeforeNextFinishedNode = false; scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 : 0); + scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 : 0); } function clearState() { scanner.setText(""); @@ -6611,6 +5674,9 @@ var ts; } function parseSourceFileWorker(fileName, languageVersion, setParentNodes) { sourceFile = createSourceFile(fileName, languageVersion); + if (contextFlags & 32) { + sourceFile.parserContextFlags = 32; + } token = nextToken(); processReferenceComments(sourceFile); sourceFile.statements = parseList(0, parseStatement); @@ -6624,7 +5690,7 @@ var ts; if (setParentNodes) { fixupParentReferences(sourceFile); } - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { addJSDocComments(); } return sourceFile; @@ -6670,15 +5736,14 @@ var ts; } Parser.fixupParentReferences = fixupParentReferences; function createSourceFile(fileName, languageVersion) { - var sourceFile = createNode(248, 0); - sourceFile.pos = 0; - sourceFile.end = sourceText.length; + var sourceFile = new SourceFileConstructor(248, 0, sourceText.length); + nodeCount++; sourceFile.text = sourceText; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0; - sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 : 0; + sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 : 0; return sourceFile; } function setContextFlag(val, flag) { @@ -6900,7 +5965,7 @@ var ts; if (!(pos >= 0)) { pos = scanner.getStartPos(); } - return new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))(pos, pos); + return new NodeConstructor(kind, pos, pos); } function finishNode(node, end) { node.end = end === undefined ? scanner.getStartPos() : end; @@ -7038,7 +6103,7 @@ var ts; case 12: return token === 19 || token === 37 || isLiteralPropertyName(); case 9: - return isLiteralPropertyName(); + return token === 19 || isLiteralPropertyName(); case 7: if (token === 15) { return lookAhead(isValidHeritageClauseObjectLiteral); @@ -7328,3470 +6393,4539 @@ var ts; return true; } } - return false; + return false; + } + function isReusableEnumMember(node) { + return node.kind === 247; + } + function isReusableTypeMember(node) { + if (node) { + switch (node.kind) { + case 148: + case 142: + case 149: + case 140: + case 147: + return true; + } + } + return false; + } + function isReusableVariableDeclaration(node) { + if (node.kind !== 211) { + return false; + } + var variableDeclarator = node; + return variableDeclarator.initializer === undefined; + } + function isReusableParameter(node) { + if (node.kind !== 138) { + return false; + } + var parameter = node; + return parameter.initializer === undefined; + } + function abortParsingListOrMoveToNextToken(kind) { + parseErrorAtCurrentToken(parsingContextErrors(kind)); + if (isInSomeParsingContext()) { + return true; + } + nextToken(); + return false; + } + function parsingContextErrors(context) { + switch (context) { + case 0: return ts.Diagnostics.Declaration_or_statement_expected; + case 1: return ts.Diagnostics.Declaration_or_statement_expected; + case 2: return ts.Diagnostics.case_or_default_expected; + case 3: return ts.Diagnostics.Statement_expected; + case 4: return ts.Diagnostics.Property_or_signature_expected; + case 5: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected; + case 6: return ts.Diagnostics.Enum_member_expected; + case 7: return ts.Diagnostics.Expression_expected; + case 8: return ts.Diagnostics.Variable_declaration_expected; + case 9: return ts.Diagnostics.Property_destructuring_pattern_expected; + case 10: return ts.Diagnostics.Array_element_destructuring_pattern_expected; + case 11: return ts.Diagnostics.Argument_expression_expected; + case 12: return ts.Diagnostics.Property_assignment_expected; + case 15: return ts.Diagnostics.Expression_or_comma_expected; + case 16: return ts.Diagnostics.Parameter_declaration_expected; + case 17: return ts.Diagnostics.Type_parameter_declaration_expected; + case 18: return ts.Diagnostics.Type_argument_expected; + case 19: return ts.Diagnostics.Type_expected; + case 20: return ts.Diagnostics.Unexpected_token_expected; + case 21: return ts.Diagnostics.Identifier_expected; + case 13: return ts.Diagnostics.Identifier_expected; + case 14: return ts.Diagnostics.Identifier_expected; + case 22: return ts.Diagnostics.Parameter_declaration_expected; + case 23: return ts.Diagnostics.Type_argument_expected; + case 25: return ts.Diagnostics.Type_expected; + case 24: return ts.Diagnostics.Property_assignment_expected; + } + } + ; + function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) { + var saveParsingContext = parsingContext; + parsingContext |= 1 << kind; + var result = []; + result.pos = getNodePos(); + var commaStart = -1; + while (true) { + if (isListElement(kind, false)) { + result.push(parseListElement(kind, parseElement)); + commaStart = scanner.getTokenPos(); + if (parseOptional(24)) { + continue; + } + commaStart = -1; + if (isListTerminator(kind)) { + break; + } + parseExpected(24); + if (considerSemicolonAsDelimeter && token === 23 && !scanner.hasPrecedingLineBreak()) { + nextToken(); + } + continue; + } + if (isListTerminator(kind)) { + break; + } + if (abortParsingListOrMoveToNextToken(kind)) { + break; + } + } + if (commaStart >= 0) { + result.hasTrailingComma = true; + } + result.end = getNodeEnd(); + parsingContext = saveParsingContext; + return result; + } + function createMissingList() { + var pos = getNodePos(); + var result = []; + result.pos = pos; + result.end = pos; + return result; + } + function parseBracketedList(kind, parseElement, open, close) { + if (parseExpected(open)) { + var result = parseDelimitedList(kind, parseElement); + parseExpected(close); + return result; + } + return createMissingList(); + } + function parseEntityName(allowReservedWords, diagnosticMessage) { + var entity = parseIdentifier(diagnosticMessage); + while (parseOptional(21)) { + var node = createNode(135, entity.pos); + node.left = entity; + node.right = parseRightSideOfDot(allowReservedWords); + entity = finishNode(node); + } + return entity; + } + function parseRightSideOfDot(allowIdentifierNames) { + if (scanner.hasPrecedingLineBreak() && ts.tokenIsIdentifierOrKeyword(token)) { + var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); + if (matchesPattern) { + return createMissingNode(69, true, ts.Diagnostics.Identifier_expected); + } + } + return allowIdentifierNames ? parseIdentifierName() : parseIdentifier(); + } + function parseTemplateExpression() { + var template = createNode(183); + template.head = parseLiteralNode(); + ts.Debug.assert(template.head.kind === 12, "Template head has wrong token kind"); + var templateSpans = []; + templateSpans.pos = getNodePos(); + do { + templateSpans.push(parseTemplateSpan()); + } while (ts.lastOrUndefined(templateSpans).literal.kind === 13); + templateSpans.end = getNodeEnd(); + template.templateSpans = templateSpans; + return finishNode(template); + } + function parseTemplateSpan() { + var span = createNode(190); + span.expression = allowInAnd(parseExpression); + var literal; + if (token === 16) { + reScanTemplateToken(); + literal = parseLiteralNode(); + } + else { + literal = parseExpectedToken(14, false, ts.Diagnostics._0_expected, ts.tokenToString(16)); + } + span.literal = literal; + return finishNode(span); + } + function parseLiteralNode(internName) { + var node = createNode(token); + var text = scanner.getTokenValue(); + node.text = internName ? internIdentifier(text) : text; + if (scanner.hasExtendedUnicodeEscape()) { + node.hasExtendedUnicodeEscape = true; + } + if (scanner.isUnterminated()) { + node.isUnterminated = true; + } + var tokenPos = scanner.getTokenPos(); + nextToken(); + finishNode(node); + if (node.kind === 8 + && sourceText.charCodeAt(tokenPos) === 48 + && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { + node.flags |= 32768; + } + return node; + } + function parseTypeReferenceOrTypePredicate() { + var typeName = parseEntityName(false, ts.Diagnostics.Type_expected); + if (typeName.kind === 69 && token === 124 && !scanner.hasPrecedingLineBreak()) { + nextToken(); + var node_1 = createNode(150, typeName.pos); + node_1.parameterName = typeName; + node_1.type = parseType(); + return finishNode(node_1); + } + var node = createNode(151, typeName.pos); + node.typeName = typeName; + if (!scanner.hasPrecedingLineBreak() && token === 25) { + node.typeArguments = parseBracketedList(18, parseType, 25, 27); + } + return finishNode(node); + } + function parseTypeQuery() { + var node = createNode(154); + parseExpected(101); + node.exprName = parseEntityName(true); + return finishNode(node); + } + function parseTypeParameter() { + var node = createNode(137); + node.name = parseIdentifier(); + if (parseOptional(83)) { + if (isStartOfType() || !isStartOfExpression()) { + node.constraint = parseType(); + } + else { + node.expression = parseUnaryExpressionOrHigher(); + } + } + return finishNode(node); + } + function parseTypeParameters() { + if (token === 25) { + return parseBracketedList(17, parseTypeParameter, 25, 27); + } + } + function parseParameterType() { + if (parseOptional(54)) { + return parseType(); + } + return undefined; + } + function isStartOfParameter() { + return token === 22 || isIdentifierOrPattern() || ts.isModifier(token) || token === 55; + } + function setModifiers(node, modifiers) { + if (modifiers) { + node.flags |= modifiers.flags; + node.modifiers = modifiers; + } + } + function parseParameter() { + var node = createNode(138); + node.decorators = parseDecorators(); + setModifiers(node, parseModifiers()); + node.dotDotDotToken = parseOptionalToken(22); + node.name = parseIdentifierOrPattern(); + if (ts.getFullWidth(node.name) === 0 && node.flags === 0 && ts.isModifier(token)) { + nextToken(); + } + node.questionToken = parseOptionalToken(53); + node.type = parseParameterType(); + node.initializer = parseBindingElementInitializer(true); + return finishNode(node); + } + function parseBindingElementInitializer(inParameter) { + return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); + } + function parseParameterInitializer() { + return parseInitializer(true); + } + function fillSignature(returnToken, yieldContext, awaitContext, requireCompleteParameterList, signature) { + var returnTokenRequired = returnToken === 34; + signature.typeParameters = parseTypeParameters(); + signature.parameters = parseParameterList(yieldContext, awaitContext, requireCompleteParameterList); + if (returnTokenRequired) { + parseExpected(returnToken); + signature.type = parseType(); + } + else if (parseOptional(returnToken)) { + signature.type = parseType(); + } + } + function parseParameterList(yieldContext, awaitContext, requireCompleteParameterList) { + if (parseExpected(17)) { + var savedYieldContext = inYieldContext(); + var savedAwaitContext = inAwaitContext(); + setYieldContext(yieldContext); + setAwaitContext(awaitContext); + var result = parseDelimitedList(16, parseParameter); + setYieldContext(savedYieldContext); + setAwaitContext(savedAwaitContext); + if (!parseExpected(18) && requireCompleteParameterList) { + return undefined; + } + return result; + } + return requireCompleteParameterList ? undefined : createMissingList(); } - function isReusableEnumMember(node) { - return node.kind === 247; + function parseTypeMemberSemicolon() { + if (parseOptional(24)) { + return; + } + parseSemicolon(); } - function isReusableTypeMember(node) { - if (node) { - switch (node.kind) { - case 148: - case 142: - case 149: - case 140: - case 147: - return true; - } + function parseSignatureMember(kind) { + var node = createNode(kind); + if (kind === 148) { + parseExpected(92); } - return false; + fillSignature(54, false, false, false, node); + parseTypeMemberSemicolon(); + return finishNode(node); } - function isReusableVariableDeclaration(node) { - if (node.kind !== 211) { + function isIndexSignature() { + if (token !== 19) { return false; } - var variableDeclarator = node; - return variableDeclarator.initializer === undefined; + return lookAhead(isUnambiguouslyIndexSignature); } - function isReusableParameter(node) { - if (node.kind !== 138) { + function isUnambiguouslyIndexSignature() { + nextToken(); + if (token === 22 || token === 20) { + return true; + } + if (ts.isModifier(token)) { + nextToken(); + if (isIdentifier()) { + return true; + } + } + else if (!isIdentifier()) { return false; } - var parameter = node; - return parameter.initializer === undefined; - } - function abortParsingListOrMoveToNextToken(kind) { - parseErrorAtCurrentToken(parsingContextErrors(kind)); - if (isInSomeParsingContext()) { + else { + nextToken(); + } + if (token === 54 || token === 24) { return true; } + if (token !== 53) { + return false; + } nextToken(); - return false; + return token === 54 || token === 24 || token === 20; } - function parsingContextErrors(context) { - switch (context) { - case 0: return ts.Diagnostics.Declaration_or_statement_expected; - case 1: return ts.Diagnostics.Declaration_or_statement_expected; - case 2: return ts.Diagnostics.case_or_default_expected; - case 3: return ts.Diagnostics.Statement_expected; - case 4: return ts.Diagnostics.Property_or_signature_expected; - case 5: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected; - case 6: return ts.Diagnostics.Enum_member_expected; - case 7: return ts.Diagnostics.Expression_expected; - case 8: return ts.Diagnostics.Variable_declaration_expected; - case 9: return ts.Diagnostics.Property_destructuring_pattern_expected; - case 10: return ts.Diagnostics.Array_element_destructuring_pattern_expected; - case 11: return ts.Diagnostics.Argument_expression_expected; - case 12: return ts.Diagnostics.Property_assignment_expected; - case 15: return ts.Diagnostics.Expression_or_comma_expected; - case 16: return ts.Diagnostics.Parameter_declaration_expected; - case 17: return ts.Diagnostics.Type_parameter_declaration_expected; - case 18: return ts.Diagnostics.Type_argument_expected; - case 19: return ts.Diagnostics.Type_expected; - case 20: return ts.Diagnostics.Unexpected_token_expected; - case 21: return ts.Diagnostics.Identifier_expected; - case 13: return ts.Diagnostics.Identifier_expected; - case 14: return ts.Diagnostics.Identifier_expected; - case 22: return ts.Diagnostics.Parameter_declaration_expected; - case 23: return ts.Diagnostics.Type_argument_expected; - case 25: return ts.Diagnostics.Type_expected; - case 24: return ts.Diagnostics.Property_assignment_expected; + function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) { + var node = createNode(149, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.parameters = parseBracketedList(16, parseParameter, 19, 20); + node.type = parseTypeAnnotation(); + parseTypeMemberSemicolon(); + return finishNode(node); + } + function parsePropertyOrMethodSignature() { + var fullStart = scanner.getStartPos(); + var name = parsePropertyName(); + var questionToken = parseOptionalToken(53); + if (token === 17 || token === 25) { + var method = createNode(142, fullStart); + method.name = name; + method.questionToken = questionToken; + fillSignature(54, false, false, false, method); + parseTypeMemberSemicolon(); + return finishNode(method); + } + else { + var property = createNode(140, fullStart); + property.name = name; + property.questionToken = questionToken; + property.type = parseTypeAnnotation(); + parseTypeMemberSemicolon(); + return finishNode(property); } } - ; - function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) { - var saveParsingContext = parsingContext; - parsingContext |= 1 << kind; - var result = []; - result.pos = getNodePos(); - var commaStart = -1; - while (true) { - if (isListElement(kind, false)) { - result.push(parseListElement(kind, parseElement)); - commaStart = scanner.getTokenPos(); - if (parseOptional(24)) { - continue; + function isStartOfTypeMember() { + switch (token) { + case 17: + case 25: + case 19: + return true; + default: + if (ts.isModifier(token)) { + var result = lookAhead(isStartOfIndexSignatureDeclaration); + if (result) { + return result; + } } - commaStart = -1; - if (isListTerminator(kind)) { - break; + return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName); + } + } + function isStartOfIndexSignatureDeclaration() { + while (ts.isModifier(token)) { + nextToken(); + } + return isIndexSignature(); + } + function isTypeMemberWithLiteralPropertyName() { + nextToken(); + return token === 17 || + token === 25 || + token === 53 || + token === 54 || + canParseSemicolon(); + } + function parseTypeMember() { + switch (token) { + case 17: + case 25: + return parseSignatureMember(147); + case 19: + return isIndexSignature() + ? parseIndexSignatureDeclaration(scanner.getStartPos(), undefined, undefined) + : parsePropertyOrMethodSignature(); + case 92: + if (lookAhead(isStartOfConstructSignature)) { + return parseSignatureMember(148); } - parseExpected(24); - if (considerSemicolonAsDelimeter && token === 23 && !scanner.hasPrecedingLineBreak()) { - nextToken(); + case 9: + case 8: + return parsePropertyOrMethodSignature(); + default: + if (ts.isModifier(token)) { + var result = tryParse(parseIndexSignatureWithModifiers); + if (result) { + return result; + } } - continue; - } - if (isListTerminator(kind)) { - break; - } - if (abortParsingListOrMoveToNextToken(kind)) { - break; - } + if (ts.tokenIsIdentifierOrKeyword(token)) { + return parsePropertyOrMethodSignature(); + } + } + } + function parseIndexSignatureWithModifiers() { + var fullStart = scanner.getStartPos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + return isIndexSignature() + ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers) + : undefined; + } + function isStartOfConstructSignature() { + nextToken(); + return token === 17 || token === 25; + } + function parseTypeLiteral() { + var node = createNode(155); + node.members = parseObjectTypeMembers(); + return finishNode(node); + } + function parseObjectTypeMembers() { + var members; + if (parseExpected(15)) { + members = parseList(4, parseTypeMember); + parseExpected(16); } - if (commaStart >= 0) { - result.hasTrailingComma = true; + else { + members = createMissingList(); } - result.end = getNodeEnd(); - parsingContext = saveParsingContext; - return result; + return members; } - function createMissingList() { - var pos = getNodePos(); - var result = []; - result.pos = pos; - result.end = pos; - return result; + function parseTupleType() { + var node = createNode(157); + node.elementTypes = parseBracketedList(19, parseType, 19, 20); + return finishNode(node); } - function parseBracketedList(kind, parseElement, open, close) { - if (parseExpected(open)) { - var result = parseDelimitedList(kind, parseElement); - parseExpected(close); - return result; + function parseParenthesizedType() { + var node = createNode(160); + parseExpected(17); + node.type = parseType(); + parseExpected(18); + return finishNode(node); + } + function parseFunctionOrConstructorType(kind) { + var node = createNode(kind); + if (kind === 153) { + parseExpected(92); } - return createMissingList(); + fillSignature(34, false, false, false, node); + return finishNode(node); } - function parseEntityName(allowReservedWords, diagnosticMessage) { - var entity = parseIdentifier(diagnosticMessage); - while (parseOptional(21)) { - var node = createNode(135, entity.pos); - node.left = entity; - node.right = parseRightSideOfDot(allowReservedWords); - entity = finishNode(node); + function parseKeywordAndNoDot() { + var node = parseTokenNode(); + return token === 21 ? undefined : node; + } + function parseNonArrayType() { + switch (token) { + case 117: + case 130: + case 128: + case 120: + case 131: + var node = tryParse(parseKeywordAndNoDot); + return node || parseTypeReferenceOrTypePredicate(); + case 9: + return parseLiteralNode(true); + case 103: + case 97: + return parseTokenNode(); + case 101: + return parseTypeQuery(); + case 15: + return parseTypeLiteral(); + case 19: + return parseTupleType(); + case 17: + return parseParenthesizedType(); + default: + return parseTypeReferenceOrTypePredicate(); } - return entity; } - function parseRightSideOfDot(allowIdentifierNames) { - if (scanner.hasPrecedingLineBreak() && ts.tokenIsIdentifierOrKeyword(token)) { - var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); - if (matchesPattern) { - return createMissingNode(69, true, ts.Diagnostics.Identifier_expected); - } + function isStartOfType() { + switch (token) { + case 117: + case 130: + case 128: + case 120: + case 131: + case 103: + case 97: + case 101: + case 15: + case 19: + case 25: + case 92: + case 9: + return true; + case 17: + return lookAhead(isStartOfParenthesizedOrFunctionType); + default: + return isIdentifier(); } - return allowIdentifierNames ? parseIdentifierName() : parseIdentifier(); } - function parseTemplateExpression() { - var template = createNode(183); - template.head = parseLiteralNode(); - ts.Debug.assert(template.head.kind === 12, "Template head has wrong token kind"); - var templateSpans = []; - templateSpans.pos = getNodePos(); - do { - templateSpans.push(parseTemplateSpan()); - } while (ts.lastOrUndefined(templateSpans).literal.kind === 13); - templateSpans.end = getNodeEnd(); - template.templateSpans = templateSpans; - return finishNode(template); + function isStartOfParenthesizedOrFunctionType() { + nextToken(); + return token === 18 || isStartOfParameter() || isStartOfType(); } - function parseTemplateSpan() { - var span = createNode(190); - span.expression = allowInAnd(parseExpression); - var literal; - if (token === 16) { - reScanTemplateToken(); - literal = parseLiteralNode(); - } - else { - literal = parseExpectedToken(14, false, ts.Diagnostics._0_expected, ts.tokenToString(16)); + function parseArrayTypeOrHigher() { + var type = parseNonArrayType(); + while (!scanner.hasPrecedingLineBreak() && parseOptional(19)) { + parseExpected(20); + var node = createNode(156, type.pos); + node.elementType = type; + type = finishNode(node); } - span.literal = literal; - return finishNode(span); + return type; } - function parseLiteralNode(internName) { - var node = createNode(token); - var text = scanner.getTokenValue(); - node.text = internName ? internIdentifier(text) : text; - if (scanner.hasExtendedUnicodeEscape()) { - node.hasExtendedUnicodeEscape = true; + function parseUnionOrIntersectionType(kind, parseConstituentType, operator) { + var type = parseConstituentType(); + if (token === operator) { + var types = [type]; + types.pos = type.pos; + while (parseOptional(operator)) { + types.push(parseConstituentType()); + } + types.end = getNodeEnd(); + var node = createNode(kind, type.pos); + node.types = types; + type = finishNode(node); } - if (scanner.isUnterminated()) { - node.isUnterminated = true; + return type; + } + function parseIntersectionTypeOrHigher() { + return parseUnionOrIntersectionType(159, parseArrayTypeOrHigher, 46); + } + function parseUnionTypeOrHigher() { + return parseUnionOrIntersectionType(158, parseIntersectionTypeOrHigher, 47); + } + function isStartOfFunctionType() { + if (token === 25) { + return true; } - var tokenPos = scanner.getTokenPos(); + return token === 17 && lookAhead(isUnambiguouslyStartOfFunctionType); + } + function isUnambiguouslyStartOfFunctionType() { nextToken(); - finishNode(node); - if (node.kind === 8 - && sourceText.charCodeAt(tokenPos) === 48 - && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= 32768; + if (token === 18 || token === 22) { + return true; } - return node; - } - function parseTypeReferenceOrTypePredicate() { - var typeName = parseEntityName(false, ts.Diagnostics.Type_expected); - if (typeName.kind === 69 && token === 124 && !scanner.hasPrecedingLineBreak()) { + if (isIdentifier() || ts.isModifier(token)) { nextToken(); - var node_1 = createNode(150, typeName.pos); - node_1.parameterName = typeName; - node_1.type = parseType(); - return finishNode(node_1); - } - var node = createNode(151, typeName.pos); - node.typeName = typeName; - if (!scanner.hasPrecedingLineBreak() && token === 25) { - node.typeArguments = parseBracketedList(18, parseType, 25, 27); - } - return finishNode(node); - } - function parseTypeQuery() { - var node = createNode(154); - parseExpected(101); - node.exprName = parseEntityName(true); - return finishNode(node); - } - function parseTypeParameter() { - var node = createNode(137); - node.name = parseIdentifier(); - if (parseOptional(83)) { - if (isStartOfType() || !isStartOfExpression()) { - node.constraint = parseType(); + if (token === 54 || token === 24 || + token === 53 || token === 56 || + isIdentifier() || ts.isModifier(token)) { + return true; } - else { - node.expression = parseUnaryExpressionOrHigher(); + if (token === 18) { + nextToken(); + if (token === 34) { + return true; + } } } - return finishNode(node); + return false; } - function parseTypeParameters() { - if (token === 25) { - return parseBracketedList(17, parseTypeParameter, 25, 27); + function parseType() { + return doOutsideOfContext(10, parseTypeWorker); + } + function parseTypeWorker() { + if (isStartOfFunctionType()) { + return parseFunctionOrConstructorType(152); } + if (token === 92) { + return parseFunctionOrConstructorType(153); + } + return parseUnionTypeOrHigher(); } - function parseParameterType() { - if (parseOptional(54)) { - return token === 9 - ? parseLiteralNode(true) - : parseType(); + function parseTypeAnnotation() { + return parseOptional(54) ? parseType() : undefined; + } + function isStartOfLeftHandSideExpression() { + switch (token) { + case 97: + case 95: + case 93: + case 99: + case 84: + case 8: + case 9: + case 11: + case 12: + case 17: + case 19: + case 15: + case 87: + case 73: + case 92: + case 39: + case 61: + case 69: + return true; + default: + return isIdentifier(); } - return undefined; - } - function isStartOfParameter() { - return token === 22 || isIdentifierOrPattern() || ts.isModifier(token) || token === 55; } - function setModifiers(node, modifiers) { - if (modifiers) { - node.flags |= modifiers.flags; - node.modifiers = modifiers; + function isStartOfExpression() { + if (isStartOfLeftHandSideExpression()) { + return true; } - } - function parseParameter() { - var node = createNode(138); - node.decorators = parseDecorators(); - setModifiers(node, parseModifiers()); - node.dotDotDotToken = parseOptionalToken(22); - node.name = parseIdentifierOrPattern(); - if (ts.getFullWidth(node.name) === 0 && node.flags === 0 && ts.isModifier(token)) { - nextToken(); + switch (token) { + case 35: + case 36: + case 50: + case 49: + case 78: + case 101: + case 103: + case 41: + case 42: + case 25: + case 119: + case 114: + return true; + default: + if (isBinaryOperator()) { + return true; + } + return isIdentifier(); } - node.questionToken = parseOptionalToken(53); - node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(true); - return finishNode(node); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); + function isStartOfExpressionStatement() { + return token !== 15 && + token !== 87 && + token !== 73 && + token !== 55 && + isStartOfExpression(); } - function parseParameterInitializer() { - return parseInitializer(true); + function allowInAndParseExpression() { + return allowInAnd(parseExpression); } - function fillSignature(returnToken, yieldContext, awaitContext, requireCompleteParameterList, signature) { - var returnTokenRequired = returnToken === 34; - signature.typeParameters = parseTypeParameters(); - signature.parameters = parseParameterList(yieldContext, awaitContext, requireCompleteParameterList); - if (returnTokenRequired) { - parseExpected(returnToken); - signature.type = parseType(); + function parseExpression() { + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); } - else if (parseOptional(returnToken)) { - signature.type = parseType(); + var expr = parseAssignmentExpressionOrHigher(); + var operatorToken; + while ((operatorToken = parseOptionalToken(24))) { + expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher()); } + if (saveDecoratorContext) { + setDecoratorContext(true); + } + return expr; } - function parseParameterList(yieldContext, awaitContext, requireCompleteParameterList) { - if (parseExpected(17)) { - var savedYieldContext = inYieldContext(); - var savedAwaitContext = inAwaitContext(); - setYieldContext(yieldContext); - setAwaitContext(awaitContext); - var result = parseDelimitedList(16, parseParameter); - setYieldContext(savedYieldContext); - setAwaitContext(savedAwaitContext); - if (!parseExpected(18) && requireCompleteParameterList) { + function parseInitializer(inParameter) { + if (token !== 56) { + if (scanner.hasPrecedingLineBreak() || (inParameter && token === 15) || !isStartOfExpression()) { return undefined; } - return result; } - return requireCompleteParameterList ? undefined : createMissingList(); + parseExpected(56); + return parseAssignmentExpressionOrHigher(); } - function parseTypeMemberSemicolon() { - if (parseOptional(24)) { - return; + function parseAssignmentExpressionOrHigher() { + if (isYieldExpression()) { + return parseYieldExpression(); } - parseSemicolon(); - } - function parseSignatureMember(kind) { - var node = createNode(kind); - if (kind === 148) { - parseExpected(92); + var arrowExpression = tryParseParenthesizedArrowFunctionExpression(); + if (arrowExpression) { + return arrowExpression; } - fillSignature(54, false, false, false, node); - parseTypeMemberSemicolon(); - return finishNode(node); - } - function isIndexSignature() { - if (token !== 19) { - return false; + var expr = parseBinaryExpressionOrHigher(0); + if (expr.kind === 69 && token === 34) { + return parseSimpleArrowFunctionExpression(expr); } - return lookAhead(isUnambiguouslyIndexSignature); - } - function isUnambiguouslyIndexSignature() { - nextToken(); - if (token === 22 || token === 20) { - return true; + if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) { + return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher()); } - if (ts.isModifier(token)) { - nextToken(); - if (isIdentifier()) { + return parseConditionalExpressionRest(expr); + } + function isYieldExpression() { + if (token === 114) { + if (inYieldContext()) { return true; } + return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine); } - else if (!isIdentifier()) { - return false; + return false; + } + function nextTokenIsIdentifierOnSameLine() { + nextToken(); + return !scanner.hasPrecedingLineBreak() && isIdentifier(); + } + function parseYieldExpression() { + var node = createNode(184); + nextToken(); + if (!scanner.hasPrecedingLineBreak() && + (token === 37 || isStartOfExpression())) { + node.asteriskToken = parseOptionalToken(37); + node.expression = parseAssignmentExpressionOrHigher(); + return finishNode(node); } else { - nextToken(); + return finishNode(node); } - if (token === 54 || token === 24) { - return true; + } + function parseSimpleArrowFunctionExpression(identifier) { + ts.Debug.assert(token === 34, "parseSimpleArrowFunctionExpression should only have been called if we had a =>"); + var node = createNode(174, identifier.pos); + var parameter = createNode(138, identifier.pos); + parameter.name = identifier; + finishNode(parameter); + node.parameters = [parameter]; + node.parameters.pos = parameter.pos; + node.parameters.end = parameter.end; + node.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>"); + node.body = parseArrowFunctionExpressionBody(false); + return finishNode(node); + } + function tryParseParenthesizedArrowFunctionExpression() { + var triState = isParenthesizedArrowFunctionExpression(); + if (triState === 0) { + return undefined; } - if (token !== 53) { - return false; + var arrowFunction = triState === 1 + ? parseParenthesizedArrowFunctionExpressionHead(true) + : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); + if (!arrowFunction) { + return undefined; } - nextToken(); - return token === 54 || token === 24 || token === 20; + var isAsync = !!(arrowFunction.flags & 256); + var lastToken = token; + arrowFunction.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>"); + arrowFunction.body = (lastToken === 34 || lastToken === 15) + ? parseArrowFunctionExpressionBody(isAsync) + : parseIdentifier(); + return finishNode(arrowFunction); } - function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) { - var node = createNode(149, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.parameters = parseBracketedList(16, parseParameter, 19, 20); - node.type = parseTypeAnnotation(); - parseTypeMemberSemicolon(); - return finishNode(node); + function isParenthesizedArrowFunctionExpression() { + if (token === 17 || token === 25 || token === 118) { + return lookAhead(isParenthesizedArrowFunctionExpressionWorker); + } + if (token === 34) { + return 1; + } + return 0; } - function parsePropertyOrMethodSignature() { - var fullStart = scanner.getStartPos(); - var name = parsePropertyName(); - var questionToken = parseOptionalToken(53); - if (token === 17 || token === 25) { - var method = createNode(142, fullStart); - method.name = name; - method.questionToken = questionToken; - fillSignature(54, false, false, false, method); - parseTypeMemberSemicolon(); - return finishNode(method); + function isParenthesizedArrowFunctionExpressionWorker() { + if (token === 118) { + nextToken(); + if (scanner.hasPrecedingLineBreak()) { + return 0; + } + if (token !== 17 && token !== 25) { + return 0; + } + } + var first = token; + var second = nextToken(); + if (first === 17) { + if (second === 18) { + var third = nextToken(); + switch (third) { + case 34: + case 54: + case 15: + return 1; + default: + return 0; + } + } + if (second === 19 || second === 15) { + return 2; + } + if (second === 22) { + return 1; + } + if (!isIdentifier()) { + return 0; + } + if (nextToken() === 54) { + return 1; + } + return 2; } else { - var property = createNode(140, fullStart); - property.name = name; - property.questionToken = questionToken; - property.type = parseTypeAnnotation(); - parseTypeMemberSemicolon(); - return finishNode(property); - } - } - function isStartOfTypeMember() { - switch (token) { - case 17: - case 25: - case 19: - return true; - default: - if (ts.isModifier(token)) { - var result = lookAhead(isStartOfIndexSignatureDeclaration); - if (result) { - return result; + ts.Debug.assert(first === 25); + if (!isIdentifier()) { + return 0; + } + if (sourceFile.languageVariant === 1) { + var isArrowFunctionInJsx = lookAhead(function () { + var third = nextToken(); + if (third === 83) { + var fourth = nextToken(); + switch (fourth) { + case 56: + case 27: + return false; + default: + return true; + } } - } - return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName); - } - } - function isStartOfIndexSignatureDeclaration() { - while (ts.isModifier(token)) { - nextToken(); - } - return isIndexSignature(); - } - function isTypeMemberWithLiteralPropertyName() { - nextToken(); - return token === 17 || - token === 25 || - token === 53 || - token === 54 || - canParseSemicolon(); - } - function parseTypeMember() { - switch (token) { - case 17: - case 25: - return parseSignatureMember(147); - case 19: - return isIndexSignature() - ? parseIndexSignatureDeclaration(scanner.getStartPos(), undefined, undefined) - : parsePropertyOrMethodSignature(); - case 92: - if (lookAhead(isStartOfConstructSignature)) { - return parseSignatureMember(148); - } - case 9: - case 8: - return parsePropertyOrMethodSignature(); - default: - if (ts.isModifier(token)) { - var result = tryParse(parseIndexSignatureWithModifiers); - if (result) { - return result; + else if (third === 24) { + return true; } + return false; + }); + if (isArrowFunctionInJsx) { + return 1; } - if (ts.tokenIsIdentifierOrKeyword(token)) { - return parsePropertyOrMethodSignature(); - } + return 0; + } + return 2; } } - function parseIndexSignatureWithModifiers() { - var fullStart = scanner.getStartPos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - return isIndexSignature() - ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers) - : undefined; - } - function isStartOfConstructSignature() { - nextToken(); - return token === 17 || token === 25; + function parsePossibleParenthesizedArrowFunctionExpressionHead() { + return parseParenthesizedArrowFunctionExpressionHead(false); } - function parseTypeLiteral() { - var node = createNode(155); - node.members = parseObjectTypeMembers(); - return finishNode(node); + function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) { + var node = createNode(174); + setModifiers(node, parseModifiersForArrowFunction()); + var isAsync = !!(node.flags & 256); + fillSignature(54, false, isAsync, !allowAmbiguity, node); + if (!node.parameters) { + return undefined; + } + if (!allowAmbiguity && token !== 34 && token !== 15) { + return undefined; + } + return node; } - function parseObjectTypeMembers() { - var members; - if (parseExpected(15)) { - members = parseList(4, parseTypeMember); - parseExpected(16); + function parseArrowFunctionExpressionBody(isAsync) { + if (token === 15) { + return parseFunctionBlock(false, isAsync, false); } - else { - members = createMissingList(); + if (token !== 23 && + token !== 87 && + token !== 73 && + isStartOfStatement() && + !isStartOfExpressionStatement()) { + return parseFunctionBlock(false, isAsync, true); } - return members; + return isAsync + ? doInAwaitContext(parseAssignmentExpressionOrHigher) + : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher); } - function parseTupleType() { - var node = createNode(157); - node.elementTypes = parseBracketedList(19, parseType, 19, 20); + function parseConditionalExpressionRest(leftOperand) { + var questionToken = parseOptionalToken(53); + if (!questionToken) { + return leftOperand; + } + var node = createNode(182, leftOperand.pos); + node.condition = leftOperand; + node.questionToken = questionToken; + node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher); + node.colonToken = parseExpectedToken(54, false, ts.Diagnostics._0_expected, ts.tokenToString(54)); + node.whenFalse = parseAssignmentExpressionOrHigher(); return finishNode(node); } - function parseParenthesizedType() { - var node = createNode(160); - parseExpected(17); - node.type = parseType(); - parseExpected(18); - return finishNode(node); + function parseBinaryExpressionOrHigher(precedence) { + var leftOperand = parseUnaryExpressionOrHigher(); + return parseBinaryExpressionRest(precedence, leftOperand); } - function parseFunctionOrConstructorType(kind) { - var node = createNode(kind); - if (kind === 153) { - parseExpected(92); - } - fillSignature(34, false, false, false, node); - return finishNode(node); + function isInOrOfKeyword(t) { + return t === 90 || t === 134; } - function parseKeywordAndNoDot() { - var node = parseTokenNode(); - return token === 21 ? undefined : node; + function parseBinaryExpressionRest(precedence, leftOperand) { + while (true) { + reScanGreaterToken(); + var newPrecedence = getBinaryOperatorPrecedence(); + var consumeCurrentOperator = token === 38 ? + newPrecedence >= precedence : + newPrecedence > precedence; + if (!consumeCurrentOperator) { + break; + } + if (token === 90 && inDisallowInContext()) { + break; + } + if (token === 116) { + if (scanner.hasPrecedingLineBreak()) { + break; + } + else { + nextToken(); + leftOperand = makeAsExpression(leftOperand, parseType()); + } + } + else { + leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + } + } + return leftOperand; } - function parseNonArrayType() { - switch (token) { - case 117: - case 130: - case 128: - case 120: - case 131: - var node = tryParse(parseKeywordAndNoDot); - return node || parseTypeReferenceOrTypePredicate(); - case 103: - case 97: - return parseTokenNode(); - case 101: - return parseTypeQuery(); - case 15: - return parseTypeLiteral(); - case 19: - return parseTupleType(); - case 17: - return parseParenthesizedType(); - default: - return parseTypeReferenceOrTypePredicate(); + function isBinaryOperator() { + if (inDisallowInContext() && token === 90) { + return false; } + return getBinaryOperatorPrecedence() > 0; } - function isStartOfType() { + function getBinaryOperatorPrecedence() { switch (token) { - case 117: - case 130: - case 128: - case 120: - case 131: - case 103: - case 97: - case 101: - case 15: - case 19: - case 25: - case 92: - return true; - case 17: - return lookAhead(isStartOfParenthesizedOrFunctionType); - default: - return isIdentifier(); + case 52: + return 1; + case 51: + return 2; + case 47: + return 3; + case 48: + return 4; + case 46: + return 5; + case 30: + case 31: + case 32: + case 33: + return 6; + case 25: + case 27: + case 28: + case 29: + case 91: + case 90: + case 116: + return 7; + case 43: + case 44: + case 45: + return 8; + case 35: + case 36: + return 9; + case 37: + case 39: + case 40: + return 10; + case 38: + return 11; } + return -1; } - function isStartOfParenthesizedOrFunctionType() { - nextToken(); - return token === 18 || isStartOfParameter() || isStartOfType(); - } - function parseArrayTypeOrHigher() { - var type = parseNonArrayType(); - while (!scanner.hasPrecedingLineBreak() && parseOptional(19)) { - parseExpected(20); - var node = createNode(156, type.pos); - node.elementType = type; - type = finishNode(node); - } - return type; + function makeBinaryExpression(left, operatorToken, right) { + var node = createNode(181, left.pos); + node.left = left; + node.operatorToken = operatorToken; + node.right = right; + return finishNode(node); } - function parseUnionOrIntersectionType(kind, parseConstituentType, operator) { - var type = parseConstituentType(); - if (token === operator) { - var types = [type]; - types.pos = type.pos; - while (parseOptional(operator)) { - types.push(parseConstituentType()); - } - types.end = getNodeEnd(); - var node = createNode(kind, type.pos); - node.types = types; - type = finishNode(node); - } - return type; + function makeAsExpression(left, right) { + var node = createNode(189, left.pos); + node.expression = left; + node.type = right; + return finishNode(node); } - function parseIntersectionTypeOrHigher() { - return parseUnionOrIntersectionType(159, parseArrayTypeOrHigher, 46); + function parsePrefixUnaryExpression() { + var node = createNode(179); + node.operator = token; + nextToken(); + node.operand = parseSimpleUnaryExpression(); + return finishNode(node); } - function parseUnionTypeOrHigher() { - return parseUnionOrIntersectionType(158, parseIntersectionTypeOrHigher, 47); + function parseDeleteExpression() { + var node = createNode(175); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); } - function isStartOfFunctionType() { - if (token === 25) { - return true; - } - return token === 17 && lookAhead(isUnambiguouslyStartOfFunctionType); + function parseTypeOfExpression() { + var node = createNode(176); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); } - function isUnambiguouslyStartOfFunctionType() { + function parseVoidExpression() { + var node = createNode(177); nextToken(); - if (token === 18 || token === 22) { - return true; - } - if (isIdentifier() || ts.isModifier(token)) { - nextToken(); - if (token === 54 || token === 24 || - token === 53 || token === 56 || - isIdentifier() || ts.isModifier(token)) { + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function isAwaitExpression() { + if (token === 119) { + if (inAwaitContext()) { return true; } - if (token === 18) { - nextToken(); - if (token === 34) { - return true; - } - } + return lookAhead(nextTokenIsIdentifierOnSameLine); } return false; } - function parseType() { - return doOutsideOfContext(10, parseTypeWorker); + function parseAwaitExpression() { + var node = createNode(178); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); } - function parseTypeWorker() { - if (isStartOfFunctionType()) { - return parseFunctionOrConstructorType(152); + function parseUnaryExpressionOrHigher() { + if (isAwaitExpression()) { + return parseAwaitExpression(); } - if (token === 92) { - return parseFunctionOrConstructorType(153); + if (isIncrementExpression()) { + var incrementExpression = parseIncrementExpression(); + return token === 38 ? + parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : + incrementExpression; } - return parseUnionTypeOrHigher(); - } - function parseTypeAnnotation() { - return parseOptional(54) ? parseType() : undefined; - } - function isStartOfLeftHandSideExpression() { - switch (token) { - case 97: - case 95: - case 93: - case 99: - case 84: - case 8: - case 9: - case 11: - case 12: - case 17: - case 19: - case 15: - case 87: - case 73: - case 92: - case 39: - case 61: - case 69: - return true; - default: - return isIdentifier(); + var unaryOperator = token; + var simpleUnaryExpression = parseSimpleUnaryExpression(); + if (token === 38) { + var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); + if (simpleUnaryExpression.kind === 171) { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); + } + else { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); + } } + return simpleUnaryExpression; } - function isStartOfExpression() { - if (isStartOfLeftHandSideExpression()) { - return true; - } + function parseSimpleUnaryExpression() { switch (token) { case 35: case 36: case 50: case 49: + return parsePrefixUnaryExpression(); case 78: + return parseDeleteExpression(); case 101: + return parseTypeOfExpression(); case 103: - case 41: - case 42: + return parseVoidExpression(); case 25: - case 119: - case 114: - return true; + return parseTypeAssertion(); default: - if (isBinaryOperator()) { - return true; - } - return isIdentifier(); - } - } - function isStartOfExpressionStatement() { - return token !== 15 && - token !== 87 && - token !== 73 && - token !== 55 && - isStartOfExpression(); - } - function allowInAndParseExpression() { - return allowInAnd(parseExpression); - } - function parseExpression() { - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var expr = parseAssignmentExpressionOrHigher(); - var operatorToken; - while ((operatorToken = parseOptionalToken(24))) { - expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher()); - } - if (saveDecoratorContext) { - setDecoratorContext(true); - } - return expr; - } - function parseInitializer(inParameter) { - if (token !== 56) { - if (scanner.hasPrecedingLineBreak() || (inParameter && token === 15) || !isStartOfExpression()) { - return undefined; - } - } - parseExpected(56); - return parseAssignmentExpressionOrHigher(); - } - function parseAssignmentExpressionOrHigher() { - if (isYieldExpression()) { - return parseYieldExpression(); - } - var arrowExpression = tryParseParenthesizedArrowFunctionExpression(); - if (arrowExpression) { - return arrowExpression; - } - var expr = parseBinaryExpressionOrHigher(0); - if (expr.kind === 69 && token === 34) { - return parseSimpleArrowFunctionExpression(expr); - } - if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) { - return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher()); + return parseIncrementExpression(); } - return parseConditionalExpressionRest(expr); } - function isYieldExpression() { - if (token === 114) { - if (inYieldContext()) { + function isIncrementExpression() { + switch (token) { + case 35: + case 36: + case 50: + case 49: + case 78: + case 101: + case 103: + return false; + case 25: + if (sourceFile.languageVariant !== 1) { + return false; + } + default: return true; - } - return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine); } - return false; - } - function nextTokenIsIdentifierOnSameLine() { - nextToken(); - return !scanner.hasPrecedingLineBreak() && isIdentifier(); } - function parseYieldExpression() { - var node = createNode(184); - nextToken(); - if (!scanner.hasPrecedingLineBreak() && - (token === 37 || isStartOfExpression())) { - node.asteriskToken = parseOptionalToken(37); - node.expression = parseAssignmentExpressionOrHigher(); + function parseIncrementExpression() { + if (token === 41 || token === 42) { + var node = createNode(179); + node.operator = token; + nextToken(); + node.operand = parseLeftHandSideExpressionOrHigher(); return finishNode(node); } - else { + else if (sourceFile.languageVariant === 1 && token === 25 && lookAhead(nextTokenIsIdentifierOrKeyword)) { + return parseJsxElementOrSelfClosingElement(true); + } + var expression = parseLeftHandSideExpressionOrHigher(); + ts.Debug.assert(ts.isLeftHandSideExpression(expression)); + if ((token === 41 || token === 42) && !scanner.hasPrecedingLineBreak()) { + var node = createNode(180, expression.pos); + node.operand = expression; + node.operator = token; + nextToken(); return finishNode(node); } + return expression; } - function parseSimpleArrowFunctionExpression(identifier) { - ts.Debug.assert(token === 34, "parseSimpleArrowFunctionExpression should only have been called if we had a =>"); - var node = createNode(174, identifier.pos); - var parameter = createNode(138, identifier.pos); - parameter.name = identifier; - finishNode(parameter); - node.parameters = [parameter]; - node.parameters.pos = parameter.pos; - node.parameters.end = parameter.end; - node.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>"); - node.body = parseArrowFunctionExpressionBody(false); + function parseLeftHandSideExpressionOrHigher() { + var expression = token === 95 + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); + return parseCallExpressionRest(expression); + } + function parseMemberExpressionOrHigher() { + var expression = parsePrimaryExpression(); + return parseMemberExpressionRest(expression); + } + function parseSuperExpression() { + var expression = parseTokenNode(); + if (token === 17 || token === 21 || token === 19) { + return expression; + } + var node = createNode(166, expression.pos); + node.expression = expression; + node.dotToken = parseExpectedToken(21, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.name = parseRightSideOfDot(true); return finishNode(node); } - function tryParseParenthesizedArrowFunctionExpression() { - var triState = isParenthesizedArrowFunctionExpression(); - if (triState === 0) { - return undefined; + function parseJsxElementOrSelfClosingElement(inExpressionContext) { + var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); + var result; + if (opening.kind === 235) { + var node = createNode(233, opening.pos); + node.openingElement = opening; + node.children = parseJsxChildren(node.openingElement.tagName); + node.closingElement = parseJsxClosingElement(inExpressionContext); + result = finishNode(node); } - var arrowFunction = triState === 1 - ? parseParenthesizedArrowFunctionExpressionHead(true) - : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); - if (!arrowFunction) { - return undefined; + else { + ts.Debug.assert(opening.kind === 234); + result = opening; } - var isAsync = !!(arrowFunction.flags & 256); - var lastToken = token; - arrowFunction.equalsGreaterThanToken = parseExpectedToken(34, false, ts.Diagnostics._0_expected, "=>"); - arrowFunction.body = (lastToken === 34 || lastToken === 15) - ? parseArrowFunctionExpressionBody(isAsync) - : parseIdentifier(); - return finishNode(arrowFunction); - } - function isParenthesizedArrowFunctionExpression() { - if (token === 17 || token === 25 || token === 118) { - return lookAhead(isParenthesizedArrowFunctionExpressionWorker); + if (inExpressionContext && token === 25) { + var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); }); + if (invalidElement) { + parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); + var badNode = createNode(181, result.pos); + badNode.end = invalidElement.end; + badNode.left = result; + badNode.right = invalidElement; + badNode.operatorToken = createMissingNode(24, false, undefined); + badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; + return badNode; + } } - if (token === 34) { - return 1; + return result; + } + function parseJsxText() { + var node = createNode(236, scanner.getStartPos()); + token = scanner.scanJsxToken(); + return finishNode(node); + } + function parseJsxChild() { + switch (token) { + case 236: + return parseJsxText(); + case 15: + return parseJsxExpression(false); + case 25: + return parseJsxElementOrSelfClosingElement(false); } - return 0; + ts.Debug.fail("Unknown JSX child kind " + token); } - function isParenthesizedArrowFunctionExpressionWorker() { - if (token === 118) { - nextToken(); - if (scanner.hasPrecedingLineBreak()) { - return 0; + function parseJsxChildren(openingTagName) { + var result = []; + result.pos = scanner.getStartPos(); + var saveParsingContext = parsingContext; + parsingContext |= 1 << 14; + while (true) { + token = scanner.reScanJsxToken(); + if (token === 26) { + break; } - if (token !== 17 && token !== 25) { - return 0; + else if (token === 1) { + parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); + break; } + result.push(parseJsxChild()); } - var first = token; - var second = nextToken(); - if (first === 17) { - if (second === 18) { - var third = nextToken(); - switch (third) { - case 34: - case 54: - case 15: - return 1; - default: - return 0; - } - } - if (second === 19 || second === 15) { - return 2; - } - if (second === 22) { - return 1; - } - if (!isIdentifier()) { - return 0; - } - if (nextToken() === 54) { - return 1; - } - return 2; + result.end = scanner.getTokenPos(); + parsingContext = saveParsingContext; + return result; + } + function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { + var fullStart = scanner.getStartPos(); + parseExpected(25); + var tagName = parseJsxElementName(); + var attributes = parseList(13, parseJsxAttribute); + var node; + if (token === 27) { + node = createNode(235, fullStart); + scanJsxText(); } else { - ts.Debug.assert(first === 25); - if (!isIdentifier()) { - return 0; + parseExpected(39); + if (inExpressionContext) { + parseExpected(27); } - if (sourceFile.languageVariant === 1) { - var isArrowFunctionInJsx = lookAhead(function () { - var third = nextToken(); - if (third === 83) { - var fourth = nextToken(); - switch (fourth) { - case 56: - case 27: - return false; - default: - return true; - } - } - else if (third === 24) { - return true; - } - return false; - }); - if (isArrowFunctionInJsx) { - return 1; - } - return 0; + else { + parseExpected(27, undefined, false); + scanJsxText(); } - return 2; + node = createNode(234, fullStart); } + node.tagName = tagName; + node.attributes = attributes; + return finishNode(node); } - function parsePossibleParenthesizedArrowFunctionExpressionHead() { - return parseParenthesizedArrowFunctionExpressionHead(false); + function parseJsxElementName() { + scanJsxIdentifier(); + var elementName = parseIdentifierName(); + while (parseOptional(21)) { + scanJsxIdentifier(); + var node = createNode(135, elementName.pos); + node.left = elementName; + node.right = parseIdentifierName(); + elementName = finishNode(node); + } + return elementName; } - function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) { - var node = createNode(174); - setModifiers(node, parseModifiersForArrowFunction()); - var isAsync = !!(node.flags & 256); - fillSignature(54, false, isAsync, !allowAmbiguity, node); - if (!node.parameters) { - return undefined; + function parseJsxExpression(inExpressionContext) { + var node = createNode(240); + parseExpected(15); + if (token !== 16) { + node.expression = parseExpression(); } - if (!allowAmbiguity && token !== 34 && token !== 15) { - return undefined; + if (inExpressionContext) { + parseExpected(16); + } + else { + parseExpected(16, undefined, false); + scanJsxText(); } - return node; + return finishNode(node); } - function parseArrowFunctionExpressionBody(isAsync) { + function parseJsxAttribute() { if (token === 15) { - return parseFunctionBlock(false, isAsync, false); + return parseJsxSpreadAttribute(); } - if (token !== 23 && - token !== 87 && - token !== 73 && - isStartOfStatement() && - !isStartOfExpressionStatement()) { - return parseFunctionBlock(false, isAsync, true); + scanJsxIdentifier(); + var node = createNode(238); + node.name = parseIdentifierName(); + if (parseOptional(56)) { + switch (token) { + case 9: + node.initializer = parseLiteralNode(); + break; + default: + node.initializer = parseJsxExpression(true); + break; + } } - return isAsync - ? doInAwaitContext(parseAssignmentExpressionOrHigher) - : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher); + return finishNode(node); } - function parseConditionalExpressionRest(leftOperand) { - var questionToken = parseOptionalToken(53); - if (!questionToken) { - return leftOperand; - } - var node = createNode(182, leftOperand.pos); - node.condition = leftOperand; - node.questionToken = questionToken; - node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher); - node.colonToken = parseExpectedToken(54, false, ts.Diagnostics._0_expected, ts.tokenToString(54)); - node.whenFalse = parseAssignmentExpressionOrHigher(); + function parseJsxSpreadAttribute() { + var node = createNode(239); + parseExpected(15); + parseExpected(22); + node.expression = parseExpression(); + parseExpected(16); return finishNode(node); } - function parseBinaryExpressionOrHigher(precedence) { - var leftOperand = parseUnaryExpressionOrHigher(); - return parseBinaryExpressionRest(precedence, leftOperand); + function parseJsxClosingElement(inExpressionContext) { + var node = createNode(237); + parseExpected(26); + node.tagName = parseJsxElementName(); + if (inExpressionContext) { + parseExpected(27); + } + else { + parseExpected(27, undefined, false); + scanJsxText(); + } + return finishNode(node); } - function isInOrOfKeyword(t) { - return t === 90 || t === 134; + function parseTypeAssertion() { + var node = createNode(171); + parseExpected(25); + node.type = parseType(); + parseExpected(27); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); } - function parseBinaryExpressionRest(precedence, leftOperand) { + function parseMemberExpressionRest(expression) { while (true) { - reScanGreaterToken(); - var newPrecedence = getBinaryOperatorPrecedence(); - var consumeCurrentOperator = token === 38 ? - newPrecedence >= precedence : - newPrecedence > precedence; - if (!consumeCurrentOperator) { - break; - } - if (token === 90 && inDisallowInContext()) { - break; + var dotToken = parseOptionalToken(21); + if (dotToken) { + var propertyAccess = createNode(166, expression.pos); + propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; + propertyAccess.name = parseRightSideOfDot(true); + expression = finishNode(propertyAccess); + continue; } - if (token === 116) { - if (scanner.hasPrecedingLineBreak()) { - break; + if (!inDecoratorContext() && parseOptional(19)) { + var indexedAccess = createNode(167, expression.pos); + indexedAccess.expression = expression; + if (token !== 20) { + indexedAccess.argumentExpression = allowInAnd(parseExpression); + if (indexedAccess.argumentExpression.kind === 9 || indexedAccess.argumentExpression.kind === 8) { + var literal = indexedAccess.argumentExpression; + literal.text = internIdentifier(literal.text); + } } - else { - nextToken(); - leftOperand = makeAsExpression(leftOperand, parseType()); + parseExpected(20); + expression = finishNode(indexedAccess); + continue; + } + if (token === 11 || token === 12) { + var tagExpression = createNode(170, expression.pos); + tagExpression.tag = expression; + tagExpression.template = token === 11 + ? parseLiteralNode() + : parseTemplateExpression(); + expression = finishNode(tagExpression); + continue; + } + return expression; + } + } + function parseCallExpressionRest(expression) { + while (true) { + expression = parseMemberExpressionRest(expression); + if (token === 25) { + var typeArguments = tryParse(parseTypeArgumentsInExpression); + if (!typeArguments) { + return expression; } + var callExpr = createNode(168, expression.pos); + callExpr.expression = expression; + callExpr.typeArguments = typeArguments; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; } - else { - leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + else if (token === 17) { + var callExpr = createNode(168, expression.pos); + callExpr.expression = expression; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; } + return expression; } - return leftOperand; } - function isBinaryOperator() { - if (inDisallowInContext() && token === 90) { - return false; + function parseArgumentList() { + parseExpected(17); + var result = parseDelimitedList(11, parseArgumentExpression); + parseExpected(18); + return result; + } + function parseTypeArgumentsInExpression() { + if (!parseOptional(25)) { + return undefined; } - return getBinaryOperatorPrecedence() > 0; + var typeArguments = parseDelimitedList(18, parseType); + if (!parseExpected(27)) { + return undefined; + } + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } - function getBinaryOperatorPrecedence() { + function canFollowTypeArgumentsInExpression() { switch (token) { - case 52: - return 1; - case 51: - return 2; - case 47: - return 3; - case 48: - return 4; - case 46: - return 5; + case 17: + case 21: + case 18: + case 20: + case 54: + case 23: + case 53: case 30: - case 31: case 32: + case 31: case 33: - return 6; - case 25: - case 27: - case 28: - case 29: - case 91: - case 90: - case 116: - return 7; - case 43: - case 44: - case 45: - return 8; - case 35: - case 36: - return 9; - case 37: + case 51: + case 52: + case 48: + case 46: + case 47: + case 16: + case 1: + return true; + case 24: + case 15: + default: + return false; + } + } + function parsePrimaryExpression() { + switch (token) { + case 8: + case 9: + case 11: + return parseLiteralNode(); + case 97: + case 95: + case 93: + case 99: + case 84: + return parseTokenNode(); + case 17: + return parseParenthesizedExpression(); + case 19: + return parseArrayLiteralExpression(); + case 15: + return parseObjectLiteralExpression(); + case 118: + if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { + break; + } + return parseFunctionExpression(); + case 73: + return parseClassExpression(); + case 87: + return parseFunctionExpression(); + case 92: + return parseNewExpression(); case 39: - case 40: - return 10; - case 38: - return 11; + case 61: + if (reScanSlashToken() === 10) { + return parseLiteralNode(); + } + break; + case 12: + return parseTemplateExpression(); } - return -1; - } - function makeBinaryExpression(left, operatorToken, right) { - var node = createNode(181, left.pos); - node.left = left; - node.operatorToken = operatorToken; - node.right = right; - return finishNode(node); + return parseIdentifier(ts.Diagnostics.Expression_expected); } - function makeAsExpression(left, right) { - var node = createNode(189, left.pos); - node.expression = left; - node.type = right; + function parseParenthesizedExpression() { + var node = createNode(172); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); return finishNode(node); } - function parsePrefixUnaryExpression() { - var node = createNode(179); - node.operator = token; - nextToken(); - node.operand = parseSimpleUnaryExpression(); + function parseSpreadElement() { + var node = createNode(185); + parseExpected(22); + node.expression = parseAssignmentExpressionOrHigher(); return finishNode(node); } - function parseDeleteExpression() { - var node = createNode(175); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseArgumentOrArrayLiteralElement() { + return token === 22 ? parseSpreadElement() : + token === 24 ? createNode(187) : + parseAssignmentExpressionOrHigher(); } - function parseTypeOfExpression() { - var node = createNode(176); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseArgumentExpression() { + return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); } - function parseVoidExpression() { - var node = createNode(177); - nextToken(); - node.expression = parseSimpleUnaryExpression(); + function parseArrayLiteralExpression() { + var node = createNode(164); + parseExpected(19); + if (scanner.hasPrecedingLineBreak()) + node.flags |= 1024; + node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement); + parseExpected(20); return finishNode(node); } - function isAwaitExpression() { - if (token === 119) { - if (inAwaitContext()) { - return true; - } - return lookAhead(nextTokenIsIdentifierOnSameLine); + function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { + if (parseContextualModifier(123)) { + return parseAccessorDeclaration(145, fullStart, decorators, modifiers); } - return false; - } - function parseAwaitExpression() { - var node = createNode(178); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + else if (parseContextualModifier(129)) { + return parseAccessorDeclaration(146, fullStart, decorators, modifiers); + } + return undefined; } - function parseUnaryExpressionOrHigher() { - if (isAwaitExpression()) { - return parseAwaitExpression(); + function parseObjectLiteralElement() { + var fullStart = scanner.getStartPos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; } - if (isIncrementExpression()) { - var incrementExpression = parseIncrementExpression(); - return token === 38 ? - parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : - incrementExpression; + var asteriskToken = parseOptionalToken(37); + var tokenIsIdentifier = isIdentifier(); + var nameToken = token; + var propertyName = parsePropertyName(); + var questionToken = parseOptionalToken(53); + if (asteriskToken || token === 17 || token === 25) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); } - var unaryOperator = token; - var simpleUnaryExpression = parseSimpleUnaryExpression(); - if (token === 38) { - var diagnostic; - var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); - if (simpleUnaryExpression.kind === 171) { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); - } - else { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); + var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 || token === 16 || token === 56); + if (isShorthandPropertyAssignment) { + var shorthandDeclaration = createNode(246, fullStart); + shorthandDeclaration.name = propertyName; + shorthandDeclaration.questionToken = questionToken; + var equalsToken = parseOptionalToken(56); + if (equalsToken) { + shorthandDeclaration.equalsToken = equalsToken; + shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); } + return finishNode(shorthandDeclaration); } - return simpleUnaryExpression; - } - function parseSimpleUnaryExpression() { - switch (token) { - case 35: - case 36: - case 50: - case 49: - return parsePrefixUnaryExpression(); - case 78: - return parseDeleteExpression(); - case 101: - return parseTypeOfExpression(); - case 103: - return parseVoidExpression(); - case 25: - return parseTypeAssertion(); - default: - return parseIncrementExpression(); + else { + var propertyAssignment = createNode(245, fullStart); + propertyAssignment.name = propertyName; + propertyAssignment.questionToken = questionToken; + parseExpected(54); + propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); + return finishNode(propertyAssignment); } } - function isIncrementExpression() { - switch (token) { - case 35: - case 36: - case 50: - case 49: - case 78: - case 101: - case 103: - return false; - case 25: - if (sourceFile.languageVariant !== 1) { - return false; - } - default: - return true; + function parseObjectLiteralExpression() { + var node = createNode(165); + parseExpected(15); + if (scanner.hasPrecedingLineBreak()) { + node.flags |= 1024; } + node.properties = parseDelimitedList(12, parseObjectLiteralElement, true); + parseExpected(16); + return finishNode(node); } - function parseIncrementExpression() { - if (token === 41 || token === 42) { - var node = createNode(179); - node.operator = token; - nextToken(); - node.operand = parseLeftHandSideExpressionOrHigher(); - return finishNode(node); - } - else if (sourceFile.languageVariant === 1 && token === 25 && lookAhead(nextTokenIsIdentifierOrKeyword)) { - return parseJsxElementOrSelfClosingElement(true); + function parseFunctionExpression() { + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); } - var expression = parseLeftHandSideExpressionOrHigher(); - ts.Debug.assert(ts.isLeftHandSideExpression(expression)); - if ((token === 41 || token === 42) && !scanner.hasPrecedingLineBreak()) { - var node = createNode(180, expression.pos); - node.operand = expression; - node.operator = token; - nextToken(); - return finishNode(node); + var node = createNode(173); + setModifiers(node, parseModifiers()); + parseExpected(87); + node.asteriskToken = parseOptionalToken(37); + var isGenerator = !!node.asteriskToken; + var isAsync = !!(node.flags & 256); + node.name = + isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : + isGenerator ? doInYieldContext(parseOptionalIdentifier) : + isAsync ? doInAwaitContext(parseOptionalIdentifier) : + parseOptionalIdentifier(); + fillSignature(54, isGenerator, isAsync, false, node); + node.body = parseFunctionBlock(isGenerator, isAsync, false); + if (saveDecoratorContext) { + setDecoratorContext(true); } - return expression; - } - function parseLeftHandSideExpressionOrHigher() { - var expression = token === 95 - ? parseSuperExpression() - : parseMemberExpressionOrHigher(); - return parseCallExpressionRest(expression); + return finishNode(node); } - function parseMemberExpressionOrHigher() { - var expression = parsePrimaryExpression(); - return parseMemberExpressionRest(expression); + function parseOptionalIdentifier() { + return isIdentifier() ? parseIdentifier() : undefined; } - function parseSuperExpression() { - var expression = parseTokenNode(); - if (token === 17 || token === 21 || token === 19) { - return expression; + function parseNewExpression() { + var node = createNode(169); + parseExpected(92); + node.expression = parseMemberExpressionOrHigher(); + node.typeArguments = tryParse(parseTypeArgumentsInExpression); + if (node.typeArguments || token === 17) { + node.arguments = parseArgumentList(); } - var node = createNode(166, expression.pos); - node.expression = expression; - node.dotToken = parseExpectedToken(21, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); - node.name = parseRightSideOfDot(true); return finishNode(node); } - function parseJsxElementOrSelfClosingElement(inExpressionContext) { - var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); - var result; - if (opening.kind === 235) { - var node = createNode(233, opening.pos); - node.openingElement = opening; - node.children = parseJsxChildren(node.openingElement.tagName); - node.closingElement = parseJsxClosingElement(inExpressionContext); - result = finishNode(node); + function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { + var node = createNode(192); + if (parseExpected(15, diagnosticMessage) || ignoreMissingOpenBrace) { + node.statements = parseList(1, parseStatement); + parseExpected(16); } else { - ts.Debug.assert(opening.kind === 234); - result = opening; + node.statements = createMissingList(); + } + return finishNode(node); + } + function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { + var savedYieldContext = inYieldContext(); + setYieldContext(allowYield); + var savedAwaitContext = inAwaitContext(); + setAwaitContext(allowAwait); + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); } - if (inExpressionContext && token === 25) { - var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); }); - if (invalidElement) { - parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); - var badNode = createNode(181, result.pos); - badNode.end = invalidElement.end; - badNode.left = result; - badNode.right = invalidElement; - badNode.operatorToken = createMissingNode(24, false, undefined); - badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; - return badNode; - } + var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); + if (saveDecoratorContext) { + setDecoratorContext(true); } - return result; + setYieldContext(savedYieldContext); + setAwaitContext(savedAwaitContext); + return block; } - function parseJsxText() { - var node = createNode(236, scanner.getStartPos()); - token = scanner.scanJsxToken(); + function parseEmptyStatement() { + var node = createNode(194); + parseExpected(23); return finishNode(node); } - function parseJsxChild() { - switch (token) { - case 236: - return parseJsxText(); - case 15: - return parseJsxExpression(false); - case 25: - return parseJsxElementOrSelfClosingElement(false); - } - ts.Debug.fail("Unknown JSX child kind " + token); + function parseIfStatement() { + var node = createNode(196); + parseExpected(88); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); + node.thenStatement = parseStatement(); + node.elseStatement = parseOptional(80) ? parseStatement() : undefined; + return finishNode(node); } - function parseJsxChildren(openingTagName) { - var result = []; - result.pos = scanner.getStartPos(); - var saveParsingContext = parsingContext; - parsingContext |= 1 << 14; - while (true) { - token = scanner.reScanJsxToken(); - if (token === 26) { - break; + function parseDoStatement() { + var node = createNode(197); + parseExpected(79); + node.statement = parseStatement(); + parseExpected(104); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); + parseOptional(23); + return finishNode(node); + } + function parseWhileStatement() { + var node = createNode(198); + parseExpected(104); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); + node.statement = parseStatement(); + return finishNode(node); + } + function parseForOrForInOrForOfStatement() { + var pos = getNodePos(); + parseExpected(86); + parseExpected(17); + var initializer = undefined; + if (token !== 23) { + if (token === 102 || token === 108 || token === 74) { + initializer = parseVariableDeclarationList(true); } - else if (token === 1) { - parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); - break; + else { + initializer = disallowInAnd(parseExpression); } - result.push(parseJsxChild()); } - result.end = scanner.getTokenPos(); - parsingContext = saveParsingContext; - return result; - } - function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { - var fullStart = scanner.getStartPos(); - parseExpected(25); - var tagName = parseJsxElementName(); - var attributes = parseList(13, parseJsxAttribute); - var node; - if (token === 27) { - node = createNode(235, fullStart); - scanJsxText(); + var forOrForInOrForOfStatement; + if (parseOptional(90)) { + var forInStatement = createNode(200, pos); + forInStatement.initializer = initializer; + forInStatement.expression = allowInAnd(parseExpression); + parseExpected(18); + forOrForInOrForOfStatement = forInStatement; + } + else if (parseOptional(134)) { + var forOfStatement = createNode(201, pos); + forOfStatement.initializer = initializer; + forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); + parseExpected(18); + forOrForInOrForOfStatement = forOfStatement; } else { - parseExpected(39); - if (inExpressionContext) { - parseExpected(27); + var forStatement = createNode(199, pos); + forStatement.initializer = initializer; + parseExpected(23); + if (token !== 23 && token !== 18) { + forStatement.condition = allowInAnd(parseExpression); } - else { - parseExpected(27, undefined, false); - scanJsxText(); + parseExpected(23); + if (token !== 18) { + forStatement.incrementor = allowInAnd(parseExpression); } - node = createNode(234, fullStart); + parseExpected(18); + forOrForInOrForOfStatement = forStatement; } - node.tagName = tagName; - node.attributes = attributes; - return finishNode(node); + forOrForInOrForOfStatement.statement = parseStatement(); + return finishNode(forOrForInOrForOfStatement); } - function parseJsxElementName() { - scanJsxIdentifier(); - var elementName = parseIdentifierName(); - while (parseOptional(21)) { - scanJsxIdentifier(); - var node = createNode(135, elementName.pos); - node.left = elementName; - node.right = parseIdentifierName(); - elementName = finishNode(node); + function parseBreakOrContinueStatement(kind) { + var node = createNode(kind); + parseExpected(kind === 203 ? 70 : 75); + if (!canParseSemicolon()) { + node.label = parseIdentifier(); } - return elementName; + parseSemicolon(); + return finishNode(node); } - function parseJsxExpression(inExpressionContext) { - var node = createNode(240); - parseExpected(15); - if (token !== 16) { - node.expression = parseExpression(); - } - if (inExpressionContext) { - parseExpected(16); - } - else { - parseExpected(16, undefined, false); - scanJsxText(); + function parseReturnStatement() { + var node = createNode(204); + parseExpected(94); + if (!canParseSemicolon()) { + node.expression = allowInAnd(parseExpression); } + parseSemicolon(); return finishNode(node); } - function parseJsxAttribute() { - if (token === 15) { - return parseJsxSpreadAttribute(); - } - scanJsxIdentifier(); - var node = createNode(238); - node.name = parseIdentifierName(); - if (parseOptional(56)) { - switch (token) { - case 9: - node.initializer = parseLiteralNode(); - break; - default: - node.initializer = parseJsxExpression(true); - break; - } - } + function parseWithStatement() { + var node = createNode(205); + parseExpected(105); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); + node.statement = parseStatement(); return finishNode(node); } - function parseJsxSpreadAttribute() { - var node = createNode(239); + function parseCaseClause() { + var node = createNode(241); + parseExpected(71); + node.expression = allowInAnd(parseExpression); + parseExpected(54); + node.statements = parseList(3, parseStatement); + return finishNode(node); + } + function parseDefaultClause() { + var node = createNode(242); + parseExpected(77); + parseExpected(54); + node.statements = parseList(3, parseStatement); + return finishNode(node); + } + function parseCaseOrDefaultClause() { + return token === 71 ? parseCaseClause() : parseDefaultClause(); + } + function parseSwitchStatement() { + var node = createNode(206); + parseExpected(96); + parseExpected(17); + node.expression = allowInAnd(parseExpression); + parseExpected(18); + var caseBlock = createNode(220, scanner.getStartPos()); parseExpected(15); - parseExpected(22); - node.expression = parseExpression(); + caseBlock.clauses = parseList(2, parseCaseOrDefaultClause); parseExpected(16); + node.caseBlock = finishNode(caseBlock); + return finishNode(node); + } + function parseThrowStatement() { + var node = createNode(208); + parseExpected(98); + node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + parseSemicolon(); + return finishNode(node); + } + function parseTryStatement() { + var node = createNode(209); + parseExpected(100); + node.tryBlock = parseBlock(false); + node.catchClause = token === 72 ? parseCatchClause() : undefined; + if (!node.catchClause || token === 85) { + parseExpected(85); + node.finallyBlock = parseBlock(false); + } + return finishNode(node); + } + function parseCatchClause() { + var result = createNode(244); + parseExpected(72); + if (parseExpected(17)) { + result.variableDeclaration = parseVariableDeclaration(); + } + parseExpected(18); + result.block = parseBlock(false); + return finishNode(result); + } + function parseDebuggerStatement() { + var node = createNode(210); + parseExpected(76); + parseSemicolon(); return finishNode(node); } - function parseJsxClosingElement(inExpressionContext) { - var node = createNode(237); - parseExpected(26); - node.tagName = parseJsxElementName(); - if (inExpressionContext) { - parseExpected(27); + function parseExpressionOrLabeledStatement() { + var fullStart = scanner.getStartPos(); + var expression = allowInAnd(parseExpression); + if (expression.kind === 69 && parseOptional(54)) { + var labeledStatement = createNode(207, fullStart); + labeledStatement.label = expression; + labeledStatement.statement = parseStatement(); + return finishNode(labeledStatement); } else { - parseExpected(27, undefined, false); - scanJsxText(); + var expressionStatement = createNode(195, fullStart); + expressionStatement.expression = expression; + parseSemicolon(); + return finishNode(expressionStatement); } - return finishNode(node); } - function parseTypeAssertion() { - var node = createNode(171); - parseExpected(25); - node.type = parseType(); - parseExpected(27); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function nextTokenIsIdentifierOrKeywordOnSameLine() { + nextToken(); + return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); } - function parseMemberExpressionRest(expression) { + function nextTokenIsFunctionKeywordOnSameLine() { + nextToken(); + return token === 87 && !scanner.hasPrecedingLineBreak(); + } + function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { + nextToken(); + return (ts.tokenIsIdentifierOrKeyword(token) || token === 8) && !scanner.hasPrecedingLineBreak(); + } + function isDeclaration() { while (true) { - var dotToken = parseOptionalToken(21); - if (dotToken) { - var propertyAccess = createNode(166, expression.pos); - propertyAccess.expression = expression; - propertyAccess.dotToken = dotToken; - propertyAccess.name = parseRightSideOfDot(true); - expression = finishNode(propertyAccess); - continue; - } - if (!inDecoratorContext() && parseOptional(19)) { - var indexedAccess = createNode(167, expression.pos); - indexedAccess.expression = expression; - if (token !== 20) { - indexedAccess.argumentExpression = allowInAnd(parseExpression); - if (indexedAccess.argumentExpression.kind === 9 || indexedAccess.argumentExpression.kind === 8) { - var literal = indexedAccess.argumentExpression; - literal.text = internIdentifier(literal.text); + switch (token) { + case 102: + case 108: + case 74: + case 87: + case 73: + case 81: + return true; + case 107: + case 132: + return nextTokenIsIdentifierOnSameLine(); + case 125: + case 126: + return nextTokenIsIdentifierOrStringLiteralOnSameLine(); + case 115: + case 118: + case 122: + case 110: + case 111: + case 112: + nextToken(); + if (scanner.hasPrecedingLineBreak()) { + return false; } - } - parseExpected(20); - expression = finishNode(indexedAccess); - continue; - } - if (token === 11 || token === 12) { - var tagExpression = createNode(170, expression.pos); - tagExpression.tag = expression; - tagExpression.template = token === 11 - ? parseLiteralNode() - : parseTemplateExpression(); - expression = finishNode(tagExpression); - continue; + continue; + case 89: + nextToken(); + return token === 9 || token === 37 || + token === 15 || ts.tokenIsIdentifierOrKeyword(token); + case 82: + nextToken(); + if (token === 56 || token === 37 || + token === 15 || token === 77) { + return true; + } + continue; + case 113: + nextToken(); + continue; + default: + return false; } - return expression; } } - function parseCallExpressionRest(expression) { - while (true) { - expression = parseMemberExpressionRest(expression); - if (token === 25) { - var typeArguments = tryParse(parseTypeArgumentsInExpression); - if (!typeArguments) { - return expression; - } - var callExpr = createNode(168, expression.pos); - callExpr.expression = expression; - callExpr.typeArguments = typeArguments; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; - } - else if (token === 17) { - var callExpr = createNode(168, expression.pos); - callExpr.expression = expression; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; - } - return expression; + function isStartOfDeclaration() { + return lookAhead(isDeclaration); + } + function isStartOfStatement() { + switch (token) { + case 55: + case 23: + case 15: + case 102: + case 108: + case 87: + case 73: + case 81: + case 88: + case 79: + case 104: + case 86: + case 75: + case 70: + case 94: + case 105: + case 96: + case 98: + case 100: + case 76: + case 72: + case 85: + return true; + case 74: + case 82: + case 89: + return isStartOfDeclaration(); + case 118: + case 122: + case 107: + case 125: + case 126: + case 132: + return true; + case 112: + case 110: + case 111: + case 113: + return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); + default: + return isStartOfExpression(); } } - function parseArgumentList() { - parseExpected(17); - var result = parseDelimitedList(11, parseArgumentExpression); - parseExpected(18); - return result; + function nextTokenIsIdentifierOrStartOfDestructuring() { + nextToken(); + return isIdentifier() || token === 15 || token === 19; } - function parseTypeArgumentsInExpression() { - if (!parseOptional(25)) { - return undefined; - } - var typeArguments = parseDelimitedList(18, parseType); - if (!parseExpected(27)) { - return undefined; + function isLetDeclaration() { + return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + } + function parseStatement() { + switch (token) { + case 23: + return parseEmptyStatement(); + case 15: + return parseBlock(false); + case 102: + return parseVariableStatement(scanner.getStartPos(), undefined, undefined); + case 108: + if (isLetDeclaration()) { + return parseVariableStatement(scanner.getStartPos(), undefined, undefined); + } + break; + case 87: + return parseFunctionDeclaration(scanner.getStartPos(), undefined, undefined); + case 73: + return parseClassDeclaration(scanner.getStartPos(), undefined, undefined); + case 88: + return parseIfStatement(); + case 79: + return parseDoStatement(); + case 104: + return parseWhileStatement(); + case 86: + return parseForOrForInOrForOfStatement(); + case 75: + return parseBreakOrContinueStatement(202); + case 70: + return parseBreakOrContinueStatement(203); + case 94: + return parseReturnStatement(); + case 105: + return parseWithStatement(); + case 96: + return parseSwitchStatement(); + case 98: + return parseThrowStatement(); + case 100: + case 72: + case 85: + return parseTryStatement(); + case 76: + return parseDebuggerStatement(); + case 55: + return parseDeclaration(); + case 118: + case 107: + case 132: + case 125: + case 126: + case 122: + case 74: + case 81: + case 82: + case 89: + case 110: + case 111: + case 112: + case 115: + case 113: + if (isStartOfDeclaration()) { + return parseDeclaration(); + } + break; } - return typeArguments && canFollowTypeArgumentsInExpression() - ? typeArguments - : undefined; + return parseExpressionOrLabeledStatement(); } - function canFollowTypeArgumentsInExpression() { + function parseDeclaration() { + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); switch (token) { - case 17: - case 21: - case 18: - case 20: - case 54: - case 23: - case 53: - case 30: - case 32: - case 31: - case 33: - case 51: - case 52: - case 48: - case 46: - case 47: - case 16: - case 1: - return true; - case 24: - case 15: + case 102: + case 108: + case 74: + return parseVariableStatement(fullStart, decorators, modifiers); + case 87: + return parseFunctionDeclaration(fullStart, decorators, modifiers); + case 73: + return parseClassDeclaration(fullStart, decorators, modifiers); + case 107: + return parseInterfaceDeclaration(fullStart, decorators, modifiers); + case 132: + return parseTypeAliasDeclaration(fullStart, decorators, modifiers); + case 81: + return parseEnumDeclaration(fullStart, decorators, modifiers); + case 125: + case 126: + return parseModuleDeclaration(fullStart, decorators, modifiers); + case 89: + return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); + case 82: + nextToken(); + return token === 77 || token === 56 ? + parseExportAssignment(fullStart, decorators, modifiers) : + parseExportDeclaration(fullStart, decorators, modifiers); default: - return false; + if (decorators || modifiers) { + var node = createMissingNode(231, true, ts.Diagnostics.Declaration_expected); + node.pos = fullStart; + node.decorators = decorators; + setModifiers(node, modifiers); + return finishNode(node); + } } } - function parsePrimaryExpression() { - switch (token) { - case 8: - case 9: - case 11: - return parseLiteralNode(); - case 97: - case 95: - case 93: - case 99: - case 84: - return parseTokenNode(); - case 17: - return parseParenthesizedExpression(); - case 19: - return parseArrayLiteralExpression(); - case 15: - return parseObjectLiteralExpression(); - case 118: - if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { - break; - } - return parseFunctionExpression(); - case 73: - return parseClassExpression(); - case 87: - return parseFunctionExpression(); - case 92: - return parseNewExpression(); - case 39: - case 61: - if (reScanSlashToken() === 10) { - return parseLiteralNode(); - } - break; - case 12: - return parseTemplateExpression(); + function nextTokenIsIdentifierOrStringLiteralOnSameLine() { + nextToken(); + return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9); + } + function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { + if (token !== 15 && canParseSemicolon()) { + parseSemicolon(); + return; } - return parseIdentifier(ts.Diagnostics.Expression_expected); + return parseFunctionBlock(isGenerator, isAsync, false, diagnosticMessage); } - function parseParenthesizedExpression() { - var node = createNode(172); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); + function parseArrayBindingElement() { + if (token === 24) { + return createNode(187); + } + var node = createNode(163); + node.dotDotDotToken = parseOptionalToken(22); + node.name = parseIdentifierOrPattern(); + node.initializer = parseBindingElementInitializer(false); return finishNode(node); } - function parseSpreadElement() { - var node = createNode(185); - parseExpected(22); - node.expression = parseAssignmentExpressionOrHigher(); + function parseObjectBindingElement() { + var node = createNode(163); + var tokenIsIdentifier = isIdentifier(); + var propertyName = parsePropertyName(); + if (tokenIsIdentifier && token !== 54) { + node.name = propertyName; + } + else { + parseExpected(54); + node.propertyName = propertyName; + node.name = parseIdentifierOrPattern(); + } + node.initializer = parseBindingElementInitializer(false); return finishNode(node); } - function parseArgumentOrArrayLiteralElement() { - return token === 22 ? parseSpreadElement() : - token === 24 ? createNode(187) : - parseAssignmentExpressionOrHigher(); - } - function parseArgumentExpression() { - return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); + function parseObjectBindingPattern() { + var node = createNode(161); + parseExpected(15); + node.elements = parseDelimitedList(9, parseObjectBindingElement); + parseExpected(16); + return finishNode(node); } - function parseArrayLiteralExpression() { - var node = createNode(164); + function parseArrayBindingPattern() { + var node = createNode(162); parseExpected(19); - if (scanner.hasPrecedingLineBreak()) - node.flags |= 1024; - node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement); + node.elements = parseDelimitedList(10, parseArrayBindingElement); parseExpected(20); return finishNode(node); } - function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { - if (parseContextualModifier(123)) { - return parseAccessorDeclaration(145, fullStart, decorators, modifiers); + function isIdentifierOrPattern() { + return token === 15 || token === 19 || isIdentifier(); + } + function parseIdentifierOrPattern() { + if (token === 19) { + return parseArrayBindingPattern(); } - else if (parseContextualModifier(129)) { - return parseAccessorDeclaration(146, fullStart, decorators, modifiers); + if (token === 15) { + return parseObjectBindingPattern(); } - return undefined; + return parseIdentifier(); } - function parseObjectLiteralElement() { - var fullStart = scanner.getStartPos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; + function parseVariableDeclaration() { + var node = createNode(211); + node.name = parseIdentifierOrPattern(); + node.type = parseTypeAnnotation(); + if (!isInOrOfKeyword(token)) { + node.initializer = parseInitializer(false); } - var asteriskToken = parseOptionalToken(37); - var tokenIsIdentifier = isIdentifier(); - var nameToken = token; - var propertyName = parsePropertyName(); - var questionToken = parseOptionalToken(53); - if (asteriskToken || token === 17 || token === 25) { - return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); + return finishNode(node); + } + function parseVariableDeclarationList(inForStatementInitializer) { + var node = createNode(212); + switch (token) { + case 102: + break; + case 108: + node.flags |= 8192; + break; + case 74: + node.flags |= 16384; + break; + default: + ts.Debug.fail(); } - var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 || token === 16 || token === 56); - if (isShorthandPropertyAssignment) { - var shorthandDeclaration = createNode(246, fullStart); - shorthandDeclaration.name = propertyName; - shorthandDeclaration.questionToken = questionToken; - var equalsToken = parseOptionalToken(56); - if (equalsToken) { - shorthandDeclaration.equalsToken = equalsToken; - shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); - } - return finishNode(shorthandDeclaration); + nextToken(); + if (token === 134 && lookAhead(canFollowContextualOfKeyword)) { + node.declarations = createMissingList(); } else { - var propertyAssignment = createNode(245, fullStart); - propertyAssignment.name = propertyName; - propertyAssignment.questionToken = questionToken; - parseExpected(54); - propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); - return finishNode(propertyAssignment); + var savedDisallowIn = inDisallowInContext(); + setDisallowInContext(inForStatementInitializer); + node.declarations = parseDelimitedList(8, parseVariableDeclaration); + setDisallowInContext(savedDisallowIn); } + return finishNode(node); } - function parseObjectLiteralExpression() { - var node = createNode(165); - parseExpected(15); - if (scanner.hasPrecedingLineBreak()) { - node.flags |= 1024; - } - node.properties = parseDelimitedList(12, parseObjectLiteralElement, true); - parseExpected(16); + function canFollowContextualOfKeyword() { + return nextTokenIsIdentifier() && nextToken() === 18; + } + function parseVariableStatement(fullStart, decorators, modifiers) { + var node = createNode(193, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.declarationList = parseVariableDeclarationList(false); + parseSemicolon(); return finishNode(node); } - function parseFunctionExpression() { - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var node = createNode(173); - setModifiers(node, parseModifiers()); + function parseFunctionDeclaration(fullStart, decorators, modifiers) { + var node = createNode(213, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); parseExpected(87); node.asteriskToken = parseOptionalToken(37); + node.name = node.flags & 512 ? parseOptionalIdentifier() : parseIdentifier(); var isGenerator = !!node.asteriskToken; var isAsync = !!(node.flags & 256); - node.name = - isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : - isGenerator ? doInYieldContext(parseOptionalIdentifier) : - isAsync ? doInAwaitContext(parseOptionalIdentifier) : - parseOptionalIdentifier(); fillSignature(54, isGenerator, isAsync, false, node); - node.body = parseFunctionBlock(isGenerator, isAsync, false); - if (saveDecoratorContext) { - setDecoratorContext(true); - } + node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected); return finishNode(node); } - function parseOptionalIdentifier() { - return isIdentifier() ? parseIdentifier() : undefined; - } - function parseNewExpression() { - var node = createNode(169); - parseExpected(92); - node.expression = parseMemberExpressionOrHigher(); - node.typeArguments = tryParse(parseTypeArgumentsInExpression); - if (node.typeArguments || token === 17) { - node.arguments = parseArgumentList(); - } + function parseConstructorDeclaration(pos, decorators, modifiers) { + var node = createNode(144, pos); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(121); + fillSignature(54, false, false, false, node); + node.body = parseFunctionBlockOrSemicolon(false, false, ts.Diagnostics.or_expected); return finishNode(node); } - function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { - var node = createNode(192); - if (parseExpected(15, diagnosticMessage) || ignoreMissingOpenBrace) { - node.statements = parseList(1, parseStatement); - parseExpected(16); + function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) { + var method = createNode(143, fullStart); + method.decorators = decorators; + setModifiers(method, modifiers); + method.asteriskToken = asteriskToken; + method.name = name; + method.questionToken = questionToken; + var isGenerator = !!asteriskToken; + var isAsync = !!(method.flags & 256); + fillSignature(54, isGenerator, isAsync, false, method); + method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); + return finishNode(method); + } + function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) { + var property = createNode(141, fullStart); + property.decorators = decorators; + setModifiers(property, modifiers); + property.name = name; + property.questionToken = questionToken; + property.type = parseTypeAnnotation(); + property.initializer = modifiers && modifiers.flags & 64 + ? allowInAnd(parseNonParameterInitializer) + : doOutsideOfContext(2 | 1, parseNonParameterInitializer); + parseSemicolon(); + return finishNode(property); + } + function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) { + var asteriskToken = parseOptionalToken(37); + var name = parsePropertyName(); + var questionToken = parseOptionalToken(53); + if (asteriskToken || token === 17 || token === 25) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected); } else { - node.statements = createMissingList(); + return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken); } - return finishNode(node); } - function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { - var savedYieldContext = inYieldContext(); - setYieldContext(allowYield); - var savedAwaitContext = inAwaitContext(); - setAwaitContext(allowAwait); - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); - if (saveDecoratorContext) { - setDecoratorContext(true); - } - setYieldContext(savedYieldContext); - setAwaitContext(savedAwaitContext); - return block; + function parseNonParameterInitializer() { + return parseInitializer(false); } - function parseEmptyStatement() { - var node = createNode(194); - parseExpected(23); + function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parsePropertyName(); + fillSignature(54, false, false, false, node); + node.body = parseFunctionBlockOrSemicolon(false, false); return finishNode(node); } - function parseIfStatement() { - var node = createNode(196); - parseExpected(88); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); - node.thenStatement = parseStatement(); - node.elseStatement = parseOptional(80) ? parseStatement() : undefined; - return finishNode(node); + function isClassMemberModifier(idToken) { + switch (idToken) { + case 112: + case 110: + case 111: + case 113: + return true; + default: + return false; + } } - function parseDoStatement() { - var node = createNode(197); - parseExpected(79); - node.statement = parseStatement(); - parseExpected(104); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); - parseOptional(23); - return finishNode(node); + function isClassMemberStart() { + var idToken; + if (token === 55) { + return true; + } + while (ts.isModifier(token)) { + idToken = token; + if (isClassMemberModifier(idToken)) { + return true; + } + nextToken(); + } + if (token === 37) { + return true; + } + if (isLiteralPropertyName()) { + idToken = token; + nextToken(); + } + if (token === 19) { + return true; + } + if (idToken !== undefined) { + if (!ts.isKeyword(idToken) || idToken === 129 || idToken === 123) { + return true; + } + switch (token) { + case 17: + case 25: + case 54: + case 56: + case 53: + return true; + default: + return canParseSemicolon(); + } + } + return false; } - function parseWhileStatement() { - var node = createNode(198); - parseExpected(104); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); - node.statement = parseStatement(); - return finishNode(node); + function parseDecorators() { + var decorators; + while (true) { + var decoratorStart = getNodePos(); + if (!parseOptional(55)) { + break; + } + if (!decorators) { + decorators = []; + decorators.pos = scanner.getStartPos(); + } + var decorator = createNode(139, decoratorStart); + decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); + decorators.push(finishNode(decorator)); + } + if (decorators) { + decorators.end = getNodeEnd(); + } + return decorators; } - function parseForOrForInOrForOfStatement() { - var pos = getNodePos(); - parseExpected(86); - parseExpected(17); - var initializer = undefined; - if (token !== 23) { - if (token === 102 || token === 108 || token === 74) { - initializer = parseVariableDeclarationList(true); + function parseModifiers() { + var flags = 0; + var modifiers; + while (true) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + if (!parseAnyContextualModifier()) { + break; } - else { - initializer = disallowInAnd(parseExpression); + if (!modifiers) { + modifiers = []; + modifiers.pos = modifierStart; } + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); + } + if (modifiers) { + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); + } + return modifiers; + } + function parseModifiersForArrowFunction() { + var flags = 0; + var modifiers; + if (token === 118) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + nextToken(); + modifiers = []; + modifiers.pos = modifierStart; + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); + } + return modifiers; + } + function parseClassElement() { + if (token === 23) { + var result = createNode(191); + nextToken(); + return finishNode(result); } - var forOrForInOrForOfStatement; - if (parseOptional(90)) { - var forInStatement = createNode(200, pos); - forInStatement.initializer = initializer; - forInStatement.expression = allowInAnd(parseExpression); - parseExpected(18); - forOrForInOrForOfStatement = forInStatement; + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; } - else if (parseOptional(134)) { - var forOfStatement = createNode(201, pos); - forOfStatement.initializer = initializer; - forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(18); - forOrForInOrForOfStatement = forOfStatement; + if (token === 121) { + return parseConstructorDeclaration(fullStart, decorators, modifiers); } - else { - var forStatement = createNode(199, pos); - forStatement.initializer = initializer; - parseExpected(23); - if (token !== 23 && token !== 18) { - forStatement.condition = allowInAnd(parseExpression); - } - parseExpected(23); - if (token !== 18) { - forStatement.incrementor = allowInAnd(parseExpression); - } - parseExpected(18); - forOrForInOrForOfStatement = forStatement; + if (isIndexSignature()) { + return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); } - forOrForInOrForOfStatement.statement = parseStatement(); - return finishNode(forOrForInOrForOfStatement); + if (ts.tokenIsIdentifierOrKeyword(token) || + token === 9 || + token === 8 || + token === 37 || + token === 19) { + return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); + } + if (decorators || modifiers) { + var name_7 = createMissingNode(69, true, ts.Diagnostics.Declaration_expected); + return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, undefined); + } + ts.Debug.fail("Should not have attempted to parse class member declaration."); } - function parseBreakOrContinueStatement(kind) { - var node = createNode(kind); - parseExpected(kind === 203 ? 70 : 75); - if (!canParseSemicolon()) { - node.label = parseIdentifier(); + function parseClassExpression() { + return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 186); + } + function parseClassDeclaration(fullStart, decorators, modifiers) { + return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214); + } + function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(73); + node.name = parseNameOfClassDeclarationOrExpression(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(true); + if (parseExpected(15)) { + node.members = parseClassMembers(); + parseExpected(16); + } + else { + node.members = createMissingList(); } - parseSemicolon(); return finishNode(node); } - function parseReturnStatement() { - var node = createNode(204); - parseExpected(94); - if (!canParseSemicolon()) { - node.expression = allowInAnd(parseExpression); + function parseNameOfClassDeclarationOrExpression() { + return isIdentifier() && !isImplementsClause() + ? parseIdentifier() + : undefined; + } + function isImplementsClause() { + return token === 106 && lookAhead(nextTokenIsIdentifierOrKeyword); + } + function parseHeritageClauses(isClassHeritageClause) { + if (isHeritageClause()) { + return parseList(20, parseHeritageClause); } - parseSemicolon(); - return finishNode(node); + return undefined; } - function parseWithStatement() { - var node = createNode(205); - parseExpected(105); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); - node.statement = parseStatement(); - return finishNode(node); + function parseHeritageClausesWorker() { + return parseList(20, parseHeritageClause); } - function parseCaseClause() { - var node = createNode(241); - parseExpected(71); - node.expression = allowInAnd(parseExpression); - parseExpected(54); - node.statements = parseList(3, parseStatement); - return finishNode(node); + function parseHeritageClause() { + if (token === 83 || token === 106) { + var node = createNode(243); + node.token = token; + nextToken(); + node.types = parseDelimitedList(7, parseExpressionWithTypeArguments); + return finishNode(node); + } + return undefined; } - function parseDefaultClause() { - var node = createNode(242); - parseExpected(77); - parseExpected(54); - node.statements = parseList(3, parseStatement); + function parseExpressionWithTypeArguments() { + var node = createNode(188); + node.expression = parseLeftHandSideExpressionOrHigher(); + if (token === 25) { + node.typeArguments = parseBracketedList(18, parseType, 25, 27); + } return finishNode(node); } - function parseCaseOrDefaultClause() { - return token === 71 ? parseCaseClause() : parseDefaultClause(); + function isHeritageClause() { + return token === 83 || token === 106; } - function parseSwitchStatement() { - var node = createNode(206); - parseExpected(96); - parseExpected(17); - node.expression = allowInAnd(parseExpression); - parseExpected(18); - var caseBlock = createNode(220, scanner.getStartPos()); - parseExpected(15); - caseBlock.clauses = parseList(2, parseCaseOrDefaultClause); - parseExpected(16); - node.caseBlock = finishNode(caseBlock); + function parseClassMembers() { + return parseList(5, parseClassElement); + } + function parseInterfaceDeclaration(fullStart, decorators, modifiers) { + var node = createNode(215, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(107); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(false); + node.members = parseObjectTypeMembers(); return finishNode(node); } - function parseThrowStatement() { - var node = createNode(208); - parseExpected(98); - node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { + var node = createNode(216, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(132); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + parseExpected(56); + node.type = parseType(); parseSemicolon(); return finishNode(node); } - function parseTryStatement() { - var node = createNode(209); - parseExpected(100); - node.tryBlock = parseBlock(false); - node.catchClause = token === 72 ? parseCatchClause() : undefined; - if (!node.catchClause || token === 85) { - parseExpected(85); - node.finallyBlock = parseBlock(false); - } + function parseEnumMember() { + var node = createNode(247, scanner.getStartPos()); + node.name = parsePropertyName(); + node.initializer = allowInAnd(parseNonParameterInitializer); return finishNode(node); } - function parseCatchClause() { - var result = createNode(244); - parseExpected(72); - if (parseExpected(17)) { - result.variableDeclaration = parseVariableDeclaration(); + function parseEnumDeclaration(fullStart, decorators, modifiers) { + var node = createNode(217, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(81); + node.name = parseIdentifier(); + if (parseExpected(15)) { + node.members = parseDelimitedList(6, parseEnumMember); + parseExpected(16); + } + else { + node.members = createMissingList(); } - parseExpected(18); - result.block = parseBlock(false); - return finishNode(result); - } - function parseDebuggerStatement() { - var node = createNode(210); - parseExpected(76); - parseSemicolon(); return finishNode(node); } - function parseExpressionOrLabeledStatement() { - var fullStart = scanner.getStartPos(); - var expression = allowInAnd(parseExpression); - if (expression.kind === 69 && parseOptional(54)) { - var labeledStatement = createNode(207, fullStart); - labeledStatement.label = expression; - labeledStatement.statement = parseStatement(); - return finishNode(labeledStatement); + function parseModuleBlock() { + var node = createNode(219, scanner.getStartPos()); + if (parseExpected(15)) { + node.statements = parseList(1, parseStatement); + parseExpected(16); } else { - var expressionStatement = createNode(195, fullStart); - expressionStatement.expression = expression; - parseSemicolon(); - return finishNode(expressionStatement); + node.statements = createMissingList(); } + return finishNode(node); } - function nextTokenIsIdentifierOrKeywordOnSameLine() { - nextToken(); - return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); - } - function nextTokenIsFunctionKeywordOnSameLine() { - nextToken(); - return token === 87 && !scanner.hasPrecedingLineBreak(); - } - function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { - nextToken(); - return (ts.tokenIsIdentifierOrKeyword(token) || token === 8) && !scanner.hasPrecedingLineBreak(); + function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { + var node = createNode(218, fullStart); + var namespaceFlag = flags & 65536; + node.decorators = decorators; + setModifiers(node, modifiers); + node.flags |= flags; + node.name = parseIdentifier(); + node.body = parseOptional(21) + ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag) + : parseModuleBlock(); + return finishNode(node); } - function isDeclaration() { - while (true) { - switch (token) { - case 102: - case 108: - case 74: - case 87: - case 73: - case 81: - return true; - case 107: - case 132: - return nextTokenIsIdentifierOnSameLine(); - case 125: - case 126: - return nextTokenIsIdentifierOrStringLiteralOnSameLine(); - case 115: - case 118: - case 122: - case 110: - case 111: - case 112: - nextToken(); - if (scanner.hasPrecedingLineBreak()) { - return false; - } - continue; - case 89: - nextToken(); - return token === 9 || token === 37 || - token === 15 || ts.tokenIsIdentifierOrKeyword(token); - case 82: - nextToken(); - if (token === 56 || token === 37 || - token === 15 || token === 77) { - return true; - } - continue; - case 113: - nextToken(); - continue; - default: - return false; + function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { + var node = createNode(218, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parseLiteralNode(true); + node.body = parseModuleBlock(); + return finishNode(node); + } + function parseModuleDeclaration(fullStart, decorators, modifiers) { + var flags = modifiers ? modifiers.flags : 0; + if (parseOptional(126)) { + flags |= 65536; + } + else { + parseExpected(125); + if (token === 9) { + return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); } } + return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); } - function isStartOfDeclaration() { - return lookAhead(isDeclaration); + function isExternalModuleReference() { + return token === 127 && + lookAhead(nextTokenIsOpenParen); } - function isStartOfStatement() { - switch (token) { - case 55: - case 23: - case 15: - case 102: - case 108: - case 87: - case 73: - case 81: - case 88: - case 79: - case 104: - case 86: - case 75: - case 70: - case 94: - case 105: - case 96: - case 98: - case 100: - case 76: - case 72: - case 85: - return true; - case 74: - case 82: - case 89: - return isStartOfDeclaration(); - case 118: - case 122: - case 107: - case 125: - case 126: - case 132: - return true; - case 112: - case 110: - case 111: - case 113: - return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); - default: - return isStartOfExpression(); - } + function nextTokenIsOpenParen() { + return nextToken() === 17; } - function nextTokenIsIdentifierOrStartOfDestructuring() { - nextToken(); - return isIdentifier() || token === 15 || token === 19; + function nextTokenIsSlash() { + return nextToken() === 39; } - function isLetDeclaration() { - return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + function nextTokenIsCommaOrFromKeyword() { + nextToken(); + return token === 24 || + token === 133; } - function parseStatement() { - switch (token) { - case 23: - return parseEmptyStatement(); - case 15: - return parseBlock(false); - case 102: - return parseVariableStatement(scanner.getStartPos(), undefined, undefined); - case 108: - if (isLetDeclaration()) { - return parseVariableStatement(scanner.getStartPos(), undefined, undefined); - } - break; - case 87: - return parseFunctionDeclaration(scanner.getStartPos(), undefined, undefined); - case 73: - return parseClassDeclaration(scanner.getStartPos(), undefined, undefined); - case 88: - return parseIfStatement(); - case 79: - return parseDoStatement(); - case 104: - return parseWhileStatement(); - case 86: - return parseForOrForInOrForOfStatement(); - case 75: - return parseBreakOrContinueStatement(202); - case 70: - return parseBreakOrContinueStatement(203); - case 94: - return parseReturnStatement(); - case 105: - return parseWithStatement(); - case 96: - return parseSwitchStatement(); - case 98: - return parseThrowStatement(); - case 100: - case 72: - case 85: - return parseTryStatement(); - case 76: - return parseDebuggerStatement(); - case 55: - return parseDeclaration(); - case 118: - case 107: - case 132: - case 125: - case 126: - case 122: - case 74: - case 81: - case 82: - case 89: - case 110: - case 111: - case 112: - case 115: - case 113: - if (isStartOfDeclaration()) { - return parseDeclaration(); - } - break; + function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { + parseExpected(89); + var afterImportPos = scanner.getStartPos(); + var identifier; + if (isIdentifier()) { + identifier = parseIdentifier(); + if (token !== 24 && token !== 133) { + var importEqualsDeclaration = createNode(221, fullStart); + importEqualsDeclaration.decorators = decorators; + setModifiers(importEqualsDeclaration, modifiers); + importEqualsDeclaration.name = identifier; + parseExpected(56); + importEqualsDeclaration.moduleReference = parseModuleReference(); + parseSemicolon(); + return finishNode(importEqualsDeclaration); + } } - return parseExpressionOrLabeledStatement(); + var importDeclaration = createNode(222, fullStart); + importDeclaration.decorators = decorators; + setModifiers(importDeclaration, modifiers); + if (identifier || + token === 37 || + token === 15) { + importDeclaration.importClause = parseImportClause(identifier, afterImportPos); + parseExpected(133); + } + importDeclaration.moduleSpecifier = parseModuleSpecifier(); + parseSemicolon(); + return finishNode(importDeclaration); } - function parseDeclaration() { - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - switch (token) { - case 102: - case 108: - case 74: - return parseVariableStatement(fullStart, decorators, modifiers); - case 87: - return parseFunctionDeclaration(fullStart, decorators, modifiers); - case 73: - return parseClassDeclaration(fullStart, decorators, modifiers); - case 107: - return parseInterfaceDeclaration(fullStart, decorators, modifiers); - case 132: - return parseTypeAliasDeclaration(fullStart, decorators, modifiers); - case 81: - return parseEnumDeclaration(fullStart, decorators, modifiers); - case 125: - case 126: - return parseModuleDeclaration(fullStart, decorators, modifiers); - case 89: - return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); - case 82: - nextToken(); - return token === 77 || token === 56 ? - parseExportAssignment(fullStart, decorators, modifiers) : - parseExportDeclaration(fullStart, decorators, modifiers); - default: - if (decorators || modifiers) { - var node = createMissingNode(231, true, ts.Diagnostics.Declaration_expected); - node.pos = fullStart; - node.decorators = decorators; - setModifiers(node, modifiers); - return finishNode(node); - } + function parseImportClause(identifier, fullStart) { + var importClause = createNode(223, fullStart); + if (identifier) { + importClause.name = identifier; + } + if (!importClause.name || + parseOptional(24)) { + importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(225); } + return finishNode(importClause); } - function nextTokenIsIdentifierOrStringLiteralOnSameLine() { - nextToken(); - return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9); + function parseModuleReference() { + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(false); } - function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { - if (token !== 15 && canParseSemicolon()) { - parseSemicolon(); - return; + function parseExternalModuleReference() { + var node = createNode(232); + parseExpected(127); + parseExpected(17); + node.expression = parseModuleSpecifier(); + parseExpected(18); + return finishNode(node); + } + function parseModuleSpecifier() { + var result = parseExpression(); + if (result.kind === 9) { + internIdentifier(result.text); } - return parseFunctionBlock(isGenerator, isAsync, false, diagnosticMessage); + return result; } - function parseArrayBindingElement() { - if (token === 24) { - return createNode(187); + function parseNamespaceImport() { + var namespaceImport = createNode(224); + parseExpected(37); + parseExpected(116); + namespaceImport.name = parseIdentifier(); + return finishNode(namespaceImport); + } + function parseNamedImportsOrExports(kind) { + var node = createNode(kind); + node.elements = parseBracketedList(21, kind === 225 ? parseImportSpecifier : parseExportSpecifier, 15, 16); + return finishNode(node); + } + function parseExportSpecifier() { + return parseImportOrExportSpecifier(230); + } + function parseImportSpecifier() { + return parseImportOrExportSpecifier(226); + } + function parseImportOrExportSpecifier(kind) { + var node = createNode(kind); + var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + var checkIdentifierStart = scanner.getTokenPos(); + var checkIdentifierEnd = scanner.getTextPos(); + var identifierName = parseIdentifierName(); + if (token === 116) { + node.propertyName = identifierName; + parseExpected(116); + checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + checkIdentifierStart = scanner.getTokenPos(); + checkIdentifierEnd = scanner.getTextPos(); + node.name = parseIdentifierName(); + } + else { + node.name = identifierName; + } + if (kind === 226 && checkIdentifierIsKeyword) { + parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); } - var node = createNode(163); - node.dotDotDotToken = parseOptionalToken(22); - node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(false); return finishNode(node); } - function parseObjectBindingElement() { - var node = createNode(163); - var tokenIsIdentifier = isIdentifier(); - var propertyName = parsePropertyName(); - if (tokenIsIdentifier && token !== 54) { - node.name = propertyName; + function parseExportDeclaration(fullStart, decorators, modifiers) { + var node = createNode(228, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + if (parseOptional(37)) { + parseExpected(133); + node.moduleSpecifier = parseModuleSpecifier(); + } + else { + node.exportClause = parseNamedImportsOrExports(229); + if (token === 133 || (token === 9 && !scanner.hasPrecedingLineBreak())) { + parseExpected(133); + node.moduleSpecifier = parseModuleSpecifier(); + } + } + parseSemicolon(); + return finishNode(node); + } + function parseExportAssignment(fullStart, decorators, modifiers) { + var node = createNode(227, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + if (parseOptional(56)) { + node.isExportEquals = true; + } + else { + parseExpected(77); + } + node.expression = parseAssignmentExpressionOrHigher(); + parseSemicolon(); + return finishNode(node); + } + function processReferenceComments(sourceFile) { + var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, 0, sourceText); + var referencedFiles = []; + var amdDependencies = []; + var amdModuleName; + while (true) { + var kind = triviaScanner.scan(); + if (kind === 5 || kind === 4 || kind === 3) { + continue; + } + if (kind !== 2) { + break; + } + var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; + var comment = sourceText.substring(range.pos, range.end); + var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); + if (referencePathMatchResult) { + var fileReference = referencePathMatchResult.fileReference; + sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; + var diagnosticMessage = referencePathMatchResult.diagnosticMessage; + if (fileReference) { + referencedFiles.push(fileReference); + } + if (diagnosticMessage) { + parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); + } + } + else { + var amdModuleNameRegEx = /^\/\/\/\s*".length; + return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); + } } - } - function isClassMemberStart() { - var idToken; - if (token === 55) { - return true; + function parseQualifiedName(left) { + var result = createNode(135, left.pos); + result.left = left; + result.right = parseIdentifierName(); + return finishNode(result); } - while (ts.isModifier(token)) { - idToken = token; - if (isClassMemberModifier(idToken)) { - return true; + function parseJSDocRecordType() { + var result = createNode(257); + nextToken(); + result.members = parseDelimitedList(24, parseJSDocRecordMember); + checkForTrailingComma(result.members); + parseExpected(16); + return finishNode(result); + } + function parseJSDocRecordMember() { + var result = createNode(258); + result.name = parseSimplePropertyName(); + if (token === 54) { + nextToken(); + result.type = parseJSDocType(); } + return finishNode(result); + } + function parseJSDocNonNullableType() { + var result = createNode(256); nextToken(); + result.type = parseJSDocType(); + return finishNode(result); } - if (token === 37) { - return true; + function parseJSDocTupleType() { + var result = createNode(254); + nextToken(); + result.types = parseDelimitedList(25, parseJSDocType); + checkForTrailingComma(result.types); + parseExpected(20); + return finishNode(result); } - if (isLiteralPropertyName()) { - idToken = token; + function checkForTrailingComma(list) { + if (parseDiagnostics.length === 0 && list.hasTrailingComma) { + var start = list.end - ",".length; + parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); + } + } + function parseJSDocUnionType() { + var result = createNode(253); nextToken(); + result.types = parseJSDocTypeList(parseJSDocType()); + parseExpected(18); + return finishNode(result); } - if (token === 19) { - return true; + function parseJSDocTypeList(firstType) { + ts.Debug.assert(!!firstType); + var types = []; + types.pos = firstType.pos; + types.push(firstType); + while (parseOptional(47)) { + types.push(parseJSDocType()); + } + types.end = scanner.getStartPos(); + return types; } - if (idToken !== undefined) { - if (!ts.isKeyword(idToken) || idToken === 129 || idToken === 123) { - return true; + function parseJSDocAllType() { + var result = createNode(250); + nextToken(); + return finishNode(result); + } + function parseJSDocUnknownOrNullableType() { + var pos = scanner.getStartPos(); + nextToken(); + if (token === 24 || + token === 16 || + token === 18 || + token === 27 || + token === 56 || + token === 47) { + var result = createNode(251, pos); + return finishNode(result); } - switch (token) { - case 17: - case 25: - case 54: - case 56: - case 53: - return true; - default: - return canParseSemicolon(); + else { + var result = createNode(255, pos); + result.type = parseJSDocType(); + return finishNode(result); } } - return false; - } - function parseDecorators() { - var decorators; - while (true) { - var decoratorStart = getNodePos(); - if (!parseOptional(55)) { - break; + function parseIsolatedJSDocComment(content, start, length) { + initializeState("file.js", content, 2, true, undefined); + var jsDocComment = parseJSDocComment(undefined, start, length); + var diagnostics = parseDiagnostics; + clearState(); + return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; + } + JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; + function parseJSDocComment(parent, start, length) { + var comment = parseJSDocCommentWorker(start, length); + if (comment) { + fixupParentReferences(comment); + comment.parent = parent; + } + return comment; + } + JSDocParser.parseJSDocComment = parseJSDocComment; + function parseJSDocCommentWorker(start, length) { + var content = sourceText; + start = start || 0; + var end = length === undefined ? content.length : start + length; + length = end - start; + ts.Debug.assert(start >= 0); + ts.Debug.assert(start <= end); + ts.Debug.assert(end <= content.length); + var tags; + var pos; + if (length >= "/** */".length) { + if (content.charCodeAt(start) === 47 && + content.charCodeAt(start + 1) === 42 && + content.charCodeAt(start + 2) === 42 && + content.charCodeAt(start + 3) !== 42) { + var canParseTag = true; + var seenAsterisk = true; + for (pos = start + "/**".length; pos < end;) { + var ch = content.charCodeAt(pos); + pos++; + if (ch === 64 && canParseTag) { + parseTag(); + canParseTag = false; + continue; + } + if (ts.isLineBreak(ch)) { + canParseTag = true; + seenAsterisk = false; + continue; + } + if (ts.isWhiteSpace(ch)) { + continue; + } + if (ch === 42) { + if (seenAsterisk) { + canParseTag = false; + } + seenAsterisk = true; + continue; + } + canParseTag = false; + } + } + } + return createJSDocComment(); + function createJSDocComment() { + if (!tags) { + return undefined; + } + var result = createNode(265, start); + result.tags = tags; + return finishNode(result, end); + } + function skipWhitespace() { + while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { + pos++; + } + } + function parseTag() { + ts.Debug.assert(content.charCodeAt(pos - 1) === 64); + var atToken = createNode(55, pos - 1); + atToken.end = pos; + var tagName = scanIdentifier(); + if (!tagName) { + return; + } + var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); + addTag(tag); + } + function handleTag(atToken, tagName) { + if (tagName) { + switch (tagName.text) { + case "param": + return handleParamTag(atToken, tagName); + case "return": + case "returns": + return handleReturnTag(atToken, tagName); + case "template": + return handleTemplateTag(atToken, tagName); + case "type": + return handleTypeTag(atToken, tagName); + } + } + return undefined; + } + function handleUnknownTag(atToken, tagName) { + var result = createNode(266, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + return finishNode(result, pos); + } + function addTag(tag) { + if (tag) { + if (!tags) { + tags = []; + tags.pos = tag.pos; + } + tags.push(tag); + tags.end = tag.end; + } + } + function tryParseTypeExpression() { + skipWhitespace(); + if (content.charCodeAt(pos) !== 123) { + return undefined; + } + var typeExpression = parseJSDocTypeExpression(pos, end - pos); + pos = typeExpression.end; + return typeExpression; + } + function handleParamTag(atToken, tagName) { + var typeExpression = tryParseTypeExpression(); + skipWhitespace(); + var name; + var isBracketed; + if (content.charCodeAt(pos) === 91) { + pos++; + skipWhitespace(); + name = scanIdentifier(); + isBracketed = true; + } + else { + name = scanIdentifier(); + } + if (!name) { + parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); + } + var preName, postName; + if (typeExpression) { + postName = name; + } + else { + preName = name; + } + if (!typeExpression) { + typeExpression = tryParseTypeExpression(); + } + var result = createNode(267, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.preParameterName = preName; + result.typeExpression = typeExpression; + result.postParameterName = postName; + result.isBracketed = isBracketed; + return finishNode(result, pos); } - if (!decorators) { - decorators = []; - decorators.pos = scanner.getStartPos(); + function handleReturnTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 268; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(268, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); } - var decorator = createNode(139, decoratorStart); - decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); - decorators.push(finishNode(decorator)); - } - if (decorators) { - decorators.end = getNodeEnd(); - } - return decorators; - } - function parseModifiers() { - var flags = 0; - var modifiers; - while (true) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - if (!parseAnyContextualModifier()) { - break; + function handleTypeTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 269; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(269, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); } - if (!modifiers) { - modifiers = []; - modifiers.pos = modifierStart; + function handleTemplateTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 270; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var typeParameters = []; + typeParameters.pos = pos; + while (true) { + skipWhitespace(); + var startPos = pos; + var name_8 = scanIdentifier(); + if (!name_8) { + parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); + return undefined; + } + var typeParameter = createNode(137, name_8.pos); + typeParameter.name = name_8; + finishNode(typeParameter, pos); + typeParameters.push(typeParameter); + skipWhitespace(); + if (content.charCodeAt(pos) !== 44) { + break; + } + pos++; + } + typeParameters.end = pos; + var result = createNode(270, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeParameters = typeParameters; + return finishNode(result, pos); + } + function scanIdentifier() { + var startPos = pos; + for (; pos < end; pos++) { + var ch = content.charCodeAt(pos); + if (pos === startPos && ts.isIdentifierStart(ch, 2)) { + continue; + } + else if (pos > startPos && ts.isIdentifierPart(ch, 2)) { + continue; + } + break; + } + if (startPos === pos) { + return undefined; + } + var result = createNode(69, startPos); + result.text = content.substring(startPos, pos); + return finishNode(result, pos); } - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); - } - if (modifiers) { - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); - } - return modifiers; - } - function parseModifiersForArrowFunction() { - var flags = 0; - var modifiers; - if (token === 118) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - nextToken(); - modifiers = []; - modifiers.pos = modifierStart; - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); - } - return modifiers; - } - function parseClassElement() { - if (token === 23) { - var result = createNode(191); - nextToken(); - return finishNode(result); - } - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; - } - if (token === 121) { - return parseConstructorDeclaration(fullStart, decorators, modifiers); - } - if (isIndexSignature()) { - return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); - } - if (ts.tokenIsIdentifierOrKeyword(token) || - token === 9 || - token === 8 || - token === 37 || - token === 19) { - return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); - } - if (decorators || modifiers) { - var name_7 = createMissingNode(69, true, ts.Diagnostics.Declaration_expected); - return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, undefined); - } - ts.Debug.fail("Should not have attempted to parse class member declaration."); - } - function parseClassExpression() { - return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 186); - } - function parseClassDeclaration(fullStart, decorators, modifiers) { - return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214); - } - function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { - var node = createNode(kind, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(73); - node.name = parseNameOfClassDeclarationOrExpression(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(true); - if (parseExpected(15)) { - node.members = parseClassMembers(); - parseExpected(16); - } - else { - node.members = createMissingList(); - } - return finishNode(node); - } - function parseNameOfClassDeclarationOrExpression() { - return isIdentifier() && !isImplementsClause() - ? parseIdentifier() - : undefined; - } - function isImplementsClause() { - return token === 106 && lookAhead(nextTokenIsIdentifierOrKeyword); - } - function parseHeritageClauses(isClassHeritageClause) { - if (isHeritageClause()) { - return parseList(20, parseHeritageClause); - } - return undefined; - } - function parseHeritageClausesWorker() { - return parseList(20, parseHeritageClause); - } - function parseHeritageClause() { - if (token === 83 || token === 106) { - var node = createNode(243); - node.token = token; - nextToken(); - node.types = parseDelimitedList(7, parseExpressionWithTypeArguments); - return finishNode(node); - } - return undefined; - } - function parseExpressionWithTypeArguments() { - var node = createNode(188); - node.expression = parseLeftHandSideExpressionOrHigher(); - if (token === 25) { - node.typeArguments = parseBracketedList(18, parseType, 25, 27); - } - return finishNode(node); - } - function isHeritageClause() { - return token === 83 || token === 106; - } - function parseClassMembers() { - return parseList(5, parseClassElement); - } - function parseInterfaceDeclaration(fullStart, decorators, modifiers) { - var node = createNode(215, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(107); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(false); - node.members = parseObjectTypeMembers(); - return finishNode(node); - } - function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { - var node = createNode(216, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(132); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - parseExpected(56); - node.type = parseType(); - parseSemicolon(); - return finishNode(node); - } - function parseEnumMember() { - var node = createNode(247, scanner.getStartPos()); - node.name = parsePropertyName(); - node.initializer = allowInAnd(parseNonParameterInitializer); - return finishNode(node); - } - function parseEnumDeclaration(fullStart, decorators, modifiers) { - var node = createNode(217, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(81); - node.name = parseIdentifier(); - if (parseExpected(15)) { - node.members = parseDelimitedList(6, parseEnumMember); - parseExpected(16); - } - else { - node.members = createMissingList(); } - return finishNode(node); - } - function parseModuleBlock() { - var node = createNode(219, scanner.getStartPos()); - if (parseExpected(15)) { - node.statements = parseList(1, parseStatement); - parseExpected(16); + JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; + })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); + })(Parser || (Parser = {})); + var IncrementalParser; + (function (IncrementalParser) { + function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { + aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2); + checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); + if (ts.textChangeRangeIsUnchanged(textChangeRange)) { + return sourceFile; } - else { - node.statements = createMissingList(); + if (sourceFile.statements.length === 0) { + return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true); } - return finishNode(node); - } - function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { - var node = createNode(218, fullStart); - var namespaceFlag = flags & 65536; - node.decorators = decorators; - setModifiers(node, modifiers); - node.flags |= flags; - node.name = parseIdentifier(); - node.body = parseOptional(21) - ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag) - : parseModuleBlock(); - return finishNode(node); - } - function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { - var node = createNode(218, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.name = parseLiteralNode(true); - node.body = parseModuleBlock(); - return finishNode(node); + var incrementalSourceFile = sourceFile; + ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); + incrementalSourceFile.hasBeenIncrementallyParsed = true; + var oldText = sourceFile.text; + var syntaxCursor = createSyntaxCursor(sourceFile); + var changeRange = extendToAffectedRange(sourceFile, textChangeRange); + checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); + ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); + ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); + ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); + var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; + updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); + var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true); + return result; } - function parseModuleDeclaration(fullStart, decorators, modifiers) { - var flags = modifiers ? modifiers.flags : 0; - if (parseOptional(126)) { - flags |= 65536; + IncrementalParser.updateSourceFile = updateSourceFile; + function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { + if (isArray) { + visitArray(element); } else { - parseExpected(125); - if (token === 9) { - return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); - } + visitNode(element); } - return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); - } - function isExternalModuleReference() { - return token === 127 && - lookAhead(nextTokenIsOpenParen); - } - function nextTokenIsOpenParen() { - return nextToken() === 17; - } - function nextTokenIsSlash() { - return nextToken() === 39; - } - function nextTokenIsCommaOrFromKeyword() { - nextToken(); - return token === 24 || - token === 133; - } - function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { - parseExpected(89); - var afterImportPos = scanner.getStartPos(); - var identifier; - if (isIdentifier()) { - identifier = parseIdentifier(); - if (token !== 24 && token !== 133) { - var importEqualsDeclaration = createNode(221, fullStart); - importEqualsDeclaration.decorators = decorators; - setModifiers(importEqualsDeclaration, modifiers); - importEqualsDeclaration.name = identifier; - parseExpected(56); - importEqualsDeclaration.moduleReference = parseModuleReference(); - parseSemicolon(); - return finishNode(importEqualsDeclaration); + return; + function visitNode(node) { + var text = ""; + if (aggressiveChecks && shouldCheckNode(node)) { + text = oldText.substring(node.pos, node.end); } + if (node._children) { + node._children = undefined; + } + if (node.jsDocComment) { + node.jsDocComment = undefined; + } + node.pos += delta; + node.end += delta; + if (aggressiveChecks && shouldCheckNode(node)) { + ts.Debug.assert(text === newText.substring(node.pos, node.end)); + } + forEachChild(node, visitNode, visitArray); + checkNodePositions(node, aggressiveChecks); } - var importDeclaration = createNode(222, fullStart); - importDeclaration.decorators = decorators; - setModifiers(importDeclaration, modifiers); - if (identifier || - token === 37 || - token === 15) { - importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(133); - } - importDeclaration.moduleSpecifier = parseModuleSpecifier(); - parseSemicolon(); - return finishNode(importDeclaration); - } - function parseImportClause(identifier, fullStart) { - var importClause = createNode(223, fullStart); - if (identifier) { - importClause.name = identifier; - } - if (!importClause.name || - parseOptional(24)) { - importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(225); + function visitArray(array) { + array._children = undefined; + array.pos += delta; + array.end += delta; + for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { + var node = array_7[_i]; + visitNode(node); + } } - return finishNode(importClause); - } - function parseModuleReference() { - return isExternalModuleReference() - ? parseExternalModuleReference() - : parseEntityName(false); - } - function parseExternalModuleReference() { - var node = createNode(232); - parseExpected(127); - parseExpected(17); - node.expression = parseModuleSpecifier(); - parseExpected(18); - return finishNode(node); } - function parseModuleSpecifier() { - var result = parseExpression(); - if (result.kind === 9) { - internIdentifier(result.text); + function shouldCheckNode(node) { + switch (node.kind) { + case 9: + case 8: + case 69: + return true; } - return result; - } - function parseNamespaceImport() { - var namespaceImport = createNode(224); - parseExpected(37); - parseExpected(116); - namespaceImport.name = parseIdentifier(); - return finishNode(namespaceImport); - } - function parseNamedImportsOrExports(kind) { - var node = createNode(kind); - node.elements = parseBracketedList(21, kind === 225 ? parseImportSpecifier : parseExportSpecifier, 15, 16); - return finishNode(node); - } - function parseExportSpecifier() { - return parseImportOrExportSpecifier(230); - } - function parseImportSpecifier() { - return parseImportOrExportSpecifier(226); + return false; } - function parseImportOrExportSpecifier(kind) { - var node = createNode(kind); - var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - var checkIdentifierStart = scanner.getTokenPos(); - var checkIdentifierEnd = scanner.getTextPos(); - var identifierName = parseIdentifierName(); - if (token === 116) { - node.propertyName = identifierName; - parseExpected(116); - checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - checkIdentifierStart = scanner.getTokenPos(); - checkIdentifierEnd = scanner.getTextPos(); - node.name = parseIdentifierName(); + function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { + ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); + ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); + ts.Debug.assert(element.pos <= element.end); + element.pos = Math.min(element.pos, changeRangeNewEnd); + if (element.end >= changeRangeOldEnd) { + element.end += delta; } else { - node.name = identifierName; + element.end = Math.min(element.end, changeRangeNewEnd); } - if (kind === 226 && checkIdentifierIsKeyword) { - parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); + ts.Debug.assert(element.pos <= element.end); + if (element.parent) { + ts.Debug.assert(element.pos >= element.parent.pos); + ts.Debug.assert(element.end <= element.parent.end); } - return finishNode(node); } - function parseExportDeclaration(fullStart, decorators, modifiers) { - var node = createNode(228, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(37)) { - parseExpected(133); - node.moduleSpecifier = parseModuleSpecifier(); + function checkNodePositions(node, aggressiveChecks) { + if (aggressiveChecks) { + var pos = node.pos; + forEachChild(node, function (child) { + ts.Debug.assert(child.pos >= pos); + pos = child.end; + }); + ts.Debug.assert(pos <= node.end); + } + } + function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { + visitNode(sourceFile); + return; + function visitNode(child) { + ts.Debug.assert(child.pos <= child.end); + if (child.pos > changeRangeOldEnd) { + moveElementEntirelyPastChangeRange(child, false, delta, oldText, newText, aggressiveChecks); + return; + } + var fullEnd = child.end; + if (fullEnd >= changeStart) { + child.intersectsChange = true; + child._children = undefined; + adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + forEachChild(child, visitNode, visitArray); + checkNodePositions(child, aggressiveChecks); + return; + } + ts.Debug.assert(fullEnd < changeStart); } - else { - node.exportClause = parseNamedImportsOrExports(229); - if (token === 133 || (token === 9 && !scanner.hasPrecedingLineBreak())) { - parseExpected(133); - node.moduleSpecifier = parseModuleSpecifier(); + function visitArray(array) { + ts.Debug.assert(array.pos <= array.end); + if (array.pos > changeRangeOldEnd) { + moveElementEntirelyPastChangeRange(array, true, delta, oldText, newText, aggressiveChecks); + return; + } + var fullEnd = array.end; + if (fullEnd >= changeStart) { + array.intersectsChange = true; + array._children = undefined; + adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { + var node = array_8[_i]; + visitNode(node); + } + return; } + ts.Debug.assert(fullEnd < changeStart); } - parseSemicolon(); - return finishNode(node); } - function parseExportAssignment(fullStart, decorators, modifiers) { - var node = createNode(227, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(56)) { - node.isExportEquals = true; - } - else { - parseExpected(77); + function extendToAffectedRange(sourceFile, changeRange) { + var maxLookahead = 1; + var start = changeRange.span.start; + for (var i = 0; start > 0 && i <= maxLookahead; i++) { + var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); + ts.Debug.assert(nearestNode.pos <= start); + var position = nearestNode.pos; + start = Math.max(0, position - 1); } - node.expression = parseAssignmentExpressionOrHigher(); - parseSemicolon(); - return finishNode(node); + var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); + var finalLength = changeRange.newLength + (changeRange.span.start - start); + return ts.createTextChangeRange(finalSpan, finalLength); } - function processReferenceComments(sourceFile) { - var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, 0, sourceText); - var referencedFiles = []; - var amdDependencies = []; - var amdModuleName; - while (true) { - var kind = triviaScanner.scan(); - if (kind === 5 || kind === 4 || kind === 3) { - continue; + function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { + var bestResult = sourceFile; + var lastNodeEntirelyBeforePosition; + forEachChild(sourceFile, visit); + if (lastNodeEntirelyBeforePosition) { + var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); + if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { + bestResult = lastChildOfLastEntireNodeBeforePosition; } - if (kind !== 2) { - break; + } + return bestResult; + function getLastChild(node) { + while (true) { + var lastChild = getLastChildWorker(node); + if (lastChild) { + node = lastChild; + } + else { + return node; + } } - var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; - var comment = sourceText.substring(range.pos, range.end); - var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); - if (referencePathMatchResult) { - var fileReference = referencePathMatchResult.fileReference; - sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - var diagnosticMessage = referencePathMatchResult.diagnosticMessage; - if (fileReference) { - referencedFiles.push(fileReference); + } + function getLastChildWorker(node) { + var last = undefined; + forEachChild(node, function (child) { + if (ts.nodeIsPresent(child)) { + last = child; } - if (diagnosticMessage) { - parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); + }); + return last; + } + function visit(child) { + if (ts.nodeIsMissing(child)) { + return; + } + if (child.pos <= position) { + if (child.pos >= bestResult.pos) { + bestResult = child; + } + if (position < child.end) { + forEachChild(child, visit); + return true; + } + else { + ts.Debug.assert(child.end <= position); + lastNodeEntirelyBeforePosition = child; } } else { - var amdModuleNameRegEx = /^\/\/\/\s* position); + return true; + } + } + } + function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { + var oldText = sourceFile.text; + if (textChangeRange) { + ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); + if (aggressiveChecks || ts.Debug.shouldAssert(3)) { + var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); + var newTextPrefix = newText.substr(0, textChangeRange.span.start); + ts.Debug.assert(oldTextPrefix === newTextPrefix); + var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); + var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); + ts.Debug.assert(oldTextSuffix === newTextSuffix); + } + } + } + function createSyntaxCursor(sourceFile) { + var currentArray = sourceFile.statements; + var currentArrayIndex = 0; + ts.Debug.assert(currentArrayIndex < currentArray.length); + var current = currentArray[currentArrayIndex]; + var lastQueriedPosition = -1; + return { + currentNode: function (position) { + if (position !== lastQueriedPosition) { + if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { + currentArrayIndex++; + current = currentArray[currentArrayIndex]; + } + if (!current || current.pos !== position) { + findHighestListElementThatStartsAtPosition(position); } - amdModuleName = amdModuleNameMatchResult[2]; } - var amdDependencyRegEx = /^\/\/\/\s*= node.pos && position < node.end) { + forEachChild(node, visitNode, visitArray); + return true; + } + return false; + } + function visitArray(array) { + if (position >= array.pos && position < array.end) { + for (var i = 0, n = array.length; i < n; i++) { + var child = array[i]; + if (child) { + if (child.pos === position) { + currentArray = array; + currentArrayIndex = i; + current = child; + return true; + } + else { + if (child.pos < position && position < child.end) { + forEachChild(child, visitNode, visitArray); + return true; + } + } + } } } + return false; + } + } + } + })(IncrementalParser || (IncrementalParser = {})); +})(ts || (ts = {})); +var ts; +(function (ts) { + ts.bindTime = 0; + function or(state1, state2) { + return (state1 | state2) & 2 + ? 2 + : (state1 & state2) & 8 + ? 8 + : 4; + } + function getModuleInstanceState(node) { + if (node.kind === 215 || node.kind === 216) { + return 0; + } + else if (ts.isConstEnumDeclaration(node)) { + return 2; + } + else if ((node.kind === 222 || node.kind === 221) && !(node.flags & 2)) { + return 0; + } + else if (node.kind === 219) { + var state = 0; + ts.forEachChild(node, function (n) { + switch (getModuleInstanceState(n)) { + case 0: + return false; + case 2: + state = 2; + return false; + case 1: + state = 1; + return true; } + }); + return state; + } + else if (node.kind === 218) { + return getModuleInstanceState(node.body); + } + else { + return 1; + } + } + ts.getModuleInstanceState = getModuleInstanceState; + var binder = createBinder(); + function bindSourceFile(file, options) { + var start = new Date().getTime(); + binder(file, options); + ts.bindTime += new Date().getTime() - start; + } + ts.bindSourceFile = bindSourceFile; + function createBinder() { + var file; + var options; + var parent; + var container; + var blockScopeContainer; + var lastContainer; + var seenThisKeyword; + var hasExplicitReturn; + var currentReachabilityState; + var labelStack; + var labelIndexMap; + var implicitLabels; + var inStrictMode; + var symbolCount = 0; + var Symbol; + var classifiableNames; + function bindSourceFile(f, opts) { + file = f; + options = opts; + inStrictMode = !!file.externalModuleIndicator; + classifiableNames = {}; + Symbol = ts.objectAllocator.getSymbolConstructor(); + if (!file.locals) { + bind(file); + file.symbolCount = symbolCount; + file.classifiableNames = classifiableNames; } - sourceFile.referencedFiles = referencedFiles; - sourceFile.amdDependencies = amdDependencies; - sourceFile.moduleName = amdModuleName; + parent = undefined; + container = undefined; + blockScopeContainer = undefined; + lastContainer = undefined; + seenThisKeyword = false; + hasExplicitReturn = false; + labelStack = undefined; + labelIndexMap = undefined; + implicitLabels = undefined; } - function setExternalModuleIndicator(sourceFile) { - sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) { - return node.flags & 2 - || node.kind === 221 && node.moduleReference.kind === 232 - || node.kind === 222 - || node.kind === 227 - || node.kind === 228 - ? node - : undefined; - }); + return bindSourceFile; + function createSymbol(flags, name) { + symbolCount++; + return new Symbol(flags, name); } - var JSDocParser; - (function (JSDocParser) { - function isJSDocType() { - switch (token) { - case 37: - case 53: - case 17: - case 19: - case 49: - case 15: - case 87: - case 22: - case 92: - case 97: - return true; - } - return ts.tokenIsIdentifierOrKeyword(token); + function addDeclarationToSymbol(symbol, node, symbolFlags) { + symbol.flags |= symbolFlags; + node.symbol = symbol; + if (!symbol.declarations) { + symbol.declarations = []; } - JSDocParser.isJSDocType = isJSDocType; - function parseJSDocTypeExpressionForTests(content, start, length) { - initializeState("file.js", content, 2, undefined); - var jsDocTypeExpression = parseJSDocTypeExpression(start, length); - var diagnostics = parseDiagnostics; - clearState(); - return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined; + symbol.declarations.push(node); + if (symbolFlags & 1952 && !symbol.exports) { + symbol.exports = {}; } - JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests; - function parseJSDocTypeExpression(start, length) { - scanner.setText(sourceText, start, length); - token = nextToken(); - var result = createNode(249); - parseExpected(15); - result.type = parseJSDocTopLevelType(); - parseExpected(16); - fixupParentReferences(result); - return finishNode(result); + if (symbolFlags & 6240 && !symbol.members) { + symbol.members = {}; } - JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression; - function parseJSDocTopLevelType() { - var type = parseJSDocType(); - if (token === 47) { - var unionType = createNode(253, type.pos); - unionType.types = parseJSDocTypeList(type); - type = finishNode(unionType); - } - if (token === 56) { - var optionalType = createNode(260, type.pos); - nextToken(); - optionalType.type = type; - type = finishNode(optionalType); - } - return type; + if (symbolFlags & 107455 && !symbol.valueDeclaration) { + symbol.valueDeclaration = node; } - function parseJSDocType() { - var type = parseBasicTypeExpression(); - while (true) { - if (token === 19) { - var arrayType = createNode(252, type.pos); - arrayType.elementType = type; - nextToken(); - parseExpected(20); - type = finishNode(arrayType); - } - else if (token === 53) { - var nullableType = createNode(255, type.pos); - nullableType.type = type; - nextToken(); - type = finishNode(nullableType); - } - else if (token === 49) { - var nonNullableType = createNode(256, type.pos); - nonNullableType.type = type; - nextToken(); - type = finishNode(nonNullableType); - } - else { - break; - } + } + function getDeclarationName(node) { + if (node.name) { + if (node.kind === 218 && node.name.kind === 9) { + return "\"" + node.name.text + "\""; } - return type; - } - function parseBasicTypeExpression() { - switch (token) { - case 37: - return parseJSDocAllType(); - case 53: - return parseJSDocUnknownOrNullableType(); - case 17: - return parseJSDocUnionType(); - case 19: - return parseJSDocTupleType(); - case 49: - return parseJSDocNonNullableType(); - case 15: - return parseJSDocRecordType(); - case 87: - return parseJSDocFunctionType(); - case 22: - return parseJSDocVariadicType(); - case 92: - return parseJSDocConstructorType(); - case 97: - return parseJSDocThisType(); - case 117: - case 130: - case 128: - case 120: - case 131: - case 103: - return parseTokenNode(); + if (node.name.kind === 136) { + var nameExpression = node.name.expression; + if (ts.isStringOrNumericLiteral(nameExpression.kind)) { + return nameExpression.text; + } + ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression)); + return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text); } - return parseJSDocTypeReference(); - } - function parseJSDocThisType() { - var result = createNode(264); - nextToken(); - parseExpected(54); - result.type = parseJSDocType(); - return finishNode(result); - } - function parseJSDocConstructorType() { - var result = createNode(263); - nextToken(); - parseExpected(54); - result.type = parseJSDocType(); - return finishNode(result); + return node.name.text; } - function parseJSDocVariadicType() { - var result = createNode(262); - nextToken(); - result.type = parseJSDocType(); - return finishNode(result); + switch (node.kind) { + case 144: + return "__constructor"; + case 152: + case 147: + return "__call"; + case 153: + case 148: + return "__new"; + case 149: + return "__index"; + case 228: + return "__export"; + case 227: + return node.isExportEquals ? "export=" : "default"; + case 181: + return "export="; + case 213: + case 214: + return node.flags & 512 ? "default" : undefined; } - function parseJSDocFunctionType() { - var result = createNode(261); - nextToken(); - parseExpected(17); - result.parameters = parseDelimitedList(22, parseJSDocParameter); - checkForTrailingComma(result.parameters); - parseExpected(18); - if (token === 54) { - nextToken(); - result.type = parseJSDocType(); + } + function getDisplayName(node) { + return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node); + } + function declareSymbol(symbolTable, parent, node, includes, excludes) { + ts.Debug.assert(!ts.hasDynamicName(node)); + var isDefaultExport = node.flags & 512; + var name = isDefaultExport && parent ? "default" : getDeclarationName(node); + var symbol; + if (name !== undefined) { + symbol = ts.hasProperty(symbolTable, name) + ? symbolTable[name] + : (symbolTable[name] = createSymbol(0, name)); + if (name && (includes & 788448)) { + classifiableNames[name] = name; + } + if (symbol.flags & excludes) { + if (node.name) { + node.name.parent = node; + } + var message = symbol.flags & 2 + ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 + : ts.Diagnostics.Duplicate_identifier_0; + ts.forEach(symbol.declarations, function (declaration) { + if (declaration.flags & 512) { + message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports; + } + }); + ts.forEach(symbol.declarations, function (declaration) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); + }); + file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); + symbol = createSymbol(0, name); } - return finishNode(result); - } - function parseJSDocParameter() { - var parameter = createNode(138); - parameter.type = parseJSDocType(); - return finishNode(parameter); } - function parseJSDocOptionalType(type) { - var result = createNode(260, type.pos); - nextToken(); - result.type = type; - return finishNode(result); + else { + symbol = createSymbol(0, "__missing"); } - function parseJSDocTypeReference() { - var result = createNode(259); - result.name = parseSimplePropertyName(); - while (parseOptional(21)) { - if (token === 25) { - result.typeArguments = parseTypeArguments(); - break; - } - else { - result.name = parseQualifiedName(result.name); - } + addDeclarationToSymbol(symbol, node, includes); + symbol.parent = parent; + return symbol; + } + function declareModuleMember(node, symbolFlags, symbolExcludes) { + var hasExportModifier = ts.getCombinedNodeFlags(node) & 2; + if (symbolFlags & 8388608) { + if (node.kind === 230 || (node.kind === 221 && hasExportModifier)) { + return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); + } + else { + return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); } - return finishNode(result); } - function parseTypeArguments() { - nextToken(); - var typeArguments = parseDelimitedList(23, parseJSDocType); - checkForTrailingComma(typeArguments); - checkForEmptyTypeArgumentList(typeArguments); - parseExpected(27); - return typeArguments; + else { + if (hasExportModifier || container.flags & 131072) { + var exportKind = (symbolFlags & 107455 ? 1048576 : 0) | + (symbolFlags & 793056 ? 2097152 : 0) | + (symbolFlags & 1536 ? 4194304 : 0); + var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes); + local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); + node.localSymbol = local; + return local; + } + else { + return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); + } } - function checkForEmptyTypeArgumentList(typeArguments) { - if (parseDiagnostics.length === 0 && typeArguments && typeArguments.length === 0) { - var start = typeArguments.pos - "<".length; - var end = ts.skipTrivia(sourceText, typeArguments.end) + ">".length; - return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); + } + function bindChildren(node) { + var saveParent = parent; + var saveContainer = container; + var savedBlockScopeContainer = blockScopeContainer; + parent = node; + var containerFlags = getContainerFlags(node); + if (containerFlags & 1) { + container = blockScopeContainer = node; + if (containerFlags & 4) { + container.locals = {}; } + addToContainerChain(container); } - function parseQualifiedName(left) { - var result = createNode(135, left.pos); - result.left = left; - result.right = parseIdentifierName(); - return finishNode(result); + else if (containerFlags & 2) { + blockScopeContainer = node; + blockScopeContainer.locals = undefined; } - function parseJSDocRecordType() { - var result = createNode(257); - nextToken(); - result.members = parseDelimitedList(24, parseJSDocRecordMember); - checkForTrailingComma(result.members); - parseExpected(16); - return finishNode(result); + var savedReachabilityState; + var savedLabelStack; + var savedLabels; + var savedImplicitLabels; + var savedHasExplicitReturn; + var kind = node.kind; + var flags = node.flags; + flags &= ~1572864; + if (kind === 215) { + seenThisKeyword = false; } - function parseJSDocRecordMember() { - var result = createNode(258); - result.name = parseSimplePropertyName(); - if (token === 54) { - nextToken(); - result.type = parseJSDocType(); + var saveState = kind === 248 || kind === 219 || ts.isFunctionLikeKind(kind); + if (saveState) { + savedReachabilityState = currentReachabilityState; + savedLabelStack = labelStack; + savedLabels = labelIndexMap; + savedImplicitLabels = implicitLabels; + savedHasExplicitReturn = hasExplicitReturn; + currentReachabilityState = 2; + hasExplicitReturn = false; + labelStack = labelIndexMap = implicitLabels = undefined; + } + bindReachableStatement(node); + if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) { + flags |= 524288; + if (hasExplicitReturn) { + flags |= 1048576; } - return finishNode(result); } - function parseJSDocNonNullableType() { - var result = createNode(256); - nextToken(); - result.type = parseJSDocType(); - return finishNode(result); + if (kind === 215) { + flags = seenThisKeyword ? flags | 262144 : flags & ~262144; } - function parseJSDocTupleType() { - var result = createNode(254); - nextToken(); - result.types = parseDelimitedList(25, parseJSDocType); - checkForTrailingComma(result.types); - parseExpected(20); - return finishNode(result); + node.flags = flags; + if (saveState) { + hasExplicitReturn = savedHasExplicitReturn; + currentReachabilityState = savedReachabilityState; + labelStack = savedLabelStack; + labelIndexMap = savedLabels; + implicitLabels = savedImplicitLabels; } - function checkForTrailingComma(list) { - if (parseDiagnostics.length === 0 && list.hasTrailingComma) { - var start = list.end - ",".length; - parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); - } + container = saveContainer; + parent = saveParent; + blockScopeContainer = savedBlockScopeContainer; + } + function bindReachableStatement(node) { + if (checkUnreachable(node)) { + ts.forEachChild(node, bind); + return; } - function parseJSDocUnionType() { - var result = createNode(253); - nextToken(); - result.types = parseJSDocTypeList(parseJSDocType()); - parseExpected(18); - return finishNode(result); + switch (node.kind) { + case 198: + bindWhileStatement(node); + break; + case 197: + bindDoStatement(node); + break; + case 199: + bindForStatement(node); + break; + case 200: + case 201: + bindForInOrForOfStatement(node); + break; + case 196: + bindIfStatement(node); + break; + case 204: + case 208: + bindReturnOrThrow(node); + break; + case 203: + case 202: + bindBreakOrContinueStatement(node); + break; + case 209: + bindTryStatement(node); + break; + case 206: + bindSwitchStatement(node); + break; + case 220: + bindCaseBlock(node); + break; + case 207: + bindLabeledStatement(node); + break; + default: + ts.forEachChild(node, bind); + break; + } + } + function bindWhileStatement(n) { + var preWhileState = n.expression.kind === 84 ? 4 : currentReachabilityState; + var postWhileState = n.expression.kind === 99 ? 4 : currentReachabilityState; + bind(n.expression); + currentReachabilityState = preWhileState; + var postWhileLabel = pushImplicitLabel(); + bind(n.statement); + popImplicitLabel(postWhileLabel, postWhileState); + } + function bindDoStatement(n) { + var preDoState = currentReachabilityState; + var postDoLabel = pushImplicitLabel(); + bind(n.statement); + var postDoState = n.expression.kind === 99 ? 4 : preDoState; + popImplicitLabel(postDoLabel, postDoState); + bind(n.expression); + } + function bindForStatement(n) { + var preForState = currentReachabilityState; + var postForLabel = pushImplicitLabel(); + bind(n.initializer); + bind(n.condition); + bind(n.incrementor); + bind(n.statement); + var isInfiniteLoop = (!n.condition || n.condition.kind === 99); + var postForState = isInfiniteLoop ? 4 : preForState; + popImplicitLabel(postForLabel, postForState); + } + function bindForInOrForOfStatement(n) { + var preStatementState = currentReachabilityState; + var postStatementLabel = pushImplicitLabel(); + bind(n.initializer); + bind(n.expression); + bind(n.statement); + popImplicitLabel(postStatementLabel, preStatementState); + } + function bindIfStatement(n) { + var ifTrueState = n.expression.kind === 84 ? 4 : currentReachabilityState; + var ifFalseState = n.expression.kind === 99 ? 4 : currentReachabilityState; + currentReachabilityState = ifTrueState; + bind(n.expression); + bind(n.thenStatement); + if (n.elseStatement) { + var preElseState = currentReachabilityState; + currentReachabilityState = ifFalseState; + bind(n.elseStatement); + currentReachabilityState = or(currentReachabilityState, preElseState); } - function parseJSDocTypeList(firstType) { - ts.Debug.assert(!!firstType); - var types = []; - types.pos = firstType.pos; - types.push(firstType); - while (parseOptional(47)) { - types.push(parseJSDocType()); - } - types.end = scanner.getStartPos(); - return types; + else { + currentReachabilityState = or(currentReachabilityState, ifFalseState); } - function parseJSDocAllType() { - var result = createNode(250); - nextToken(); - return finishNode(result); + } + function bindReturnOrThrow(n) { + bind(n.expression); + if (n.kind === 204) { + hasExplicitReturn = true; } - function parseJSDocUnknownOrNullableType() { - var pos = scanner.getStartPos(); - nextToken(); - if (token === 24 || - token === 16 || - token === 18 || - token === 27 || - token === 56 || - token === 47) { - var result = createNode(251, pos); - return finishNode(result); - } - else { - var result = createNode(255, pos); - result.type = parseJSDocType(); - return finishNode(result); + currentReachabilityState = 4; + } + function bindBreakOrContinueStatement(n) { + bind(n.label); + var isValidJump = jumpToLabel(n.label, n.kind === 203 ? currentReachabilityState : 4); + if (isValidJump) { + currentReachabilityState = 4; + } + } + function bindTryStatement(n) { + var preTryState = currentReachabilityState; + bind(n.tryBlock); + var postTryState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.catchClause); + var postCatchState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.finallyBlock); + currentReachabilityState = or(postTryState, postCatchState); + } + function bindSwitchStatement(n) { + var preSwitchState = currentReachabilityState; + var postSwitchLabel = pushImplicitLabel(); + bind(n.expression); + bind(n.caseBlock); + var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242; }); + var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState; + popImplicitLabel(postSwitchLabel, postSwitchState); + } + function bindCaseBlock(n) { + var startState = currentReachabilityState; + for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { + var clause = _a[_i]; + currentReachabilityState = startState; + bind(clause); + if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) { + errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); } } - function parseIsolatedJSDocComment(content, start, length) { - initializeState("file.js", content, 2, undefined); - var jsDocComment = parseJSDocComment(undefined, start, length); - var diagnostics = parseDiagnostics; - clearState(); - return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; + } + function bindLabeledStatement(n) { + bind(n.label); + var ok = pushNamedLabel(n.label); + bind(n.statement); + if (ok) { + popNamedLabel(n.label, currentReachabilityState); } - JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; - function parseJSDocComment(parent, start, length) { - var comment = parseJSDocCommentWorker(start, length); - if (comment) { - fixupParentReferences(comment); - comment.parent = parent; - } - return comment; + } + function getContainerFlags(node) { + switch (node.kind) { + case 186: + case 214: + case 215: + case 217: + case 155: + case 165: + return 1; + case 147: + case 148: + case 149: + case 143: + case 142: + case 213: + case 144: + case 145: + case 146: + case 152: + case 153: + case 173: + case 174: + case 218: + case 248: + case 216: + return 5; + case 244: + case 199: + case 200: + case 201: + case 220: + return 2; + case 192: + return ts.isFunctionLike(node.parent) ? 0 : 2; } - JSDocParser.parseJSDocComment = parseJSDocComment; - function parseJSDocCommentWorker(start, length) { - var content = sourceText; - start = start || 0; - var end = length === undefined ? content.length : start + length; - length = end - start; - ts.Debug.assert(start >= 0); - ts.Debug.assert(start <= end); - ts.Debug.assert(end <= content.length); - var tags; - var pos; - if (length >= "/** */".length) { - if (content.charCodeAt(start) === 47 && - content.charCodeAt(start + 1) === 42 && - content.charCodeAt(start + 2) === 42 && - content.charCodeAt(start + 3) !== 42) { - var canParseTag = true; - var seenAsterisk = true; - for (pos = start + "/**".length; pos < end;) { - var ch = content.charCodeAt(pos); - pos++; - if (ch === 64 && canParseTag) { - parseTag(); - canParseTag = false; - continue; - } - if (ts.isLineBreak(ch)) { - canParseTag = true; - seenAsterisk = false; - continue; - } - if (ts.isWhiteSpace(ch)) { - continue; - } - if (ch === 42) { - if (seenAsterisk) { - canParseTag = false; - } - seenAsterisk = true; - continue; - } - canParseTag = false; - } - } - } - return createJSDocComment(); - function createJSDocComment() { - if (!tags) { - return undefined; - } - var result = createNode(265, start); - result.tags = tags; - return finishNode(result, end); - } - function skipWhitespace() { - while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { - pos++; - } - } - function parseTag() { - ts.Debug.assert(content.charCodeAt(pos - 1) === 64); - var atToken = createNode(55, pos - 1); - atToken.end = pos; - var tagName = scanIdentifier(); - if (!tagName) { - return; - } - var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); - addTag(tag); - } - function handleTag(atToken, tagName) { - if (tagName) { - switch (tagName.text) { - case "param": - return handleParamTag(atToken, tagName); - case "return": - case "returns": - return handleReturnTag(atToken, tagName); - case "template": - return handleTemplateTag(atToken, tagName); - case "type": - return handleTypeTag(atToken, tagName); - } - } - return undefined; - } - function handleUnknownTag(atToken, tagName) { - var result = createNode(266, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - return finishNode(result, pos); - } - function addTag(tag) { - if (tag) { - if (!tags) { - tags = []; - tags.pos = tag.pos; - } - tags.push(tag); - tags.end = tag.end; + return 0; + } + function addToContainerChain(next) { + if (lastContainer) { + lastContainer.nextContainer = next; + } + lastContainer = next; + } + function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { + declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); + } + function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { + switch (container.kind) { + case 218: + return declareModuleMember(node, symbolFlags, symbolExcludes); + case 248: + return declareSourceFileMember(node, symbolFlags, symbolExcludes); + case 186: + case 214: + return declareClassMember(node, symbolFlags, symbolExcludes); + case 217: + return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); + case 155: + case 165: + case 215: + return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + case 152: + case 153: + case 147: + case 148: + case 149: + case 143: + case 142: + case 144: + case 145: + case 146: + case 213: + case 173: + case 174: + case 216: + return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function declareClassMember(node, symbolFlags, symbolExcludes) { + return node.flags & 64 + ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) + : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + } + function declareSourceFileMember(node, symbolFlags, symbolExcludes) { + return ts.isExternalModule(file) + ? declareModuleMember(node, symbolFlags, symbolExcludes) + : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); + } + function hasExportDeclarations(node) { + var body = node.kind === 248 ? node : node.body; + if (body.kind === 248 || body.kind === 219) { + for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { + var stat = _a[_i]; + if (stat.kind === 228 || stat.kind === 227) { + return true; } } - function tryParseTypeExpression() { - skipWhitespace(); - if (content.charCodeAt(pos) !== 123) { - return undefined; - } - var typeExpression = parseJSDocTypeExpression(pos, end - pos); - pos = typeExpression.end; - return typeExpression; + } + return false; + } + function setExportContextFlag(node) { + if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { + node.flags |= 131072; + } + else { + node.flags &= ~131072; + } + } + function bindModuleDeclaration(node) { + setExportContextFlag(node); + if (node.name.kind === 9) { + declareSymbolAndAddToSymbolTable(node, 512, 106639); + } + else { + var state = getModuleInstanceState(node); + if (state === 0) { + declareSymbolAndAddToSymbolTable(node, 1024, 0); } - function handleParamTag(atToken, tagName) { - var typeExpression = tryParseTypeExpression(); - skipWhitespace(); - var name; - var isBracketed; - if (content.charCodeAt(pos) === 91) { - pos++; - skipWhitespace(); - name = scanIdentifier(); - isBracketed = true; - } - else { - name = scanIdentifier(); - } - if (!name) { - parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); - } - var preName, postName; - if (typeExpression) { - postName = name; + else { + declareSymbolAndAddToSymbolTable(node, 512, 106639); + if (node.symbol.flags & (16 | 32 | 256)) { + node.symbol.constEnumOnlyModule = false; } else { - preName = name; - } - if (!typeExpression) { - typeExpression = tryParseTypeExpression(); - } - var result = createNode(267, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.preParameterName = preName; - result.typeExpression = typeExpression; - result.postParameterName = postName; - result.isBracketed = isBracketed; - return finishNode(result, pos); - } - function handleReturnTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 268; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + var currentModuleIsConstEnumOnly = state === 2; + if (node.symbol.constEnumOnlyModule === undefined) { + node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; + } + else { + node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; + } } - var result = createNode(268, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); } - function handleTypeTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 269; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + } + function bindFunctionOrConstructorType(node) { + var symbol = createSymbol(131072, getDeclarationName(node)); + addDeclarationToSymbol(symbol, node, 131072); + var typeLiteralSymbol = createSymbol(2048, "__type"); + addDeclarationToSymbol(typeLiteralSymbol, node, 2048); + typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); + var _a; + } + function bindObjectLiteralExpression(node) { + if (inStrictMode) { + var seen = {}; + for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { + var prop = _a[_i]; + if (prop.name.kind !== 69) { + continue; } - var result = createNode(269, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); - } - function handleTemplateTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 270; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + var identifier = prop.name; + var currentKind = prop.kind === 245 || prop.kind === 246 || prop.kind === 143 + ? 1 + : 2; + var existingKind = seen[identifier.text]; + if (!existingKind) { + seen[identifier.text] = currentKind; + continue; } - var typeParameters = []; - typeParameters.pos = pos; - while (true) { - skipWhitespace(); - var startPos = pos; - var name_8 = scanIdentifier(); - if (!name_8) { - parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); - return undefined; - } - var typeParameter = createNode(137, name_8.pos); - typeParameter.name = name_8; - finishNode(typeParameter, pos); - typeParameters.push(typeParameter); - skipWhitespace(); - if (content.charCodeAt(pos) !== 44) { - break; - } - pos++; + if (currentKind === 1 && existingKind === 1) { + var span = ts.getErrorSpanForNode(file, identifier); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); } - typeParameters.end = pos; - var result = createNode(270, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeParameters = typeParameters; - return finishNode(result, pos); } - function scanIdentifier() { - var startPos = pos; - for (; pos < end; pos++) { - var ch = content.charCodeAt(pos); - if (pos === startPos && ts.isIdentifierStart(ch, 2)) { - continue; - } - else if (pos > startPos && ts.isIdentifierPart(ch, 2)) { - continue; - } + } + return bindAnonymousDeclaration(node, 4096, "__object"); + } + function bindAnonymousDeclaration(node, symbolFlags, name) { + var symbol = createSymbol(symbolFlags, name); + addDeclarationToSymbol(symbol, node, symbolFlags); + } + function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { + switch (blockScopeContainer.kind) { + case 218: + declareModuleMember(node, symbolFlags, symbolExcludes); + break; + case 248: + if (ts.isExternalModule(container)) { + declareModuleMember(node, symbolFlags, symbolExcludes); break; } - if (startPos === pos) { - return undefined; + default: + if (!blockScopeContainer.locals) { + blockScopeContainer.locals = {}; + addToContainerChain(blockScopeContainer); } - var result = createNode(69, startPos); - result.text = content.substring(startPos, pos); - return finishNode(result, pos); + declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function bindBlockScopedVariableDeclaration(node) { + bindBlockScopedDeclaration(node, 2, 107455); + } + function checkStrictModeIdentifier(node) { + if (inStrictMode && + node.originalKeywordKind >= 106 && + node.originalKeywordKind <= 114 && + !ts.isIdentifierName(node)) { + if (!file.parseDiagnostics.length) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); + } + } + } + function getStrictModeIdentifierMessage(node) { + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; + } + if (file.externalModuleIndicator) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; + } + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; + } + function checkStrictModeBinaryExpression(node) { + if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { + checkStrictModeEvalOrArguments(node, node.left); + } + } + function checkStrictModeCatchClause(node) { + if (inStrictMode && node.variableDeclaration) { + checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); + } + } + function checkStrictModeDeleteExpression(node) { + if (inStrictMode && node.expression.kind === 69) { + var span = ts.getErrorSpanForNode(file, node.expression); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); + } + } + function isEvalOrArgumentsIdentifier(node) { + return node.kind === 69 && + (node.text === "eval" || node.text === "arguments"); + } + function checkStrictModeEvalOrArguments(contextNode, name) { + if (name && name.kind === 69) { + var identifier = name; + if (isEvalOrArgumentsIdentifier(identifier)) { + var span = ts.getErrorSpanForNode(file, name); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); } } - JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; - })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); - })(Parser || (Parser = {})); - var IncrementalParser; - (function (IncrementalParser) { - function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { - aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2); - checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); - if (ts.textChangeRangeIsUnchanged(textChangeRange)) { - return sourceFile; + } + function getStrictModeEvalOrArgumentsMessage(node) { + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; } - if (sourceFile.statements.length === 0) { - return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true); + if (file.externalModuleIndicator) { + return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; } - var incrementalSourceFile = sourceFile; - ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); - incrementalSourceFile.hasBeenIncrementallyParsed = true; - var oldText = sourceFile.text; - var syntaxCursor = createSyntaxCursor(sourceFile); - var changeRange = extendToAffectedRange(sourceFile, textChangeRange); - checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); - ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); - ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); - ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); - var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; - updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); - var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true); - return result; + return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; } - IncrementalParser.updateSourceFile = updateSourceFile; - function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { - if (isArray) { - visitArray(element); + function checkStrictModeFunctionName(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.name); } - else { - visitNode(element); + } + function checkStrictModeNumericLiteral(node) { + if (inStrictMode && node.flags & 32768) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); } - return; - function visitNode(node) { - var text = ""; - if (aggressiveChecks && shouldCheckNode(node)) { - text = oldText.substring(node.pos, node.end); - } - if (node._children) { - node._children = undefined; - } - if (node.jsDocComment) { - node.jsDocComment = undefined; - } - node.pos += delta; - node.end += delta; - if (aggressiveChecks && shouldCheckNode(node)) { - ts.Debug.assert(text === newText.substring(node.pos, node.end)); + } + function checkStrictModePostfixUnaryExpression(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.operand); + } + } + function checkStrictModePrefixUnaryExpression(node) { + if (inStrictMode) { + if (node.operator === 41 || node.operator === 42) { + checkStrictModeEvalOrArguments(node, node.operand); } - forEachChild(node, visitNode, visitArray); - checkNodePositions(node, aggressiveChecks); } - function visitArray(array) { - array._children = undefined; - array.pos += delta; - array.end += delta; - for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { - var node = array_7[_i]; - visitNode(node); + } + function checkStrictModeWithStatement(node) { + if (inStrictMode) { + errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); + } + } + function errorOnFirstToken(node, message, arg0, arg1, arg2) { + var span = ts.getSpanOfTokenAtPosition(file, node.pos); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); + } + function getDestructuringParameterName(node) { + return "__" + ts.indexOf(node.parent.parameters, node); + } + function bind(node) { + if (!node) { + return; + } + node.parent = parent; + var savedInStrictMode = inStrictMode; + if (!savedInStrictMode) { + updateStrictMode(node); + } + bindWorker(node); + bindChildren(node); + inStrictMode = savedInStrictMode; + } + function updateStrictMode(node) { + switch (node.kind) { + case 248: + case 219: + updateStrictModeStatementList(node.statements); + return; + case 192: + if (ts.isFunctionLike(node.parent)) { + updateStrictModeStatementList(node.statements); + } + return; + case 214: + case 186: + inStrictMode = true; + return; + } + } + function updateStrictModeStatementList(statements) { + for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { + var statement = statements_1[_i]; + if (!ts.isPrologueDirective(statement)) { + return; + } + if (isUseStrictPrologueDirective(statement)) { + inStrictMode = true; + return; } } } - function shouldCheckNode(node) { + function isUseStrictPrologueDirective(node) { + var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); + return nodeText === "\"use strict\"" || nodeText === "'use strict'"; + } + function bindWorker(node) { switch (node.kind) { - case 9: - case 8: case 69: - return true; + return checkStrictModeIdentifier(node); + case 181: + if (ts.isInJavaScriptFile(node)) { + if (ts.isExportsPropertyAssignment(node)) { + bindExportsPropertyAssignment(node); + } + else if (ts.isModuleExportsAssignment(node)) { + bindModuleExportsAssignment(node); + } + } + return checkStrictModeBinaryExpression(node); + case 244: + return checkStrictModeCatchClause(node); + case 175: + return checkStrictModeDeleteExpression(node); + case 8: + return checkStrictModeNumericLiteral(node); + case 180: + return checkStrictModePostfixUnaryExpression(node); + case 179: + return checkStrictModePrefixUnaryExpression(node); + case 205: + return checkStrictModeWithStatement(node); + case 97: + seenThisKeyword = true; + return; + case 137: + return declareSymbolAndAddToSymbolTable(node, 262144, 530912); + case 138: + return bindParameter(node); + case 211: + case 163: + return bindVariableDeclarationOrBindingElement(node); + case 141: + case 140: + return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455); + case 245: + case 246: + return bindPropertyOrMethodOrAccessor(node, 4, 107455); + case 247: + return bindPropertyOrMethodOrAccessor(node, 8, 107455); + case 147: + case 148: + case 149: + return declareSymbolAndAddToSymbolTable(node, 131072, 0); + case 143: + case 142: + return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263); + case 213: + checkStrictModeFunctionName(node); + return declareSymbolAndAddToSymbolTable(node, 16, 106927); + case 144: + return declareSymbolAndAddToSymbolTable(node, 16384, 0); + case 145: + return bindPropertyOrMethodOrAccessor(node, 32768, 41919); + case 146: + return bindPropertyOrMethodOrAccessor(node, 65536, 74687); + case 152: + case 153: + return bindFunctionOrConstructorType(node); + case 155: + return bindAnonymousDeclaration(node, 2048, "__type"); + case 165: + return bindObjectLiteralExpression(node); + case 173: + case 174: + checkStrictModeFunctionName(node); + var bindingName = node.name ? node.name.text : "__function"; + return bindAnonymousDeclaration(node, 16, bindingName); + case 168: + if (ts.isInJavaScriptFile(node)) { + bindCallExpression(node); + } + break; + case 186: + case 214: + return bindClassLikeDeclaration(node); + case 215: + return bindBlockScopedDeclaration(node, 64, 792960); + case 216: + return bindBlockScopedDeclaration(node, 524288, 793056); + case 217: + return bindEnumDeclaration(node); + case 218: + return bindModuleDeclaration(node); + case 221: + case 224: + case 226: + case 230: + return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608); + case 223: + return bindImportClause(node); + case 228: + return bindExportDeclaration(node); + case 227: + return bindExportAssignment(node); + case 248: + return bindSourceFileIfExternalModule(); } - return false; } - function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { - ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); - ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); - ts.Debug.assert(element.pos <= element.end); - element.pos = Math.min(element.pos, changeRangeNewEnd); - if (element.end >= changeRangeOldEnd) { - element.end += delta; + function bindSourceFileIfExternalModule() { + setExportContextFlag(file); + if (ts.isExternalModule(file)) { + bindSourceFileAsExternalModule(); + } + } + function bindSourceFileAsExternalModule() { + bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\""); + } + function bindExportAssignment(node) { + var boundExpression = node.kind === 227 ? node.expression : node.right; + if (!container.symbol || !container.symbol.exports) { + bindAnonymousDeclaration(node, 8388608, getDeclarationName(node)); } - else { - element.end = Math.min(element.end, changeRangeNewEnd); + else if (boundExpression.kind === 69) { + declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608); } - ts.Debug.assert(element.pos <= element.end); - if (element.parent) { - ts.Debug.assert(element.pos >= element.parent.pos); - ts.Debug.assert(element.end <= element.parent.end); + else { + declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608); } } - function checkNodePositions(node, aggressiveChecks) { - if (aggressiveChecks) { - var pos = node.pos; - forEachChild(node, function (child) { - ts.Debug.assert(child.pos >= pos); - pos = child.end; - }); - ts.Debug.assert(pos <= node.end); + function bindExportDeclaration(node) { + if (!container.symbol || !container.symbol.exports) { + bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node)); + } + else if (!node.exportClause) { + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0); } } - function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { - visitNode(sourceFile); - return; - function visitNode(child) { - ts.Debug.assert(child.pos <= child.end); - if (child.pos > changeRangeOldEnd) { - moveElementEntirelyPastChangeRange(child, false, delta, oldText, newText, aggressiveChecks); - return; - } - var fullEnd = child.end; - if (fullEnd >= changeStart) { - child.intersectsChange = true; - child._children = undefined; - adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - forEachChild(child, visitNode, visitArray); - checkNodePositions(child, aggressiveChecks); - return; - } - ts.Debug.assert(fullEnd < changeStart); + function bindImportClause(node) { + if (node.name) { + declareSymbolAndAddToSymbolTable(node, 8388608, 8388608); } - function visitArray(array) { - ts.Debug.assert(array.pos <= array.end); - if (array.pos > changeRangeOldEnd) { - moveElementEntirelyPastChangeRange(array, true, delta, oldText, newText, aggressiveChecks); - return; - } - var fullEnd = array.end; - if (fullEnd >= changeStart) { - array.intersectsChange = true; - array._children = undefined; - adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { - var node = array_8[_i]; - visitNode(node); - } - return; - } - ts.Debug.assert(fullEnd < changeStart); + } + function setCommonJsModuleIndicator(node) { + if (!file.commonJsModuleIndicator) { + file.commonJsModuleIndicator = node; + bindSourceFileAsExternalModule(); } } - function extendToAffectedRange(sourceFile, changeRange) { - var maxLookahead = 1; - var start = changeRange.span.start; - for (var i = 0; start > 0 && i <= maxLookahead; i++) { - var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); - ts.Debug.assert(nearestNode.pos <= start); - var position = nearestNode.pos; - start = Math.max(0, position - 1); + function bindExportsPropertyAssignment(node) { + setCommonJsModuleIndicator(node); + declareSymbol(file.symbol.exports, file.symbol, node.left, 4 | 7340032, 0); + } + function bindModuleExportsAssignment(node) { + setCommonJsModuleIndicator(node); + bindExportAssignment(node); + } + function bindCallExpression(node) { + if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) { + setCommonJsModuleIndicator(node); } - var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); - var finalLength = changeRange.newLength + (changeRange.span.start - start); - return ts.createTextChangeRange(finalSpan, finalLength); } - function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { - var bestResult = sourceFile; - var lastNodeEntirelyBeforePosition; - forEachChild(sourceFile, visit); - if (lastNodeEntirelyBeforePosition) { - var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); - if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { - bestResult = lastChildOfLastEntireNodeBeforePosition; + function bindClassLikeDeclaration(node) { + if (node.kind === 214) { + bindBlockScopedDeclaration(node, 32, 899519); + } + else { + var bindingName = node.name ? node.name.text : "__class"; + bindAnonymousDeclaration(node, 32, bindingName); + if (node.name) { + classifiableNames[node.name.text] = node.name.text; } } - return bestResult; - function getLastChild(node) { - while (true) { - var lastChild = getLastChildWorker(node); - if (lastChild) { - node = lastChild; - } - else { - return node; - } + var symbol = node.symbol; + var prototypeSymbol = createSymbol(4 | 134217728, "prototype"); + if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { + if (node.name) { + node.name.parent = node; } + file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); } - function getLastChildWorker(node) { - var last = undefined; - forEachChild(node, function (child) { - if (ts.nodeIsPresent(child)) { - last = child; - } - }); - return last; + symbol.exports[prototypeSymbol.name] = prototypeSymbol; + prototypeSymbol.parent = symbol; + } + function bindEnumDeclaration(node) { + return ts.isConst(node) + ? bindBlockScopedDeclaration(node, 128, 899967) + : bindBlockScopedDeclaration(node, 256, 899327); + } + function bindVariableDeclarationOrBindingElement(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.name); } - function visit(child) { - if (ts.nodeIsMissing(child)) { - return; + if (!ts.isBindingPattern(node.name)) { + if (ts.isBlockOrCatchScoped(node)) { + bindBlockScopedVariableDeclaration(node); } - if (child.pos <= position) { - if (child.pos >= bestResult.pos) { - bestResult = child; - } - if (position < child.end) { - forEachChild(child, visit); - return true; - } - else { - ts.Debug.assert(child.end <= position); - lastNodeEntirelyBeforePosition = child; - } + else if (ts.isParameterDeclaration(node)) { + declareSymbolAndAddToSymbolTable(node, 1, 107455); } else { - ts.Debug.assert(child.pos > position); - return true; + declareSymbolAndAddToSymbolTable(node, 1, 107454); } } } - function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { - var oldText = sourceFile.text; - if (textChangeRange) { - ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); - if (aggressiveChecks || ts.Debug.shouldAssert(3)) { - var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); - var newTextPrefix = newText.substr(0, textChangeRange.span.start); - ts.Debug.assert(oldTextPrefix === newTextPrefix); - var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); - var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); - ts.Debug.assert(oldTextSuffix === newTextSuffix); - } + function bindParameter(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.name); + } + if (ts.isBindingPattern(node.name)) { + bindAnonymousDeclaration(node, 1, getDestructuringParameterName(node)); + } + else { + declareSymbolAndAddToSymbolTable(node, 1, 107455); + } + if (node.flags & 56 && + node.parent.kind === 144 && + ts.isClassLike(node.parent.parent)) { + var classDeclaration = node.parent.parent; + declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455); } } - function createSyntaxCursor(sourceFile) { - var currentArray = sourceFile.statements; - var currentArrayIndex = 0; - ts.Debug.assert(currentArrayIndex < currentArray.length); - var current = currentArray[currentArrayIndex]; - var lastQueriedPosition = -1; - return { - currentNode: function (position) { - if (position !== lastQueriedPosition) { - if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { - currentArrayIndex++; - current = currentArray[currentArrayIndex]; - } - if (!current || current.pos !== position) { - findHighestListElementThatStartsAtPosition(position); - } - } - lastQueriedPosition = position; - ts.Debug.assert(!current || current.pos === position); - return current; - } - }; - function findHighestListElementThatStartsAtPosition(position) { - currentArray = undefined; - currentArrayIndex = -1; - current = undefined; - forEachChild(sourceFile, visitNode, visitArray); - return; - function visitNode(node) { - if (position >= node.pos && position < node.end) { - forEachChild(node, visitNode, visitArray); - return true; - } - return false; + function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { + return ts.hasDynamicName(node) + ? bindAnonymousDeclaration(node, symbolFlags, "__computed") + : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); + } + function pushNamedLabel(name) { + initializeReachabilityStateIfNecessary(); + if (ts.hasProperty(labelIndexMap, name.text)) { + return false; + } + labelIndexMap[name.text] = labelStack.push(1) - 1; + return true; + } + function pushImplicitLabel() { + initializeReachabilityStateIfNecessary(); + var index = labelStack.push(1) - 1; + implicitLabels.push(index); + return index; + } + function popNamedLabel(label, outerState) { + var index = labelIndexMap[label.text]; + ts.Debug.assert(index !== undefined); + ts.Debug.assert(labelStack.length == index + 1); + labelIndexMap[label.text] = undefined; + setCurrentStateAtLabel(labelStack.pop(), outerState, label); + } + function popImplicitLabel(implicitLabelIndex, outerState) { + if (labelStack.length !== implicitLabelIndex + 1) { + ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); + } + var i = implicitLabels.pop(); + if (implicitLabelIndex !== i) { + ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); + } + setCurrentStateAtLabel(labelStack.pop(), outerState, undefined); + } + function setCurrentStateAtLabel(innerMergedState, outerState, label) { + if (innerMergedState === 1) { + if (label && !options.allowUnusedLabels) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); } - function visitArray(array) { - if (position >= array.pos && position < array.end) { - for (var i = 0, n = array.length; i < n; i++) { - var child = array[i]; - if (child) { - if (child.pos === position) { - currentArray = array; - currentArrayIndex = i; - current = child; - return true; - } - else { - if (child.pos < position && position < child.end) { - forEachChild(child, visitNode, visitArray); - return true; - } - } - } + currentReachabilityState = outerState; + } + else { + currentReachabilityState = or(innerMergedState, outerState); + } + } + function jumpToLabel(label, outerState) { + initializeReachabilityStateIfNecessary(); + var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); + if (index === undefined) { + return false; + } + var stateAtLabel = labelStack[index]; + labelStack[index] = stateAtLabel === 1 ? outerState : or(stateAtLabel, outerState); + return true; + } + function checkUnreachable(node) { + switch (currentReachabilityState) { + case 4: + var reportError = (ts.isStatement(node) && node.kind !== 194) || + node.kind === 214 || + (node.kind === 218 && shouldReportErrorOnModuleDeclaration(node)) || + (node.kind === 217 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); + if (reportError) { + currentReachabilityState = 8; + var reportUnreachableCode = !options.allowUnreachableCode && + !ts.isInAmbientContext(node) && + (node.kind !== 193 || + ts.getCombinedNodeFlags(node.declarationList) & 24576 || + ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); + if (reportUnreachableCode) { + errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); } } + case 8: + return true; + default: return false; - } + } + function shouldReportErrorOnModuleDeclaration(node) { + var instanceState = getModuleInstanceState(node); + return instanceState === 1 || (instanceState === 2 && options.preserveConstEnums); } } - })(IncrementalParser || (IncrementalParser = {})); + function initializeReachabilityStateIfNecessary() { + if (labelIndexMap) { + return; + } + currentReachabilityState = 2; + labelIndexMap = {}; + labelStack = []; + implicitLabels = []; + } + } })(ts || (ts = {})); var ts; (function (ts) { @@ -10853,7 +10987,7 @@ var ts; symbolToString: symbolToString, getAugmentedPropertiesOfType: getAugmentedPropertiesOfType, getRootSymbols: getRootSymbols, - getContextualType: getContextualType, + getContextualType: getApparentTypeOfContextualType, getFullyQualifiedName: getFullyQualifiedName, getResolvedSignature: getResolvedSignature, getConstantValue: getConstantValue, @@ -11109,7 +11243,7 @@ var ts; return ts.getAncestor(node, 248); } function isGlobalSourceFile(node) { - return node.kind === 248 && !ts.isExternalModule(node); + return node.kind === 248 && !ts.isExternalOrCommonJsModule(node); } function getSymbol(symbols, name, meaning) { if (meaning && ts.hasProperty(symbols, name)) { @@ -11195,23 +11329,24 @@ var ts; } switch (location.kind) { case 248: - if (!ts.isExternalModule(location)) + if (!ts.isExternalOrCommonJsModule(location)) break; case 218: var moduleExports = getSymbolOfNode(location).exports; if (location.kind === 248 || (location.kind === 218 && location.name.kind === 9)) { + if (result = moduleExports["default"]) { + var localSymbol = ts.getLocalSymbolForExportDefault(result); + if (localSymbol && (result.flags & meaning) && localSymbol.name === name) { + break loop; + } + result = undefined; + } if (ts.hasProperty(moduleExports, name) && moduleExports[name].flags === 8388608 && ts.getDeclarationOfKind(moduleExports[name], 230)) { break; } - result = moduleExports["default"]; - var localSymbol = ts.getLocalSymbolForExportDefault(result); - if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) { - break loop; - } - result = undefined; } if (result = getSymbol(moduleExports, name, meaning & 8914931)) { break loop; @@ -11569,6 +11704,9 @@ var ts; if (moduleName === undefined) { return; } + if (moduleName.indexOf("!") >= 0) { + moduleName = moduleName.substr(0, moduleName.indexOf("!")); + } var isRelative = ts.isExternalModuleNameRelative(moduleName); if (!isRelative) { var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512); @@ -11739,7 +11877,7 @@ var ts; } switch (location_1.kind) { case 248: - if (!ts.isExternalModule(location_1)) { + if (!ts.isExternalOrCommonJsModule(location_1)) { break; } case 218: @@ -11866,7 +12004,7 @@ var ts; } function hasExternalModuleSymbol(declaration) { return (declaration.kind === 218 && declaration.name.kind === 9) || - (declaration.kind === 248 && ts.isExternalModule(declaration)); + (declaration.kind === 248 && ts.isExternalOrCommonJsModule(declaration)); } function hasVisibleDeclarations(symbol) { var aliasesToMakeVisible; @@ -12064,7 +12202,7 @@ var ts; writeAnonymousType(type, flags); } else if (type.flags & 256) { - writer.writeStringLiteral(type.text); + writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\""); } else { writePunctuation(writer, 15); @@ -12428,7 +12566,7 @@ var ts; } } else if (node.kind === 248) { - return ts.isExternalModule(node) ? node : undefined; + return ts.isExternalOrCommonJsModule(node) ? node : undefined; } } ts.Debug.fail("getContainingModule cant reach here"); @@ -12633,6 +12771,23 @@ var ts; var symbol = getSymbolOfNode(node); return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node); } + function getTextOfPropertyName(name) { + switch (name.kind) { + case 69: + return name.text; + case 9: + case 8: + return name.text; + case 136: + if (ts.isStringOrNumericLiteral(name.expression.kind)) { + return name.expression.text; + } + } + return undefined; + } + function isComputedNonLiteralName(name) { + return name.kind === 136 && !ts.isStringOrNumericLiteral(name.expression.kind); + } function getTypeForBindingElement(declaration) { var pattern = declaration.parent; var parentType = getTypeForBindingElementParent(pattern.parent); @@ -12648,8 +12803,12 @@ var ts; var type; if (pattern.kind === 161) { var name_10 = declaration.propertyName || declaration.name; - type = getTypeOfPropertyOfType(parentType, name_10.text) || - isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1) || + if (isComputedNonLiteralName(name_10)) { + return anyType; + } + var text = getTextOfPropertyName(name_10); + type = getTypeOfPropertyOfType(parentType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) || getIndexTypeOfType(parentType, 0); if (!type) { error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10)); @@ -12727,10 +12886,16 @@ var ts; } function getTypeFromObjectBindingPattern(pattern, includePatternInType) { var members = {}; + var hasComputedProperties = false; ts.forEach(pattern.elements, function (e) { - var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0); var name = e.propertyName || e.name; - var symbol = createSymbol(flags, name.text); + if (isComputedNonLiteralName(name)) { + hasComputedProperties = true; + return; + } + var text = getTextOfPropertyName(name); + var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0); + var symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType); symbol.bindingElement = e; members[symbol.name] = symbol; @@ -12739,6 +12904,9 @@ var ts; if (includePatternInType) { result.pattern = pattern; } + if (hasComputedProperties) { + result.flags |= 67108864; + } return result; } function getTypeFromArrayBindingPattern(pattern, includePatternInType) { @@ -12789,6 +12957,12 @@ var ts; if (declaration.kind === 227) { return links.type = checkExpression(declaration.expression); } + if (declaration.kind === 181) { + return links.type = checkExpression(declaration.right); + } + if (declaration.kind === 166) { + return checkExpressionCached(declaration.parent.right); + } if (!pushTypeResolution(symbol, 0)) { return unknownType; } @@ -13038,17 +13212,19 @@ var ts; } function resolveBaseTypesOfClass(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; - var baseContructorType = getBaseConstructorTypeOfClass(type); - if (!(baseContructorType.flags & 80896)) { + var baseConstructorType = getBaseConstructorTypeOfClass(type); + if (!(baseConstructorType.flags & 80896)) { return; } var baseTypeNode = getBaseTypeNodeOfClass(type); var baseType; - if (baseContructorType.symbol && baseContructorType.symbol.flags & 32) { - baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol); + var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 && + areAllOuterTypeParametersApplied(originalBaseType)) { + baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol); } else { - var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments); + var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments); if (!constructors.length) { error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments); return; @@ -13073,6 +13249,15 @@ var ts; type.resolvedBaseTypes.push(baseType); } } + function areAllOuterTypeParametersApplied(type) { + var outerTypeParameters = type.outerTypeParameters; + if (outerTypeParameters) { + var last = outerTypeParameters.length - 1; + var typeArguments = type.typeArguments; + return outerTypeParameters[last].symbol !== typeArguments[last].symbol; + } + return true; + } function resolveBaseTypesOfInterface(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { @@ -13144,7 +13329,7 @@ var ts; type.typeArguments = type.typeParameters; type.thisType = createType(512 | 33554432); type.thisType.symbol = symbol; - type.thisType.constraint = getTypeWithThisArgument(type); + type.thisType.constraint = type; } } return links.declaredType; @@ -13619,14 +13804,19 @@ var ts; type = getApparentType(type); return type.flags & 49152 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type); } + function getApparentTypeOfTypeParameter(type) { + if (!type.resolvedApparentType) { + var constraintType = getConstraintOfTypeParameter(type); + while (constraintType && constraintType.flags & 512) { + constraintType = getConstraintOfTypeParameter(constraintType); + } + type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type); + } + return type.resolvedApparentType; + } function getApparentType(type) { if (type.flags & 512) { - do { - type = getConstraintOfTypeParameter(type); - } while (type && type.flags & 512); - if (!type) { - type = emptyObjectType; - } + type = getApparentTypeOfTypeParameter(type); } if (type.flags & 258) { type = globalStringType; @@ -13779,7 +13969,7 @@ var ts; if (node.initializer) { var signatureDeclaration = node.parent; var signature = getSignatureFromDeclaration(signatureDeclaration); - var parameterIndex = signatureDeclaration.parameters.indexOf(node); + var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node); ts.Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } @@ -13874,6 +14064,16 @@ var ts; } return result; } + function resolveExternalModuleTypeByLiteral(name) { + var moduleSym = resolveExternalModuleName(name, name); + if (moduleSym) { + var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym); + if (resolvedModuleSymbol) { + return getTypeOfSymbol(resolvedModuleSymbol); + } + } + return anyType; + } function getReturnTypeOfSignature(signature) { if (!signature.resolvedReturnType) { if (!pushTypeResolution(signature, 3)) { @@ -14335,11 +14535,12 @@ var ts; return links.resolvedType; } function getStringLiteralType(node) { - if (ts.hasProperty(stringLiteralTypes, node.text)) { - return stringLiteralTypes[node.text]; + var text = node.text; + if (ts.hasProperty(stringLiteralTypes, text)) { + return stringLiteralTypes[text]; } - var type = stringLiteralTypes[node.text] = createType(256); - type.text = ts.getTextOfNode(node); + var type = stringLiteralTypes[text] = createType(256); + type.text = text; return type; } function getTypeFromStringLiteral(node) { @@ -14808,7 +15009,7 @@ var ts; return false; } function hasExcessProperties(source, target, reportErrors) { - if (someConstituentTypeHasKind(target, 80896)) { + if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) { for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) { var prop = _a[_i]; if (!isKnownProperty(target, prop.name)) { @@ -14898,9 +15099,6 @@ var ts; return result; } function typeParameterIdenticalTo(source, target) { - if (source.symbol.name !== target.symbol.name) { - return 0; - } if (source.constraint === target.constraint) { return -1; } @@ -15345,18 +15543,24 @@ var ts; } return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp)); } + function isMatchingSignature(source, target, partialMatch) { + if (source.parameters.length === target.parameters.length && + source.minArgumentCount === target.minArgumentCount && + source.hasRestParameter === target.hasRestParameter) { + return true; + } + if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter || + source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) { + return true; + } + return false; + } function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) { if (source === target) { return -1; } - if (source.parameters.length !== target.parameters.length || - source.minArgumentCount !== target.minArgumentCount || - source.hasRestParameter !== target.hasRestParameter) { - if (!partialMatch || - source.parameters.length < target.parameters.length && !source.hasRestParameter || - source.minArgumentCount > target.minArgumentCount) { - return 0; - } + if (!(isMatchingSignature(source, target, partialMatch))) { + return 0; } var result = -1; if (source.typeParameters && target.typeParameters) { @@ -15441,6 +15645,9 @@ var ts; function isTupleLikeType(type) { return !!getPropertyOfType(type, "0"); } + function isStringLiteralType(type) { + return type.flags & 256; + } function isTupleType(type) { return !!(type.flags & 8192); } @@ -16032,7 +16239,7 @@ var ts; } } function narrowTypeByInstanceof(type, expr, assumeTrue) { - if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) { + if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) { return type; } var rightType = checkExpression(expr.right); @@ -16060,6 +16267,12 @@ var ts; } } if (targetType) { + if (!assumeTrue) { + if (type.flags & 16384) { + return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); })); + } + return type; + } return getNarrowedType(type, targetType); } return type; @@ -16471,6 +16684,9 @@ var ts; function getIndexTypeOfContextualType(type, kind) { return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }); } + function contextualTypeIsStringLiteralType(type) { + return !!(type.flags & 16384 ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type)); + } function contextualTypeIsTupleLikeType(type) { return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type)); } @@ -16486,7 +16702,7 @@ var ts; } function getContextualTypeForObjectLiteralElement(element) { var objectLiteral = element.parent; - var type = getContextualType(objectLiteral); + var type = getApparentTypeOfContextualType(objectLiteral); if (type) { if (!ts.hasDynamicName(element)) { var symbolName = getSymbolOfNode(element).name; @@ -16502,7 +16718,7 @@ var ts; } function getContextualTypeForElementExpression(node) { var arrayLiteral = node.parent; - var type = getContextualType(arrayLiteral); + var type = getApparentTypeOfContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); return getTypeOfPropertyOfContextualType(type, "" + index) @@ -16531,11 +16747,11 @@ var ts; } return undefined; } - function getContextualType(node) { - var type = getContextualTypeWorker(node); + function getApparentTypeOfContextualType(node) { + var type = getContextualType(node); return type && getApparentType(type); } - function getContextualTypeWorker(node) { + function getContextualType(node) { if (isInsideWithStatementBody(node)) { return undefined; } @@ -16601,7 +16817,7 @@ var ts; ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node)); var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) - : getContextualType(node); + : getApparentTypeOfContextualType(node); if (!type) { return undefined; } @@ -16684,7 +16900,7 @@ var ts; type.pattern = node; return type; } - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType && contextualTypeIsTupleLikeType(contextualType)) { var pattern = contextualType.pattern; if (pattern && (pattern.kind === 162 || pattern.kind === 164)) { @@ -16739,10 +16955,11 @@ var ts; checkGrammarObjectLiteralExpression(node, inDestructuringPattern); var propertiesTable = {}; var propertiesArray = []; - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); var contextualTypeHasPattern = contextualType && contextualType.pattern && (contextualType.pattern.kind === 161 || contextualType.pattern.kind === 165); var typeFlags = 0; + var patternWithComputedProperties = false; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var memberDecl = _a[_i]; var member = memberDecl.symbol; @@ -16768,8 +16985,11 @@ var ts; if (isOptional) { prop.flags |= 536870912; } + if (ts.hasDynamicName(memberDecl)) { + patternWithComputedProperties = true; + } } - else if (contextualTypeHasPattern) { + else if (contextualTypeHasPattern && !(contextualType.flags & 67108864)) { var impliedProp = getPropertyOfType(contextualType, member.name); if (impliedProp) { prop.flags |= impliedProp.flags & 536870912; @@ -16812,7 +17032,7 @@ var ts; var numberIndexType = getIndexType(1); var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576; - result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064); + result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0); if (inDestructuringPattern) { result.pattern = node; } @@ -18027,6 +18247,9 @@ var ts; return anyType; } } + if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) { + return resolveExternalModuleTypeByLiteral(node.arguments[0]); + } return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { @@ -18037,7 +18260,9 @@ var ts; var targetType = getTypeFromTypeNode(node.type); if (produceDiagnostics && targetType !== unknownType) { var widenedType = getWidenedType(exprType); - if (!(isTypeAssignableTo(targetType, widenedType))) { + var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) && + someConstituentTypeHasKind(widenedType, 258); + if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); } } @@ -18476,17 +18701,24 @@ var ts; var p = properties_3[_i]; if (p.kind === 245 || p.kind === 246) { var name_13 = p.name; + if (name_13.kind === 136) { + checkComputedPropertyName(name_13); + } + if (isComputedNonLiteralName(name_13)) { + continue; + } + var text = getTextOfPropertyName(name_13); var type = isTypeAny(sourceType) ? sourceType - : getTypeOfPropertyOfType(sourceType, name_13.text) || - isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1) || + : getTypeOfPropertyOfType(sourceType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) || getIndexTypeOfType(sourceType, 0); if (type) { if (p.kind === 246) { checkDestructuringAssignment(p, type); } else { - checkDestructuringAssignment(p.initializer || name_13, type); + checkDestructuringAssignment(p.initializer, type); } } else { @@ -18664,6 +18896,9 @@ var ts; case 31: case 32: case 33: + if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) { + return booleanType; + } if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) { reportOperatorError(); } @@ -18771,6 +19006,13 @@ var ts; var type2 = checkExpression(node.whenFalse, contextualMapper); return getUnionType([type1, type2]); } + function checkStringLiteralExpression(node) { + var contextualType = getContextualType(node); + if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { + return getStringLiteralType(node); + } + return stringType; + } function checkTemplateExpression(node) { ts.forEach(node.templateSpans, function (templateSpan) { checkExpression(templateSpan.expression); @@ -18809,7 +19051,7 @@ var ts; if (isInferentialContext(contextualMapper)) { var signature = getSingleCallSignature(type); if (signature && signature.typeParameters) { - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType) { var contextualSignature = getSingleCallSignature(contextualType); if (contextualSignature && !contextualSignature.typeParameters) { @@ -18861,6 +19103,7 @@ var ts; case 183: return checkTemplateExpression(node); case 9: + return checkStringLiteralExpression(node); case 11: return stringType; case 10: @@ -19922,7 +20165,7 @@ var ts; return; } var parent = getDeclarationContainer(node); - if (parent.kind === 248 && ts.isExternalModule(parent)) { + if (parent.kind === 248 && ts.isExternalOrCommonJsModule(parent)) { error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); } } @@ -19993,6 +20236,11 @@ var ts; checkExpressionCached(node.initializer); } } + if (node.kind === 163) { + if (node.propertyName && node.propertyName.kind === 136) { + checkComputedPropertyName(node.propertyName); + } + } if (ts.isBindingPattern(node.name)) { ts.forEach(node.name.elements, checkSourceElement); } @@ -20351,6 +20599,7 @@ var ts; var firstDefaultClause; var hasDuplicateDefaultClause = false; var expressionType = checkExpression(node.expression); + var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258); ts.forEach(node.caseBlock.clauses, function (clause) { if (clause.kind === 242 && !hasDuplicateDefaultClause) { if (firstDefaultClause === undefined) { @@ -20367,6 +20616,9 @@ var ts; if (produceDiagnostics && clause.kind === 241) { var caseClause = clause; var caseType = checkExpression(caseClause.expression); + if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) { + return; + } if (!isTypeAssignableTo(expressionType, caseType)) { checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined); } @@ -20774,11 +21026,14 @@ var ts; var enumIsConst = ts.isConst(node); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.name.kind === 136) { + if (isComputedNonLiteralName(member.name)) { error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums); } - else if (isNumericLiteralName(member.name.text)) { - error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + else { + var text = getTextOfPropertyName(member.name); + if (isNumericLiteralName(text)) { + error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + } } var previousEnumMemberIsNonConstant = autoValue === undefined; var initializer = member.initializer; @@ -21476,8 +21731,10 @@ var ts; function checkSourceFileWorker(node) { var links = getNodeLinks(node); if (!(links.flags & 1)) { - if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) { - return; + if (compilerOptions.skipDefaultLibCheck) { + if (node.hasNoDefaultLib) { + return; + } } checkGrammarSourceFile(node); emitExtends = false; @@ -21486,7 +21743,7 @@ var ts; potentialThisCollisions.length = 0; ts.forEach(node.statements, checkSourceElement); checkFunctionAndClassExpressionBodies(node); - if (ts.isExternalModule(node)) { + if (ts.isExternalOrCommonJsModule(node)) { checkExternalModuleExports(node); } if (potentialThisCollisions.length) { @@ -21564,7 +21821,7 @@ var ts; } switch (location.kind) { case 248: - if (!ts.isExternalModule(location)) { + if (!ts.isExternalOrCommonJsModule(location)) { break; } case 218: @@ -22123,15 +22380,24 @@ var ts; getReferencedValueDeclaration: getReferencedValueDeclaration, getTypeReferenceSerializationKind: getTypeReferenceSerializationKind, isOptionalParameter: isOptionalParameter, - isArgumentsLocalBinding: isArgumentsLocalBinding + isArgumentsLocalBinding: isArgumentsLocalBinding, + getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration }; } + function getExternalModuleFileFromDeclaration(declaration) { + var specifier = ts.getExternalModuleName(declaration); + var moduleSymbol = getSymbolAtLocation(specifier); + if (!moduleSymbol) { + return undefined; + } + return ts.getDeclarationOfKind(moduleSymbol, 248); + } function initializeTypeChecker() { ts.forEach(host.getSourceFiles(), function (file) { ts.bindSourceFile(file, compilerOptions); }); ts.forEach(host.getSourceFiles(), function (file) { - if (!ts.isExternalModule(file)) { + if (!ts.isExternalOrCommonJsModule(file)) { mergeSymbolTable(globals, file.locals); } }); @@ -22808,7 +23074,7 @@ var ts; } } function checkGrammarForNonSymbolComputedProperty(node, message) { - if (node.kind === 136 && !ts.isWellKnownSymbolSyntactically(node.expression)) { + if (ts.isDynamicName(node)) { return grammarErrorOnNode(node, message); } } @@ -23122,11 +23388,15 @@ var ts; var writeTextOfNode; var writer = createAndSetNewTextWriterWithSymbolWriter(); var enclosingDeclaration; - var currentSourceFile; + var currentText; + var currentLineMap; + var currentIdentifiers; + var isCurrentFileExternalModule; var reportedDeclarationError = false; var errorNameNode; var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments; var emit = compilerOptions.stripInternal ? stripInternal : emitNode; + var noDeclare = !root; var moduleElementDeclarationEmitInfo = []; var asynchronousSubModuleDeclarationEmitInfo; var referencePathsOutput = ""; @@ -23162,21 +23432,53 @@ var ts; } else { var emittedReferencedFiles = []; + var prevModuleElementDeclarationEmitInfo = []; ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + if (!ts.isDeclarationFile(sourceFile)) { if (!compilerOptions.noResolve) { ts.forEach(sourceFile.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference); - if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) && + if (referencedFile && (ts.isDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) { writeReferencePath(referencedFile); emittedReferencedFiles.push(referencedFile); } }); } + } + if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + noDeclare = false; emitSourceFile(sourceFile); } + else if (ts.isExternalModule(sourceFile)) { + noDeclare = true; + write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {"); + writeLine(); + increaseIndent(); + emitSourceFile(sourceFile); + decreaseIndent(); + write("}"); + writeLine(); + if (moduleElementDeclarationEmitInfo.length) { + var oldWriter = writer; + ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) { + if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { + ts.Debug.assert(aliasEmitInfo.node.kind === 222); + createAndSetNewTextWriterWithSymbolWriter(); + ts.Debug.assert(aliasEmitInfo.indent === 1); + increaseIndent(); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + decreaseIndent(); + } + }); + setWriter(oldWriter); + } + prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); + moduleElementDeclarationEmitInfo = []; + } }); + moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo); } return { reportedDeclarationError: reportedDeclarationError, @@ -23185,13 +23487,12 @@ var ts; referencePathsOutput: referencePathsOutput }; function hasInternalAnnotation(range) { - var text = currentSourceFile.text; - var comment = text.substring(range.pos, range.end); + var comment = currentText.substring(range.pos, range.end); return comment.indexOf("@internal") >= 0; } function stripInternal(node) { if (node) { - var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos); if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) { return; } @@ -23272,7 +23573,7 @@ var ts; var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); if (errorInfo) { if (errorInfo.typeName) { - diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); + diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); } else { diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); @@ -23336,9 +23637,9 @@ var ts; } function writeJsDocComments(declaration) { if (declaration) { - var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile); - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); - ts.emitComments(currentSourceFile, writer, jsDocComments, true, newLine, ts.writeCommentRange); + var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments); + ts.emitComments(currentText, currentLineMap, writer, jsDocComments, true, newLine, ts.writeCommentRange); } } function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) { @@ -23355,7 +23656,7 @@ var ts; case 103: case 97: case 9: - return writeTextOfNode(currentSourceFile, type); + return writeTextOfNode(currentText, type); case 188: return emitExpressionWithTypeArguments(type); case 151: @@ -23386,14 +23687,14 @@ var ts; } function writeEntityName(entityName) { if (entityName.kind === 69) { - writeTextOfNode(currentSourceFile, entityName); + writeTextOfNode(currentText, entityName); } else { var left = entityName.kind === 135 ? entityName.left : entityName.expression; var right = entityName.kind === 135 ? entityName.right : entityName.name; writeEntityName(left); write("."); - writeTextOfNode(currentSourceFile, right); + writeTextOfNode(currentText, right); } } function emitEntityName(entityName) { @@ -23421,7 +23722,7 @@ var ts; } } function emitTypePredicate(type) { - writeTextOfNode(currentSourceFile, type.parameterName); + writeTextOfNode(currentText, type.parameterName); write(" is "); emitType(type.type); } @@ -23461,20 +23762,23 @@ var ts; } } function emitSourceFile(node) { - currentSourceFile = node; + currentText = node.text; + currentLineMap = ts.getLineStarts(node); + currentIdentifiers = node.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(node); enclosingDeclaration = node; - ts.emitDetachedComments(currentSourceFile, writer, ts.writeCommentRange, node, newLine, true); + ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true); emitLines(node.statements); } function getExportDefaultTempVariableName() { var baseName = "_default"; - if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) { + if (!ts.hasProperty(currentIdentifiers, baseName)) { return baseName; } var count = 0; while (true) { var name_18 = baseName + "_" + (++count); - if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) { + if (!ts.hasProperty(currentIdentifiers, name_18)) { return name_18; } } @@ -23482,7 +23786,7 @@ var ts; function emitExportAssignment(node) { if (node.expression.kind === 69) { write(node.isExportEquals ? "export = " : "export default "); - writeTextOfNode(currentSourceFile, node.expression); + writeTextOfNode(currentText, node.expression); } else { var tempVarName = getExportDefaultTempVariableName(); @@ -23517,7 +23821,7 @@ var ts; writeModuleElement(node); } else if (node.kind === 221 || - (node.parent.kind === 248 && ts.isExternalModule(currentSourceFile))) { + (node.parent.kind === 248 && isCurrentFileExternalModule)) { var isVisible; if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248) { asynchronousSubModuleDeclarationEmitInfo.push({ @@ -23569,14 +23873,14 @@ var ts; } } function emitModuleElementDeclarationFlags(node) { - if (node.parent === currentSourceFile) { + if (node.parent.kind === 248) { if (node.flags & 2) { write("export "); } if (node.flags & 512) { write("default "); } - else if (node.kind !== 215) { + else if (node.kind !== 215 && !noDeclare) { write("declare "); } } @@ -23601,7 +23905,7 @@ var ts; write("export "); } write("import "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" = "); if (ts.isInternalModuleImportEqualsDeclaration(node)) { emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError); @@ -23609,7 +23913,7 @@ var ts; } else { write("require("); - writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node)); + writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node)); write(");"); } writer.writeLine(); @@ -23643,7 +23947,7 @@ var ts; if (node.importClause) { var currentWriterPos = writer.getTextPos(); if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) { - writeTextOfNode(currentSourceFile, node.importClause.name); + writeTextOfNode(currentText, node.importClause.name); } if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) { if (currentWriterPos !== writer.getTextPos()) { @@ -23651,7 +23955,7 @@ var ts; } if (node.importClause.namedBindings.kind === 224) { write("* as "); - writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name); + writeTextOfNode(currentText, node.importClause.namedBindings.name); } else { write("{ "); @@ -23661,16 +23965,28 @@ var ts; } write(" from "); } - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); write(";"); writer.writeLine(); } + function emitExternalModuleSpecifier(moduleSpecifier) { + if (moduleSpecifier.kind === 9 && (!root) && (compilerOptions.out || compilerOptions.outFile)) { + var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent); + if (moduleName) { + write("\""); + write(moduleName); + write("\""); + return; + } + } + writeTextOfNode(currentText, moduleSpecifier); + } function emitImportOrExportSpecifier(node) { if (node.propertyName) { - writeTextOfNode(currentSourceFile, node.propertyName); + writeTextOfNode(currentText, node.propertyName); write(" as "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } function emitExportSpecifier(node) { emitImportOrExportSpecifier(node); @@ -23690,7 +24006,7 @@ var ts; } if (node.moduleSpecifier) { write(" from "); - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); } write(";"); writer.writeLine(); @@ -23704,11 +24020,11 @@ var ts; else { write("module "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); while (node.body.kind !== 219) { node = node.body; write("."); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; @@ -23727,7 +24043,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("type "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); emitTypeParameters(node.typeParameters); write(" = "); emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError); @@ -23749,7 +24065,7 @@ var ts; write("const "); } write("enum "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" {"); writeLine(); increaseIndent(); @@ -23760,7 +24076,7 @@ var ts; } function emitEnumMemberDeclaration(node) { emitJsDocComments(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var enumMemberValue = resolver.getConstantValue(node); if (enumMemberValue !== undefined) { write(" = "); @@ -23777,7 +24093,7 @@ var ts; increaseIndent(); emitJsDocComments(node); decreaseIndent(); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (node.constraint && !isPrivateMethodTypeParameter(node)) { write(" extends "); if (node.parent.kind === 152 || @@ -23887,7 +24203,7 @@ var ts; write("abstract "); } write("class "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -23910,7 +24226,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("interface "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -23940,7 +24256,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if ((node.kind === 141 || node.kind === 140) && ts.hasQuestionToken(node)) { write("?"); } @@ -24014,7 +24330,7 @@ var ts; emitBindingPattern(bindingElement.name); } else { - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); writeTypeOfDeclaration(bindingElement, undefined, getBindingElementTypeVisibilityError); } } @@ -24055,7 +24371,7 @@ var ts; emitJsDocComments(accessors.getAccessor); emitJsDocComments(accessors.setAccessor); emitClassMemberDeclarationFlags(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (!(node.flags & 16)) { accessorWithTypeAnnotation = node; var type = getTypeAnnotationFromAccessor(node); @@ -24136,13 +24452,13 @@ var ts; } if (node.kind === 213) { write("function "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } else if (node.kind === 144) { write("constructor"); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (ts.hasQuestionToken(node)) { write("?"); } @@ -24255,7 +24571,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } if (resolver.isOptionalParameter(node)) { write("?"); @@ -24354,7 +24670,7 @@ var ts; } else if (bindingElement.kind === 163) { if (bindingElement.propertyName) { - writeTextOfNode(currentSourceFile, bindingElement.propertyName); + writeTextOfNode(currentText, bindingElement.propertyName); write(": "); } if (bindingElement.name) { @@ -24366,7 +24682,7 @@ var ts; if (bindingElement.dotDotDotToken) { write("..."); } - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); } } } @@ -24449,6 +24765,18 @@ var ts; return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile); } ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile; + function getResolvedExternalModuleName(host, file) { + return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName); + } + ts.getResolvedExternalModuleName = getResolvedExternalModuleName; + function getExternalModuleNameFromDeclaration(host, resolver, declaration) { + var file = resolver.getExternalModuleFileFromDeclaration(declaration); + if (!file || ts.isDeclarationFile(file)) { + return undefined; + } + return getResolvedExternalModuleName(host, file); + } + ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration; var entities = { "quot": 0x0022, "amp": 0x0026, @@ -24718,15 +25046,19 @@ var ts; var newLine = host.getNewLine(); var jsxDesugaring = host.getCompilerOptions().jsx !== 1; var shouldEmitJsx = function (s) { return (s.languageVariant === 1 && !jsxDesugaring); }; + var outFile = compilerOptions.outFile || compilerOptions.out; + var emitJavaScript = createFileEmitter(); if (targetSourceFile === undefined) { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { - var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, sourceFile); - } - }); - if (compilerOptions.outFile || compilerOptions.out) { - emitFile(compilerOptions.outFile || compilerOptions.out); + if (outFile) { + emitFile(outFile); + } + else { + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { + var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); + emitFile(jsFilePath, sourceFile); + } + }); } } else { @@ -24734,8 +25066,8 @@ var ts; var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); emitFile(jsFilePath, targetSourceFile); } - else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(compilerOptions.outFile || compilerOptions.out); + else if (!ts.isDeclarationFile(targetSourceFile) && outFile) { + emitFile(outFile); } } diagnostics = ts.sortAndDeduplicateDiagnostics(diagnostics); @@ -24785,20 +25117,26 @@ var ts; } } } - function emitJavaScript(jsFilePath, root) { + function createFileEmitter() { var writer = ts.createTextWriter(newLine); var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var currentText; + var currentLineMap; + var currentFileIdentifiers; + var renamedDependencies; + var isEs6Module; + var isCurrentFileExternalModule; var exportFunctionForFile; - var generatedNameSet = {}; - var nodeToGeneratedName = []; + var generatedNameSet; + var nodeToGeneratedName; var computedPropertyNamesToGeneratedNames; var convertedLoopState; - var extendsEmitted = false; - var decorateEmitted = false; - var paramEmitted = false; - var awaiterEmitted = false; - var tempFlags = 0; + var extendsEmitted; + var decorateEmitted; + var paramEmitted; + var awaiterEmitted; + var tempFlags; var tempVariables; var tempParameters; var externalImports; @@ -24815,6 +25153,7 @@ var ts; var scopeEmitStart = function (scopeDeclaration, scopeName) { }; var scopeEmitEnd = function () { }; var sourceMapData; + var root; var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker; var moduleEmitDelegates = (_a = {}, _a[5] = emitES6Module, @@ -24824,30 +25163,75 @@ var ts; _a[1] = emitCommonJSModule, _a ); - if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { - initializeEmitterWithSourceMaps(); - } - if (root) { - emitSourceFile(root); - } - else { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - emitSourceFile(sourceFile); + var bundleEmitDelegates = (_b = {}, + _b[5] = function () { }, + _b[2] = emitAMDModule, + _b[4] = emitSystemModule, + _b[3] = function () { }, + _b[1] = function () { }, + _b + ); + return doEmit; + function doEmit(jsFilePath, rootFile) { + writer.reset(); + currentSourceFile = undefined; + currentText = undefined; + currentLineMap = undefined; + exportFunctionForFile = undefined; + generatedNameSet = {}; + nodeToGeneratedName = []; + computedPropertyNamesToGeneratedNames = undefined; + convertedLoopState = undefined; + extendsEmitted = false; + decorateEmitted = false; + paramEmitted = false; + awaiterEmitted = false; + tempFlags = 0; + tempVariables = undefined; + tempParameters = undefined; + externalImports = undefined; + exportSpecifiers = undefined; + exportEquals = undefined; + hasExportStars = undefined; + detachedCommentsInfo = undefined; + sourceMapData = undefined; + isEs6Module = false; + renamedDependencies = undefined; + isCurrentFileExternalModule = false; + root = rootFile; + if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { + initializeEmitterWithSourceMaps(jsFilePath, root); + } + if (root) { + emitSourceFile(root); + } + else { + if (modulekind) { + ts.forEach(host.getSourceFiles(), emitEmitHelpers); } - }); + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) { + emitSourceFile(sourceFile); + } + }); + } + writeLine(); + writeEmittedFiles(writer.getText(), jsFilePath, compilerOptions.emitBOM); } - writeLine(); - writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); - return; function emitSourceFile(sourceFile) { currentSourceFile = sourceFile; + currentText = sourceFile.text; + currentLineMap = ts.getLineStarts(sourceFile); exportFunctionForFile = undefined; + isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"]; + renamedDependencies = sourceFile.renamedDependencies; + currentFileIdentifiers = sourceFile.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(sourceFile); emit(sourceFile); } function isUniqueName(name) { return !resolver.hasGlobalName(name) && - !ts.hasProperty(currentSourceFile.identifiers, name) && + !ts.hasProperty(currentFileIdentifiers, name) && !ts.hasProperty(generatedNameSet, name); } function makeTempVariableName(flags) { @@ -24920,7 +25304,7 @@ var ts; var id = ts.getNodeId(node); return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node))); } - function initializeEmitterWithSourceMaps() { + function initializeEmitterWithSourceMaps(jsFilePath, root) { var sourceMapDir; var sourceMapSourceIndex = -1; var sourceMapNameIndexMap = {}; @@ -24989,7 +25373,7 @@ var ts; } } function recordSourceMapSpan(pos) { - var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos); + var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos); sourceLinePos.line++; sourceLinePos.character++; var emittedLine = writer.getLine(); @@ -25017,13 +25401,13 @@ var ts; } } function recordEmitNodeStartSpan(node) { - recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos)); + recordSourceMapSpan(ts.skipTrivia(currentText, node.pos)); } function recordEmitNodeEndSpan(node) { recordSourceMapSpan(node.end); } function writeTextWithSpanRecord(tokenKind, startPos, emitFn) { - var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos); + var tokenStartPos = ts.skipTrivia(currentText, startPos); recordSourceMapSpan(tokenStartPos); var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn); recordSourceMapSpan(tokenEndPos); @@ -25093,9 +25477,9 @@ var ts; sourceMapNameIndices.pop(); } ; - function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) { + function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) { recordSourceMapSpan(comment.pos); - ts.writeCommentRange(currentSourceFile, writer, comment, newLine); + ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine); recordSourceMapSpan(comment.end); } function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) { @@ -25125,7 +25509,7 @@ var ts; return output; } } - function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) { encodeLastRecordedSourceMapSpan(); var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent); sourceMapDataList.push(sourceMapData); @@ -25138,7 +25522,7 @@ var ts; ts.writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, false); sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL; } - writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark); + writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark); } var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)); sourceMapData = { @@ -25201,7 +25585,7 @@ var ts; scopeEmitEnd = recordScopeNameEnd; writeComment = writeCommentRangeWithMap; } - function writeJavaScriptFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) { ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark); } function createTempVariable(flags) { @@ -25371,7 +25755,7 @@ var ts; return getQuotedEscapedLiteralText("\"", node.text, "\""); } if (node.parent) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + return ts.getTextOfNodeFromSourceText(currentText, node); } switch (node.kind) { case 9: @@ -25393,7 +25777,7 @@ var ts; return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; } function emitDownlevelRawTemplateLiteral(node) { - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var text = ts.getTextOfNodeFromSourceText(currentText, node); var isLast = node.kind === 11 || node.kind === 14; text = text.substring(1, text.length - (isLast ? 1 : 2)); text = text.replace(/\r\n?/g, "\n"); @@ -25723,7 +26107,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } write("\""); } @@ -25819,7 +26203,7 @@ var ts; else if (declaration.kind === 226) { write(getGeneratedNameForNode(declaration.parent.parent.parent)); var name_23 = declaration.propertyName || declaration.name; - var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23); + var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23); if (languageVersion === 0 && identifier === "default") { write("[\"default\"]"); } @@ -25843,7 +26227,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function isNameOfNestedRedeclaration(node) { @@ -25880,7 +26264,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function emitThis(node) { @@ -26247,8 +26631,8 @@ var ts; return container && container.kind !== 248; } function emitShorthandPropertyAssignment(node) { - writeTextOfNode(currentSourceFile, node.name); - if (languageVersion < 2 || isNamespaceExportReference(node.name)) { + writeTextOfNode(currentText, node.name); + if (modulekind !== 5 || isNamespaceExportReference(node.name)) { write(": "); emit(node.name); } @@ -26298,10 +26682,10 @@ var ts; } emit(node.expression); var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken); - var shouldEmitSpace; + var shouldEmitSpace = false; if (!indentedBeforeDot) { if (node.expression.kind === 8) { - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression); + var text = ts.getTextOfNodeFromSourceText(currentText, node.expression); shouldEmitSpace = text.indexOf(ts.tokenToString(21)) < 0; } else { @@ -27307,16 +27691,16 @@ var ts; emitToken(16, node.clauses.end); } function nodeStartPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function nodeEndPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, node2.end); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end); } function nodeEndIsOnSameLineAsNodeStart(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function emitCaseOrDefaultClause(node) { if (node.kind === 241) { @@ -27421,7 +27805,7 @@ var ts; if (node.parent.kind === 248) { ts.Debug.assert(!!(node.flags & 512) || node.kind === 227); if (modulekind === 1 || modulekind === 2 || modulekind === 3) { - if (!currentSourceFile.symbol.exports["___esModule"]) { + if (!isEs6Module) { if (languageVersion === 1) { write("Object.defineProperty(exports, \"__esModule\", { value: true });"); writeLine(); @@ -27584,12 +27968,18 @@ var ts; return node; } function createPropertyAccessForDestructuringProperty(object, propName) { - var syntheticName = ts.createSynthesizedNode(propName.kind); - syntheticName.text = propName.text; - if (syntheticName.kind !== 69) { - return createElementAccessExpression(object, syntheticName); + var index; + var nameIsComputed = propName.kind === 136; + if (nameIsComputed) { + index = ensureIdentifier(propName.expression, false); + } + else { + index = ts.createSynthesizedNode(propName.kind); + index.text = propName.text; } - return createPropertyAccessExpression(object, syntheticName); + return !nameIsComputed && index.kind === 69 + ? createPropertyAccessExpression(object, index) + : createElementAccessExpression(object, index); } function createSliceCall(value, sliceIndex) { var call = ts.createSynthesizedNode(168); @@ -28003,7 +28393,6 @@ var ts; var promiseConstructor = ts.getEntityNameFromTypeNode(node.type); var isArrowFunction = node.kind === 174; var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0; - var args; if (!isArrowFunction) { write(" {"); increaseIndent(); @@ -29177,8 +29566,8 @@ var ts; } } function tryRenameExternalModule(moduleName) { - if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) { - return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\""; + if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) { + return "\"" + renamedDependencies[moduleName.text] + "\""; } return undefined; } @@ -29318,7 +29707,7 @@ var ts; return; } if (resolver.isReferencedAliasDeclaration(node) || - (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { + (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); var variableDeclarationIsHoisted = shouldHoistVariable(node, true); @@ -29530,7 +29919,7 @@ var ts; function getLocalNameForExternalImport(node) { var namespaceDeclaration = getNamespaceDeclarationNode(node); if (namespaceDeclaration && !isDefaultImport(node)) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name); + return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name); } if (node.kind === 222 && node.importClause) { return getGeneratedNameForNode(node); @@ -29803,7 +30192,7 @@ var ts; ts.getEnclosingBlockScopeContainer(node).kind === 248; } function isCurrentFileSystemExternalModule() { - return modulekind === 4 && ts.isExternalModule(currentSourceFile); + return modulekind === 4 && isCurrentFileExternalModule; } function emitSystemModuleBody(node, dependencyGroups, startIndex) { emitVariableDeclarationsForImports(); @@ -29916,15 +30305,19 @@ var ts; writeLine(); write("}"); } - function emitSystemModule(node) { + function writeModuleName(node, emitRelativePathAsModuleName) { + var moduleName = node.moduleName; + if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) { + write("\"" + moduleName + "\", "); + } + } + function emitSystemModule(node, emitRelativePathAsModuleName) { collectExternalModuleInfo(node); ts.Debug.assert(!exportFunctionForFile); exportFunctionForFile = makeUniqueName("exports"); writeLine(); write("System.register("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } + writeModuleName(node, emitRelativePathAsModuleName); write("["); var groupIndices = {}; var dependencyGroups = []; @@ -29942,6 +30335,12 @@ var ts; if (i !== 0) { write(", "); } + if (emitRelativePathAsModuleName) { + var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]); + if (name_29) { + text = "\"" + name_29 + "\""; + } + } write(text); } write("], function(" + exportFunctionForFile + ") {"); @@ -29955,7 +30354,7 @@ var ts; writeLine(); write("});"); } - function getAMDDependencyNames(node, includeNonAmdDependencies) { + function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { var aliasedModuleNames = []; var unaliasedModuleNames = []; var importAliasNames = []; @@ -29972,6 +30371,12 @@ var ts; for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) { var importNode = externalImports_4[_c]; var externalModuleName = getExternalModuleNameText(importNode); + if (emitRelativePathAsModuleName) { + var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode); + if (name_30) { + externalModuleName = "\"" + name_30 + "\""; + } + } var importAliasName = getLocalNameForExternalImport(importNode); if (includeNonAmdDependencies && importAliasName) { aliasedModuleNames.push(externalModuleName); @@ -29983,8 +30388,8 @@ var ts; } return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames }; } - function emitAMDDependencies(node, includeNonAmdDependencies) { - var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies); + function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { + var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName); emitAMDDependencyList(dependencyNames); write(", "); emitAMDFactoryHeader(dependencyNames); @@ -30011,15 +30416,13 @@ var ts; } write(") {"); } - function emitAMDModule(node) { + function emitAMDModule(node, emitRelativePathAsModuleName) { emitEmitHelpers(node); collectExternalModuleInfo(node); writeLine(); write("define("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } - emitAMDDependencies(node, true); + writeModuleName(node, emitRelativePathAsModuleName); + emitAMDDependencies(node, true, emitRelativePathAsModuleName); increaseIndent(); var startIndex = emitDirectivePrologues(node.statements, true); emitExportStarHelper(); @@ -30225,8 +30628,13 @@ var ts; emitShebang(); emitDetachedCommentsAndUpdateCommentsInfo(node); if (ts.isExternalModule(node) || compilerOptions.isolatedModules) { - var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1]; - emitModule(node); + if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) { + var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1]; + emitModule(node); + } + else { + bundleEmitDelegates[modulekind](node, true); + } } else { var startIndex = emitDirectivePrologues(node.statements, false); @@ -30470,7 +30878,7 @@ var ts; return detachedCommentsInfo !== undefined && ts.lastOrUndefined(detachedCommentsInfo).nodePos === pos; } function getLeadingCommentsWithoutDetachedComments() { - var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); + var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); if (detachedCommentsInfo.length - 1) { detachedCommentsInfo.pop(); } @@ -30480,10 +30888,10 @@ var ts; return leadingComments; } function isTripleSlashComment(comment) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 && + if (currentText.charCodeAt(comment.pos + 1) === 47 && comment.pos + 2 < comment.end && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 47) { - var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end); + currentText.charCodeAt(comment.pos + 2) === 47) { + var textSubStr = currentText.substring(comment.pos, comment.end); return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) || textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ? true : false; @@ -30497,7 +30905,7 @@ var ts; return getLeadingCommentsWithoutDetachedComments(); } else { - return ts.getLeadingCommentRangesOfNode(node, currentSourceFile); + return ts.getLeadingCommentRangesOfNodeFromText(node, currentText); } } } @@ -30505,7 +30913,7 @@ var ts; function getTrailingCommentsToEmit(node) { if (node.parent) { if (node.parent.kind === 248 || node.end !== node.parent.end) { - return ts.getTrailingCommentRanges(currentSourceFile.text, node.end); + return ts.getTrailingCommentRanges(currentText, node.end); } } } @@ -30528,22 +30936,22 @@ var ts; leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment); } } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment); } function emitTrailingComments(node) { if (compilerOptions.removeComments) { return; } var trailingComments = getTrailingCommentsToEmit(node); - ts.emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, false, newLine, writeComment); } function emitTrailingCommentsOfPosition(pos) { if (compilerOptions.removeComments) { return; } - var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos); - ts.emitComments(currentSourceFile, writer, trailingComments, true, newLine, writeComment); + var trailingComments = ts.getTrailingCommentRanges(currentText, pos); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, true, newLine, writeComment); } function emitLeadingCommentsOfPositionWorker(pos) { if (compilerOptions.removeComments) { @@ -30554,13 +30962,13 @@ var ts; leadingComments = getLeadingCommentsWithoutDetachedComments(); } else { - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos); + leadingComments = ts.getLeadingCommentRanges(currentText, pos); } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments); - ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment); } function emitDetachedCommentsAndUpdateCommentsInfo(node) { - var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, compilerOptions.removeComments); + var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments); if (currentDetachedCommentInfo) { if (detachedCommentsInfo) { detachedCommentsInfo.push(currentDetachedCommentInfo); @@ -30571,12 +30979,12 @@ var ts; } } function emitShebang() { - var shebang = ts.getShebang(currentSourceFile.text); + var shebang = ts.getShebang(currentText); if (shebang) { write(shebang); } } - var _a; + var _a, _b; } function emitFile(jsFilePath, sourceFile) { emitJavaScript(jsFilePath, sourceFile); @@ -30632,11 +31040,11 @@ var ts; if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { var failedLookupLocations = []; var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName)); - var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host); return resolvedFileName ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations }; @@ -30646,8 +31054,8 @@ var ts; } } ts.nodeModuleNameResolver = nodeModuleNameResolver; - function loadNodeModuleFromFile(candidate, failedLookupLocation, host) { - return ts.forEach(ts.moduleFileExtensions, tryLoad); + function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) { + return ts.forEach(extensions, tryLoad); function tryLoad(ext) { var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (host.fileExists(fileName)) { @@ -30659,7 +31067,7 @@ var ts; } } } - function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) { + function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) { var packageJsonPath = ts.combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { var jsonContent; @@ -30671,7 +31079,7 @@ var ts; jsonContent = { typings: undefined }; } if (jsonContent.typings) { - var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); if (result) { return result; } @@ -30680,7 +31088,7 @@ var ts; else { failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host); + return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName, directory, host) { var failedLookupLocations = []; @@ -30690,11 +31098,11 @@ var ts; if (baseName !== "node_modules") { var nodeModulesFolder = ts.combinePaths(directory, "node_modules"); var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } - result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } @@ -30719,9 +31127,10 @@ var ts; var searchName; var failedLookupLocations = []; var referencedSourceFile; + var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions; while (true) { searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName)); - referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) { + referencedSourceFile = ts.forEach(extensions, function (extension) { if (extension === ".tsx" && !compilerOptions.jsx) { return undefined; } @@ -30749,10 +31158,8 @@ var ts; ts.classicNameResolver = classicNameResolver; ts.defaultInitCompilerOptions = { module: 1, - target: 0, + target: 1, noImplicitAny: false, - outDir: "built", - rootDir: ".", sourceMap: false }; function createCompilerHost(options, setParentNodes) { @@ -31110,35 +31517,47 @@ var ts; if (file.imports) { return; } + var isJavaScriptFile = ts.isSourceFileJavaScript(file); var imports; for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { var node = _a[_i]; - collect(node, true); + collect(node, true, false); } file.imports = imports || emptyArray; - function collect(node, allowRelativeModuleNames) { - switch (node.kind) { - case 222: - case 221: - case 228: - var moduleNameExpr = ts.getExternalModuleName(node); - if (!moduleNameExpr || moduleNameExpr.kind !== 9) { + return; + function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) { + if (!collectOnlyRequireCalls) { + switch (node.kind) { + case 222: + case 221: + case 228: + var moduleNameExpr = ts.getExternalModuleName(node); + if (!moduleNameExpr || moduleNameExpr.kind !== 9) { + break; + } + if (!moduleNameExpr.text) { + break; + } + if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { + (imports || (imports = [])).push(moduleNameExpr); + } break; - } - if (!moduleNameExpr.text) { + case 218: + if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) { + ts.forEachChild(node.body, function (node) { + collect(node, false, collectOnlyRequireCalls); + }); + } break; - } - if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { - (imports || (imports = [])).push(moduleNameExpr); - } - break; - case 218: - if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) { - ts.forEachChild(node.body, function (node) { - collect(node, false); - }); - } - break; + } + } + if (isJavaScriptFile) { + if (ts.isRequireCall(node)) { + (imports || (imports = [])).push(node.arguments[0]); + } + else { + ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, true); }); + } } } } @@ -31225,7 +31644,6 @@ var ts; } processImportedModules(file, basePath); if (isDefaultLib) { - file.isDefaultLib = true; files.unshift(file); } else { @@ -31298,6 +31716,9 @@ var ts; commonPathComponents.length = sourcePathComponents.length; } }); + if (!commonPathComponents) { + return currentDirectory; + } return ts.getNormalizedPathFromPathComponents(commonPathComponents); } function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) { @@ -31380,10 +31801,12 @@ var ts; if (options.module === 5 && languageVersion < 2) { programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower)); } + if (outFile && options.module && !(options.module === 2 || options.module === 4)) { + programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile")); + } if (options.outDir || options.sourceRoot || - (options.mapRoot && - (!outFile || firstExternalModuleSourceFile !== undefined))) { + options.mapRoot) { if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory); } @@ -31862,20 +32285,20 @@ var ts; var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined; var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); for (var i = 0; i < sysFiles.length; i++) { - var name_29 = sysFiles[i]; - if (ts.fileExtensionIs(name_29, ".d.ts")) { - var baseName = name_29.substr(0, name_29.length - ".d.ts".length); + var name_31 = sysFiles[i]; + if (ts.fileExtensionIs(name_31, ".d.ts")) { + var baseName = name_31.substr(0, name_31.length - ".d.ts".length); if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) { - fileNames.push(name_29); + fileNames.push(name_31); } } - else if (ts.fileExtensionIs(name_29, ".ts")) { - if (!ts.contains(sysFiles, name_29 + "x")) { - fileNames.push(name_29); + else if (ts.fileExtensionIs(name_31, ".ts")) { + if (!ts.contains(sysFiles, name_31 + "x")) { + fileNames.push(name_31); } } else { - fileNames.push(name_29); + fileNames.push(name_31); } } } @@ -31994,14 +32417,15 @@ var ts; var diagnostic = ts.createCompilerDiagnostic.apply(undefined, arguments); return diagnostic.messageText; } + function getRelativeFileName(fileName, host) { + return host ? ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) : fileName; + } function reportDiagnosticSimply(diagnostic, host) { var output = ""; if (diagnostic.file) { var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character; - var relativeFileName = host - ? ts.convertToRelativePath(diagnostic.file.fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) - : diagnostic.file.fileName; - output += diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): "; + var relativeFileName = getRelativeFileName(diagnostic.file.fileName, host); + output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): "; } var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase(); output += category + " TS" + diagnostic.code + ": " + ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine) + ts.sys.newLine; @@ -32030,6 +32454,7 @@ var ts; var _a = ts.getLineAndCharacterOfPosition(file, start), firstLine = _a.line, firstLineChar = _a.character; var _b = ts.getLineAndCharacterOfPosition(file, start + length_3), lastLine = _b.line, lastLineChar = _b.character; var lastLineInFile = ts.getLineAndCharacterOfPosition(file, file.text.length).line; + var relativeFileName = getRelativeFileName(file.fileName, host); var hasMoreThanFiveLines = (lastLine - firstLine) >= 4; var gutterWidth = (lastLine + 1 + "").length; if (hasMoreThanFiveLines) { @@ -32065,7 +32490,7 @@ var ts; output += ts.sys.newLine; } output += ts.sys.newLine; - output += file.fileName + "(" + (firstLine + 1) + "," + (firstLineChar + 1) + "): "; + output += relativeFileName + "(" + (firstLine + 1) + "," + (firstLineChar + 1) + "): "; } var categoryColor = categoryFormatMap[diagnostic.category]; var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase(); @@ -32191,8 +32616,19 @@ var ts; return; } } + if (!cachedConfigFileText) { + var error = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName); + reportDiagnostics([error], undefined); + ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped); + return; + } var result = ts.parseConfigFileTextToJson(configFileName, cachedConfigFileText); var configObject = result.config; + if (!configObject) { + reportDiagnostics([result.error], undefined); + ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped); + return; + } var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, ts.getDirectoryPath(configFileName)); if (configParseResult.errors.length > 0) { reportDiagnostics(configParseResult.errors, undefined); @@ -32455,10 +32891,10 @@ var ts; function serializeCompilerOptions(options) { var result = {}; var optionsNameMap = ts.getOptionNameMap().optionNameMap; - for (var name_30 in options) { - if (ts.hasProperty(options, name_30)) { - var value = options[name_30]; - switch (name_30) { + for (var name_32 in options) { + if (ts.hasProperty(options, name_32)) { + var value = options[name_32]; + switch (name_32) { case "init": case "watch": case "version": @@ -32466,17 +32902,17 @@ var ts; case "project": break; default: - var optionDefinition = optionsNameMap[name_30.toLowerCase()]; + var optionDefinition = optionsNameMap[name_32.toLowerCase()]; if (optionDefinition) { if (typeof optionDefinition.type === "string") { - result[name_30] = value; + result[name_32] = value; } else { var typeMap = optionDefinition.type; for (var key in typeMap) { if (ts.hasProperty(typeMap, key)) { if (typeMap[key] === value) - result[name_30] = key; + result[name_32] = key; } } } diff --git a/lib/tsserver.js b/lib/tsserver.js index 2893dab82ef3c..9f0c167408090 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -665,7 +665,7 @@ var ts; } ts.fileExtensionIs = fileExtensionIs; ts.supportedExtensions = [".ts", ".tsx", ".d.ts"]; - ts.moduleFileExtensions = ts.supportedExtensions; + ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx"); function isSupportedSourceFileName(fileName) { if (!fileName) { return false; @@ -716,17 +716,16 @@ var ts; } function Signature(checker) { } + function Node(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0; + this.parent = undefined; + } ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0; - this.parent = undefined; - } - Node.prototype = { kind: kind }; - return Node; - }, + getNodeConstructor: function () { return Node; }, + getSourceFileConstructor: function () { return Node; }, getSymbolConstructor: function () { return Symbol; }, getTypeConstructor: function () { return Type; }, getSignatureConstructor: function () { return Signature; } @@ -1003,7 +1002,16 @@ var ts; if (writeByteOrderMark) { data = "\uFEFF" + data; } - _fs.writeFileSync(fileName, data, "utf8"); + var fd; + try { + fd = _fs.openSync(fileName, "w"); + _fs.writeSync(fd, data, undefined, "utf8"); + } + finally { + if (fd !== undefined) { + _fs.closeSync(fd); + } + } } function getCanonicalPath(path) { return useCaseSensitiveFileNames ? path.toLowerCase() : path; @@ -1688,6 +1696,7 @@ var ts; Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." }, Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" }, Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." }, + Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." }, @@ -2148,7 +2157,7 @@ var ts; function getCommentRanges(text, pos, trailing) { var result; var collecting = trailing || pos === 0; - while (true) { + while (pos < text.length) { var ch = text.charCodeAt(pos); switch (ch) { case 13: @@ -2217,6 +2226,7 @@ var ts; } return result; } + return result; } function getLeadingCommentRanges(text, pos) { return getCommentRanges(text, pos, false); @@ -2312,7 +2322,7 @@ var ts; error(ts.Diagnostics.Digit_expected); } } - return +(text.substring(start, end)); + return "" + +(text.substring(start, end)); } function scanOctalDigits() { var start = pos; @@ -2704,7 +2714,7 @@ var ts; return pos++, token = 36; case 46: if (isDigit(text.charCodeAt(pos + 1))) { - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8; } if (text.charCodeAt(pos + 1) === 46 && text.charCodeAt(pos + 2) === 46) { @@ -2801,7 +2811,7 @@ var ts; case 55: case 56: case 57: - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8; case 58: return pos++, token = 54; @@ -3879,6 +3889,10 @@ var ts; return file.externalModuleIndicator !== undefined; } ts.isExternalModule = isExternalModule; + function isExternalOrCommonJsModule(file) { + return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined; + } + ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule; function isDeclarationFile(file) { return (file.flags & 4096) !== 0; } @@ -3925,18 +3939,26 @@ var ts; return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos); } ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; + function getLeadingCommentRangesOfNodeFromText(node, text) { + return ts.getLeadingCommentRanges(text, node.pos); + } + ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText; function getJsDocComments(node, sourceFileOfNode) { + return getJsDocCommentsFromText(node, sourceFileOfNode.text); + } + ts.getJsDocComments = getJsDocComments; + function getJsDocCommentsFromText(node, text) { var commentRanges = (node.kind === 138 || node.kind === 137) ? - ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) : - getLeadingCommentRangesOfNode(node, sourceFileOfNode); + ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) : + getLeadingCommentRangesOfNodeFromText(node, text); return ts.filter(commentRanges, isJsDocComment); function isJsDocComment(comment) { - return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 && - sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 && - sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47; + return text.charCodeAt(comment.pos + 1) === 42 && + text.charCodeAt(comment.pos + 2) === 42 && + text.charCodeAt(comment.pos + 3) !== 47; } } - ts.getJsDocComments = getJsDocComments; + ts.getJsDocCommentsFromText = getJsDocCommentsFromText; ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*/; ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; function isTypeNode(node) { @@ -4465,6 +4487,41 @@ var ts; return node.kind === 221 && node.moduleReference.kind !== 232; } ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; + function isSourceFileJavaScript(file) { + return isInJavaScriptFile(file); + } + ts.isSourceFileJavaScript = isSourceFileJavaScript; + function isInJavaScriptFile(node) { + return node && !!(node.parserContextFlags & 32); + } + ts.isInJavaScriptFile = isInJavaScriptFile; + function isRequireCall(expression) { + return expression.kind === 168 && + expression.expression.kind === 69 && + expression.expression.text === "require" && + expression.arguments.length === 1 && + expression.arguments[0].kind === 9; + } + ts.isRequireCall = isRequireCall; + function isExportsPropertyAssignment(expression) { + return isInJavaScriptFile(expression) && + (expression.kind === 181) && + (expression.operatorToken.kind === 56) && + (expression.left.kind === 166) && + (expression.left.expression.kind === 69) && + ((expression.left.expression).text === "exports"); + } + ts.isExportsPropertyAssignment = isExportsPropertyAssignment; + function isModuleExportsAssignment(expression) { + return isInJavaScriptFile(expression) && + (expression.kind === 181) && + (expression.operatorToken.kind === 56) && + (expression.left.kind === 166) && + (expression.left.expression.kind === 69) && + ((expression.left.expression).text === "module") && + (expression.left.name.text === "exports"); + } + ts.isModuleExportsAssignment = isModuleExportsAssignment; function getExternalModuleName(node) { if (node.kind === 222) { return node.moduleSpecifier; @@ -4776,8 +4833,8 @@ var ts; function getFileReferenceFromReferencePath(comment, commentRange) { var simpleReferenceRegEx = /^\/\/\/\s*/gim; - if (simpleReferenceRegEx.exec(comment)) { - if (isNoDefaultLibRegEx.exec(comment)) { + if (simpleReferenceRegEx.test(comment)) { + if (isNoDefaultLibRegEx.test(comment)) { return { isNoDefaultLib: true }; @@ -4819,12 +4876,20 @@ var ts; return isFunctionLike(node) && (node.flags & 256) !== 0 && !isAccessor(node); } ts.isAsyncFunctionLike = isAsyncFunctionLike; + function isStringOrNumericLiteral(kind) { + return kind === 9 || kind === 8; + } + ts.isStringOrNumericLiteral = isStringOrNumericLiteral; function hasDynamicName(declaration) { - return declaration.name && - declaration.name.kind === 136 && - !isWellKnownSymbolSyntactically(declaration.name.expression); + return declaration.name && isDynamicName(declaration.name); } ts.hasDynamicName = hasDynamicName; + function isDynamicName(name) { + return name.kind === 136 && + !isStringOrNumericLiteral(name.expression.kind) && + !isWellKnownSymbolSyntactically(name.expression); + } + ts.isDynamicName = isDynamicName; function isWellKnownSymbolSyntactically(node) { return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression); } @@ -5045,11 +5110,11 @@ var ts; } ts.getIndentSize = getIndentSize; function createTextWriter(newLine) { - var output = ""; - var indent = 0; - var lineStart = true; - var lineCount = 0; - var linePos = 0; + var output; + var indent; + var lineStart; + var lineCount; + var linePos; function write(s) { if (s && s.length) { if (lineStart) { @@ -5059,6 +5124,13 @@ var ts; output += s; } } + function reset() { + output = ""; + indent = 0; + lineStart = true; + lineCount = 0; + linePos = 0; + } function rawWrite(s) { if (s !== undefined) { if (lineStart) { @@ -5085,9 +5157,10 @@ var ts; lineStart = true; } } - function writeTextOfNode(sourceFile, node) { - write(getSourceTextOfNodeFromSourceFile(sourceFile, node)); + function writeTextOfNode(text, node) { + write(getTextOfNodeFromSourceText(text, node)); } + reset(); return { write: write, rawWrite: rawWrite, @@ -5100,10 +5173,17 @@ var ts; getTextPos: function () { return output.length; }, getLine: function () { return lineCount + 1; }, getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; }, - getText: function () { return output; } + getText: function () { return output; }, + reset: reset }; } ts.createTextWriter = createTextWriter; + function getExternalModuleNameFromPath(host, fileName) { + var dir = host.getCurrentDirectory(); + var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, false); + return ts.removeFileExtension(relativePath); + } + ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath; function getOwnEmitOutputFilePath(sourceFile, host, extension) { var compilerOptions = host.getCompilerOptions(); var emitOutputFilePathWithoutExtension; @@ -5132,6 +5212,10 @@ var ts; return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line; } ts.getLineOfLocalPosition = getLineOfLocalPosition; + function getLineOfLocalPositionFromLineMap(lineMap, pos) { + return ts.computeLineAndCharacterOfPosition(lineMap, pos).line; + } + ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap; function getFirstConstructorWithBody(node) { return ts.forEach(node.members, function (member) { if (member.kind === 144 && nodeIsPresent(member.body)) { @@ -5202,21 +5286,21 @@ var ts; }; } ts.getAllAccessorDeclarations = getAllAccessorDeclarations; - function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) { + function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) { if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && - getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) { + getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) { writer.writeLine(); } } ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments; - function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) { + function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) { var emitLeadingSpace = !trailingSeparator; ts.forEach(comments, function (comment) { if (emitLeadingSpace) { writer.write(" "); emitLeadingSpace = false; } - writeComment(currentSourceFile, writer, comment, newLine); + writeComment(text, lineMap, writer, comment, newLine); if (comment.hasTrailingNewLine) { writer.writeLine(); } @@ -5229,16 +5313,16 @@ var ts; }); } ts.emitComments = emitComments; - function emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, removeComments) { + function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) { var leadingComments; var currentDetachedCommentInfo; if (removeComments) { if (node.pos === 0) { - leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComment); + leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment); } } else { - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + leadingComments = ts.getLeadingCommentRanges(text, node.pos); } if (leadingComments) { var detachedComments = []; @@ -5246,8 +5330,8 @@ var ts; for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) { var comment = leadingComments_1[_i]; if (lastComment) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end); - var commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end); + var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos); if (commentLine >= lastCommentLine + 2) { break; } @@ -5256,37 +5340,37 @@ var ts; lastComment = comment; } if (detachedComments.length) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end); - var nodeLine = getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end); + var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos)); if (nodeLine >= lastCommentLine + 2) { - emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment); + emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments); + emitComments(text, lineMap, writer, detachedComments, true, newLine, writeComment); currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end }; } } } return currentDetachedCommentInfo; function isPinnedComment(comment) { - return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 33; + return text.charCodeAt(comment.pos + 1) === 42 && + text.charCodeAt(comment.pos + 2) === 33; } } ts.emitDetachedComments = emitDetachedComments; - function writeCommentRange(currentSourceFile, writer, comment, newLine) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) { - var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos); - var lineCount = ts.getLineStarts(currentSourceFile).length; + function writeCommentRange(text, lineMap, writer, comment, newLine) { + if (text.charCodeAt(comment.pos + 1) === 42) { + var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos); + var lineCount = lineMap.length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { var nextLineStart = (currentLine + 1) === lineCount - ? currentSourceFile.text.length + 1 - : getStartPositionOfLine(currentLine + 1, currentSourceFile); + ? text.length + 1 + : lineMap[currentLine + 1]; if (pos !== comment.pos) { if (firstCommentLineIndent === undefined) { - firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); + firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos); } var currentWriterIndentSpacing = writer.getIndent() * getIndentSize(); - var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart); + var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart); if (spacesToEmit > 0) { var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize(); var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize()); @@ -5300,40 +5384,40 @@ var ts; writer.rawWrite(""); } } - writeTrimmedCurrentLine(pos, nextLineStart); + writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart); pos = nextLineStart; } } else { - writer.write(currentSourceFile.text.substring(comment.pos, comment.end)); - } - function writeTrimmedCurrentLine(pos, nextLineStart) { - var end = Math.min(comment.end, nextLineStart - 1); - var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, ""); - if (currentLineText) { - writer.write(currentLineText); - if (end !== comment.end) { - writer.writeLine(); - } - } - else { - writer.writeLiteral(newLine); + writer.write(text.substring(comment.pos, comment.end)); + } + } + ts.writeCommentRange = writeCommentRange; + function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) { + var end = Math.min(comment.end, nextLineStart - 1); + var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, ""); + if (currentLineText) { + writer.write(currentLineText); + if (end !== comment.end) { + writer.writeLine(); } } - function calculateIndent(pos, end) { - var currentLineIndent = 0; - for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) { - if (currentSourceFile.text.charCodeAt(pos) === 9) { - currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); - } - else { - currentLineIndent++; - } + else { + writer.writeLiteral(newLine); + } + } + function calculateIndent(text, pos, end) { + var currentLineIndent = 0; + for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) { + if (text.charCodeAt(pos) === 9) { + currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); + } + else { + currentLineIndent++; } - return currentLineIndent; } + return currentLineIndent; } - ts.writeCommentRange = writeCommentRange; function modifierToFlag(token) { switch (token) { case 113: return 64; @@ -5427,14 +5511,14 @@ var ts; return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512) ? symbol.valueDeclaration.localSymbol : undefined; } ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; - function isJavaScript(fileName) { - return ts.fileExtensionIs(fileName, ".js"); + function hasJavaScriptFileExtension(fileName) { + return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isJavaScript = isJavaScript; - function isTsx(fileName) { - return ts.fileExtensionIs(fileName, ".tsx"); + ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension; + function allowsJsxExpressions(fileName) { + return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isTsx = isTsx; + ts.allowsJsxExpressions = allowsJsxExpressions; function getExpandedCharCodes(input) { var output = []; var length = input.length; @@ -5644,14 +5728,16 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - var nodeConstructors = new Array(272); ts.parseTime = 0; - function getNodeConstructor(kind) { - return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)); - } - ts.getNodeConstructor = getNodeConstructor; + var NodeConstructor; + var SourceFileConstructor; function createNode(kind, pos, end) { - return new (getNodeConstructor(kind))(pos, end); + if (kind === 248) { + return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end); + } + else { + return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end); + } } ts.createNode = createNode; function visitNode(cbNode, node) { @@ -6050,6 +6136,8 @@ var ts; (function (Parser) { var scanner = ts.createScanner(2, true); var disallowInAndDecoratorContext = 1 | 4; + var NodeConstructor; + var SourceFileConstructor; var sourceFile; var parseDiagnostics; var syntaxCursor; @@ -6062,13 +6150,16 @@ var ts; var contextFlags; var parseErrorBeforeNextFinishedNode = false; function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) { - initializeState(fileName, _sourceText, languageVersion, _syntaxCursor); + var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0; + initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor); var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes); clearState(); return result; } Parser.parseSourceFile = parseSourceFile; - function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) { + function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) { + NodeConstructor = ts.objectAllocator.getNodeConstructor(); + SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor(); sourceText = _sourceText; syntaxCursor = _syntaxCursor; parseDiagnostics = []; @@ -6076,12 +6167,12 @@ var ts; identifiers = {}; identifierCount = 0; nodeCount = 0; - contextFlags = ts.isJavaScript(fileName) ? 32 : 0; + contextFlags = isJavaScriptFile ? 32 : 0; parseErrorBeforeNextFinishedNode = false; scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 : 0); + scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 : 0); } function clearState() { scanner.setText(""); @@ -6094,6 +6185,9 @@ var ts; } function parseSourceFileWorker(fileName, languageVersion, setParentNodes) { sourceFile = createSourceFile(fileName, languageVersion); + if (contextFlags & 32) { + sourceFile.parserContextFlags = 32; + } token = nextToken(); processReferenceComments(sourceFile); sourceFile.statements = parseList(0, parseStatement); @@ -6107,7 +6201,7 @@ var ts; if (setParentNodes) { fixupParentReferences(sourceFile); } - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { addJSDocComments(); } return sourceFile; @@ -6153,15 +6247,14 @@ var ts; } Parser.fixupParentReferences = fixupParentReferences; function createSourceFile(fileName, languageVersion) { - var sourceFile = createNode(248, 0); - sourceFile.pos = 0; - sourceFile.end = sourceText.length; + var sourceFile = new SourceFileConstructor(248, 0, sourceText.length); + nodeCount++; sourceFile.text = sourceText; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0; - sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 : 0; + sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 : 0; return sourceFile; } function setContextFlag(val, flag) { @@ -6383,7 +6476,7 @@ var ts; if (!(pos >= 0)) { pos = scanner.getStartPos(); } - return new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))(pos, pos); + return new NodeConstructor(kind, pos, pos); } function finishNode(node, end) { node.end = end === undefined ? scanner.getStartPos() : end; @@ -6521,7 +6614,7 @@ var ts; case 12: return token === 19 || token === 37 || isLiteralPropertyName(); case 9: - return isLiteralPropertyName(); + return token === 19 || isLiteralPropertyName(); case 7: if (token === 15) { return lookAhead(isValidHeritageClauseObjectLiteral); @@ -7042,9 +7135,7 @@ var ts; } function parseParameterType() { if (parseOptional(54)) { - return token === 9 - ? parseLiteralNode(true) - : parseType(); + return parseType(); } return undefined; } @@ -7301,6 +7392,8 @@ var ts; case 131: var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); + case 9: + return parseLiteralNode(true); case 103: case 97: return parseTokenNode(); @@ -7330,6 +7423,7 @@ var ts; case 19: case 25: case 92: + case 9: return true; case 17: return lookAhead(isStartOfParenthesizedOrFunctionType); @@ -7843,7 +7937,6 @@ var ts; var unaryOperator = token; var simpleUnaryExpression = parseSimpleUnaryExpression(); if (token === 38) { - var diagnostic; var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); if (simpleUnaryExpression.kind === 171) { parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); @@ -9507,7 +9600,7 @@ var ts; } JSDocParser.isJSDocType = isJSDocType; function parseJSDocTypeExpressionForTests(content, start, length) { - initializeState("file.js", content, 2, undefined); + initializeState("file.js", content, 2, true, undefined); var jsDocTypeExpression = parseJSDocTypeExpression(start, length); var diagnostics = parseDiagnostics; clearState(); @@ -9758,7 +9851,7 @@ var ts; } } function parseIsolatedJSDocComment(content, start, length) { - initializeState("file.js", content, 2, undefined); + initializeState("file.js", content, 2, true, undefined); var jsDocComment = parseJSDocComment(undefined, start, length); var diagnostics = parseDiagnostics; clearState(); @@ -10394,6 +10487,9 @@ var ts; } if (node.name.kind === 136) { var nameExpression = node.name.expression; + if (ts.isStringOrNumericLiteral(nameExpression.kind)) { + return nameExpression.text; + } ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression)); return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text); } @@ -10414,6 +10510,8 @@ var ts; return "__export"; case 227: return node.isExportEquals ? "export=" : "default"; + case 181: + return "export="; case 213: case 214: return node.flags & 512 ? "default" : undefined; @@ -11033,6 +11131,14 @@ var ts; case 69: return checkStrictModeIdentifier(node); case 181: + if (ts.isInJavaScriptFile(node)) { + if (ts.isExportsPropertyAssignment(node)) { + bindExportsPropertyAssignment(node); + } + else if (ts.isModuleExportsAssignment(node)) { + bindModuleExportsAssignment(node); + } + } return checkStrictModeBinaryExpression(node); case 244: return checkStrictModeCatchClause(node); @@ -11092,6 +11198,11 @@ var ts; checkStrictModeFunctionName(node); var bindingName = node.name ? node.name.text : "__function"; return bindAnonymousDeclaration(node, 16, bindingName); + case 168: + if (ts.isInJavaScriptFile(node)) { + bindCallExpression(node); + } + break; case 186: case 214: return bindClassLikeDeclaration(node); @@ -11121,14 +11232,18 @@ var ts; function bindSourceFileIfExternalModule() { setExportContextFlag(file); if (ts.isExternalModule(file)) { - bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\""); + bindSourceFileAsExternalModule(); } } + function bindSourceFileAsExternalModule() { + bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\""); + } function bindExportAssignment(node) { + var boundExpression = node.kind === 227 ? node.expression : node.right; if (!container.symbol || !container.symbol.exports) { bindAnonymousDeclaration(node, 8388608, getDeclarationName(node)); } - else if (node.expression.kind === 69) { + else if (boundExpression.kind === 69) { declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608); } else { @@ -11148,6 +11263,25 @@ var ts; declareSymbolAndAddToSymbolTable(node, 8388608, 8388608); } } + function setCommonJsModuleIndicator(node) { + if (!file.commonJsModuleIndicator) { + file.commonJsModuleIndicator = node; + bindSourceFileAsExternalModule(); + } + } + function bindExportsPropertyAssignment(node) { + setCommonJsModuleIndicator(node); + declareSymbol(file.symbol.exports, file.symbol, node.left, 4 | 7340032, 0); + } + function bindModuleExportsAssignment(node) { + setCommonJsModuleIndicator(node); + bindExportAssignment(node); + } + function bindCallExpression(node) { + if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) { + setCommonJsModuleIndicator(node); + } + } function bindClassLikeDeclaration(node) { if (node.kind === 214) { bindBlockScopedDeclaration(node, 32, 899519); @@ -11268,7 +11402,7 @@ var ts; function checkUnreachable(node) { switch (currentReachabilityState) { case 4: - var reportError = ts.isStatement(node) || + var reportError = (ts.isStatement(node) && node.kind !== 194) || node.kind === 214 || (node.kind === 218 && shouldReportErrorOnModuleDeclaration(node)) || (node.kind === 217 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); @@ -11364,7 +11498,7 @@ var ts; symbolToString: symbolToString, getAugmentedPropertiesOfType: getAugmentedPropertiesOfType, getRootSymbols: getRootSymbols, - getContextualType: getContextualType, + getContextualType: getApparentTypeOfContextualType, getFullyQualifiedName: getFullyQualifiedName, getResolvedSignature: getResolvedSignature, getConstantValue: getConstantValue, @@ -11620,7 +11754,7 @@ var ts; return ts.getAncestor(node, 248); } function isGlobalSourceFile(node) { - return node.kind === 248 && !ts.isExternalModule(node); + return node.kind === 248 && !ts.isExternalOrCommonJsModule(node); } function getSymbol(symbols, name, meaning) { if (meaning && ts.hasProperty(symbols, name)) { @@ -11706,23 +11840,24 @@ var ts; } switch (location.kind) { case 248: - if (!ts.isExternalModule(location)) + if (!ts.isExternalOrCommonJsModule(location)) break; case 218: var moduleExports = getSymbolOfNode(location).exports; if (location.kind === 248 || (location.kind === 218 && location.name.kind === 9)) { + if (result = moduleExports["default"]) { + var localSymbol = ts.getLocalSymbolForExportDefault(result); + if (localSymbol && (result.flags & meaning) && localSymbol.name === name) { + break loop; + } + result = undefined; + } if (ts.hasProperty(moduleExports, name) && moduleExports[name].flags === 8388608 && ts.getDeclarationOfKind(moduleExports[name], 230)) { break; } - result = moduleExports["default"]; - var localSymbol = ts.getLocalSymbolForExportDefault(result); - if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) { - break loop; - } - result = undefined; } if (result = getSymbol(moduleExports, name, meaning & 8914931)) { break loop; @@ -12080,6 +12215,9 @@ var ts; if (moduleName === undefined) { return; } + if (moduleName.indexOf("!") >= 0) { + moduleName = moduleName.substr(0, moduleName.indexOf("!")); + } var isRelative = ts.isExternalModuleNameRelative(moduleName); if (!isRelative) { var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512); @@ -12250,7 +12388,7 @@ var ts; } switch (location_1.kind) { case 248: - if (!ts.isExternalModule(location_1)) { + if (!ts.isExternalOrCommonJsModule(location_1)) { break; } case 218: @@ -12377,7 +12515,7 @@ var ts; } function hasExternalModuleSymbol(declaration) { return (declaration.kind === 218 && declaration.name.kind === 9) || - (declaration.kind === 248 && ts.isExternalModule(declaration)); + (declaration.kind === 248 && ts.isExternalOrCommonJsModule(declaration)); } function hasVisibleDeclarations(symbol) { var aliasesToMakeVisible; @@ -12575,7 +12713,7 @@ var ts; writeAnonymousType(type, flags); } else if (type.flags & 256) { - writer.writeStringLiteral(type.text); + writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\""); } else { writePunctuation(writer, 15); @@ -12939,7 +13077,7 @@ var ts; } } else if (node.kind === 248) { - return ts.isExternalModule(node) ? node : undefined; + return ts.isExternalOrCommonJsModule(node) ? node : undefined; } } ts.Debug.fail("getContainingModule cant reach here"); @@ -13144,6 +13282,23 @@ var ts; var symbol = getSymbolOfNode(node); return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node); } + function getTextOfPropertyName(name) { + switch (name.kind) { + case 69: + return name.text; + case 9: + case 8: + return name.text; + case 136: + if (ts.isStringOrNumericLiteral(name.expression.kind)) { + return name.expression.text; + } + } + return undefined; + } + function isComputedNonLiteralName(name) { + return name.kind === 136 && !ts.isStringOrNumericLiteral(name.expression.kind); + } function getTypeForBindingElement(declaration) { var pattern = declaration.parent; var parentType = getTypeForBindingElementParent(pattern.parent); @@ -13159,8 +13314,12 @@ var ts; var type; if (pattern.kind === 161) { var name_11 = declaration.propertyName || declaration.name; - type = getTypeOfPropertyOfType(parentType, name_11.text) || - isNumericLiteralName(name_11.text) && getIndexTypeOfType(parentType, 1) || + if (isComputedNonLiteralName(name_11)) { + return anyType; + } + var text = getTextOfPropertyName(name_11); + type = getTypeOfPropertyOfType(parentType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) || getIndexTypeOfType(parentType, 0); if (!type) { error(name_11, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_11)); @@ -13238,10 +13397,16 @@ var ts; } function getTypeFromObjectBindingPattern(pattern, includePatternInType) { var members = {}; + var hasComputedProperties = false; ts.forEach(pattern.elements, function (e) { - var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0); var name = e.propertyName || e.name; - var symbol = createSymbol(flags, name.text); + if (isComputedNonLiteralName(name)) { + hasComputedProperties = true; + return; + } + var text = getTextOfPropertyName(name); + var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0); + var symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType); symbol.bindingElement = e; members[symbol.name] = symbol; @@ -13250,6 +13415,9 @@ var ts; if (includePatternInType) { result.pattern = pattern; } + if (hasComputedProperties) { + result.flags |= 67108864; + } return result; } function getTypeFromArrayBindingPattern(pattern, includePatternInType) { @@ -13300,6 +13468,12 @@ var ts; if (declaration.kind === 227) { return links.type = checkExpression(declaration.expression); } + if (declaration.kind === 181) { + return links.type = checkExpression(declaration.right); + } + if (declaration.kind === 166) { + return checkExpressionCached(declaration.parent.right); + } if (!pushTypeResolution(symbol, 0)) { return unknownType; } @@ -13549,17 +13723,19 @@ var ts; } function resolveBaseTypesOfClass(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; - var baseContructorType = getBaseConstructorTypeOfClass(type); - if (!(baseContructorType.flags & 80896)) { + var baseConstructorType = getBaseConstructorTypeOfClass(type); + if (!(baseConstructorType.flags & 80896)) { return; } var baseTypeNode = getBaseTypeNodeOfClass(type); var baseType; - if (baseContructorType.symbol && baseContructorType.symbol.flags & 32) { - baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol); + var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 && + areAllOuterTypeParametersApplied(originalBaseType)) { + baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol); } else { - var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments); + var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments); if (!constructors.length) { error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments); return; @@ -13584,6 +13760,15 @@ var ts; type.resolvedBaseTypes.push(baseType); } } + function areAllOuterTypeParametersApplied(type) { + var outerTypeParameters = type.outerTypeParameters; + if (outerTypeParameters) { + var last = outerTypeParameters.length - 1; + var typeArguments = type.typeArguments; + return outerTypeParameters[last].symbol !== typeArguments[last].symbol; + } + return true; + } function resolveBaseTypesOfInterface(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { @@ -13655,7 +13840,7 @@ var ts; type.typeArguments = type.typeParameters; type.thisType = createType(512 | 33554432); type.thisType.symbol = symbol; - type.thisType.constraint = getTypeWithThisArgument(type); + type.thisType.constraint = type; } } return links.declaredType; @@ -14130,14 +14315,19 @@ var ts; type = getApparentType(type); return type.flags & 49152 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type); } + function getApparentTypeOfTypeParameter(type) { + if (!type.resolvedApparentType) { + var constraintType = getConstraintOfTypeParameter(type); + while (constraintType && constraintType.flags & 512) { + constraintType = getConstraintOfTypeParameter(constraintType); + } + type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type); + } + return type.resolvedApparentType; + } function getApparentType(type) { if (type.flags & 512) { - do { - type = getConstraintOfTypeParameter(type); - } while (type && type.flags & 512); - if (!type) { - type = emptyObjectType; - } + type = getApparentTypeOfTypeParameter(type); } if (type.flags & 258) { type = globalStringType; @@ -14290,7 +14480,7 @@ var ts; if (node.initializer) { var signatureDeclaration = node.parent; var signature = getSignatureFromDeclaration(signatureDeclaration); - var parameterIndex = signatureDeclaration.parameters.indexOf(node); + var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node); ts.Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } @@ -14385,6 +14575,16 @@ var ts; } return result; } + function resolveExternalModuleTypeByLiteral(name) { + var moduleSym = resolveExternalModuleName(name, name); + if (moduleSym) { + var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym); + if (resolvedModuleSymbol) { + return getTypeOfSymbol(resolvedModuleSymbol); + } + } + return anyType; + } function getReturnTypeOfSignature(signature) { if (!signature.resolvedReturnType) { if (!pushTypeResolution(signature, 3)) { @@ -14846,11 +15046,12 @@ var ts; return links.resolvedType; } function getStringLiteralType(node) { - if (ts.hasProperty(stringLiteralTypes, node.text)) { - return stringLiteralTypes[node.text]; + var text = node.text; + if (ts.hasProperty(stringLiteralTypes, text)) { + return stringLiteralTypes[text]; } - var type = stringLiteralTypes[node.text] = createType(256); - type.text = ts.getTextOfNode(node); + var type = stringLiteralTypes[text] = createType(256); + type.text = text; return type; } function getTypeFromStringLiteral(node) { @@ -15319,7 +15520,7 @@ var ts; return false; } function hasExcessProperties(source, target, reportErrors) { - if (someConstituentTypeHasKind(target, 80896)) { + if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) { for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) { var prop = _a[_i]; if (!isKnownProperty(target, prop.name)) { @@ -15409,9 +15610,6 @@ var ts; return result; } function typeParameterIdenticalTo(source, target) { - if (source.symbol.name !== target.symbol.name) { - return 0; - } if (source.constraint === target.constraint) { return -1; } @@ -15856,18 +16054,24 @@ var ts; } return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp)); } + function isMatchingSignature(source, target, partialMatch) { + if (source.parameters.length === target.parameters.length && + source.minArgumentCount === target.minArgumentCount && + source.hasRestParameter === target.hasRestParameter) { + return true; + } + if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter || + source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) { + return true; + } + return false; + } function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) { if (source === target) { return -1; } - if (source.parameters.length !== target.parameters.length || - source.minArgumentCount !== target.minArgumentCount || - source.hasRestParameter !== target.hasRestParameter) { - if (!partialMatch || - source.parameters.length < target.parameters.length && !source.hasRestParameter || - source.minArgumentCount > target.minArgumentCount) { - return 0; - } + if (!(isMatchingSignature(source, target, partialMatch))) { + return 0; } var result = -1; if (source.typeParameters && target.typeParameters) { @@ -15952,6 +16156,9 @@ var ts; function isTupleLikeType(type) { return !!getPropertyOfType(type, "0"); } + function isStringLiteralType(type) { + return type.flags & 256; + } function isTupleType(type) { return !!(type.flags & 8192); } @@ -16543,7 +16750,7 @@ var ts; } } function narrowTypeByInstanceof(type, expr, assumeTrue) { - if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) { + if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) { return type; } var rightType = checkExpression(expr.right); @@ -16571,6 +16778,12 @@ var ts; } } if (targetType) { + if (!assumeTrue) { + if (type.flags & 16384) { + return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); })); + } + return type; + } return getNarrowedType(type, targetType); } return type; @@ -16982,6 +17195,9 @@ var ts; function getIndexTypeOfContextualType(type, kind) { return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }); } + function contextualTypeIsStringLiteralType(type) { + return !!(type.flags & 16384 ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type)); + } function contextualTypeIsTupleLikeType(type) { return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type)); } @@ -16997,7 +17213,7 @@ var ts; } function getContextualTypeForObjectLiteralElement(element) { var objectLiteral = element.parent; - var type = getContextualType(objectLiteral); + var type = getApparentTypeOfContextualType(objectLiteral); if (type) { if (!ts.hasDynamicName(element)) { var symbolName = getSymbolOfNode(element).name; @@ -17013,7 +17229,7 @@ var ts; } function getContextualTypeForElementExpression(node) { var arrayLiteral = node.parent; - var type = getContextualType(arrayLiteral); + var type = getApparentTypeOfContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); return getTypeOfPropertyOfContextualType(type, "" + index) @@ -17042,11 +17258,11 @@ var ts; } return undefined; } - function getContextualType(node) { - var type = getContextualTypeWorker(node); + function getApparentTypeOfContextualType(node) { + var type = getContextualType(node); return type && getApparentType(type); } - function getContextualTypeWorker(node) { + function getContextualType(node) { if (isInsideWithStatementBody(node)) { return undefined; } @@ -17112,7 +17328,7 @@ var ts; ts.Debug.assert(node.kind !== 143 || ts.isObjectLiteralMethod(node)); var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) - : getContextualType(node); + : getApparentTypeOfContextualType(node); if (!type) { return undefined; } @@ -17195,7 +17411,7 @@ var ts; type.pattern = node; return type; } - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType && contextualTypeIsTupleLikeType(contextualType)) { var pattern = contextualType.pattern; if (pattern && (pattern.kind === 162 || pattern.kind === 164)) { @@ -17250,10 +17466,11 @@ var ts; checkGrammarObjectLiteralExpression(node, inDestructuringPattern); var propertiesTable = {}; var propertiesArray = []; - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); var contextualTypeHasPattern = contextualType && contextualType.pattern && (contextualType.pattern.kind === 161 || contextualType.pattern.kind === 165); var typeFlags = 0; + var patternWithComputedProperties = false; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var memberDecl = _a[_i]; var member = memberDecl.symbol; @@ -17279,8 +17496,11 @@ var ts; if (isOptional) { prop.flags |= 536870912; } + if (ts.hasDynamicName(memberDecl)) { + patternWithComputedProperties = true; + } } - else if (contextualTypeHasPattern) { + else if (contextualTypeHasPattern && !(contextualType.flags & 67108864)) { var impliedProp = getPropertyOfType(contextualType, member.name); if (impliedProp) { prop.flags |= impliedProp.flags & 536870912; @@ -17323,7 +17543,7 @@ var ts; var numberIndexType = getIndexType(1); var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576; - result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064); + result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0); if (inDestructuringPattern) { result.pattern = node; } @@ -18538,6 +18758,9 @@ var ts; return anyType; } } + if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) { + return resolveExternalModuleTypeByLiteral(node.arguments[0]); + } return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { @@ -18548,7 +18771,9 @@ var ts; var targetType = getTypeFromTypeNode(node.type); if (produceDiagnostics && targetType !== unknownType) { var widenedType = getWidenedType(exprType); - if (!(isTypeAssignableTo(targetType, widenedType))) { + var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) && + someConstituentTypeHasKind(widenedType, 258); + if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); } } @@ -18987,17 +19212,24 @@ var ts; var p = properties_3[_i]; if (p.kind === 245 || p.kind === 246) { var name_14 = p.name; + if (name_14.kind === 136) { + checkComputedPropertyName(name_14); + } + if (isComputedNonLiteralName(name_14)) { + continue; + } + var text = getTextOfPropertyName(name_14); var type = isTypeAny(sourceType) ? sourceType - : getTypeOfPropertyOfType(sourceType, name_14.text) || - isNumericLiteralName(name_14.text) && getIndexTypeOfType(sourceType, 1) || + : getTypeOfPropertyOfType(sourceType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) || getIndexTypeOfType(sourceType, 0); if (type) { if (p.kind === 246) { checkDestructuringAssignment(p, type); } else { - checkDestructuringAssignment(p.initializer || name_14, type); + checkDestructuringAssignment(p.initializer, type); } } else { @@ -19175,6 +19407,9 @@ var ts; case 31: case 32: case 33: + if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) { + return booleanType; + } if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) { reportOperatorError(); } @@ -19282,6 +19517,13 @@ var ts; var type2 = checkExpression(node.whenFalse, contextualMapper); return getUnionType([type1, type2]); } + function checkStringLiteralExpression(node) { + var contextualType = getContextualType(node); + if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { + return getStringLiteralType(node); + } + return stringType; + } function checkTemplateExpression(node) { ts.forEach(node.templateSpans, function (templateSpan) { checkExpression(templateSpan.expression); @@ -19320,7 +19562,7 @@ var ts; if (isInferentialContext(contextualMapper)) { var signature = getSingleCallSignature(type); if (signature && signature.typeParameters) { - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType) { var contextualSignature = getSingleCallSignature(contextualType); if (contextualSignature && !contextualSignature.typeParameters) { @@ -19372,6 +19614,7 @@ var ts; case 183: return checkTemplateExpression(node); case 9: + return checkStringLiteralExpression(node); case 11: return stringType; case 10: @@ -20433,7 +20676,7 @@ var ts; return; } var parent = getDeclarationContainer(node); - if (parent.kind === 248 && ts.isExternalModule(parent)) { + if (parent.kind === 248 && ts.isExternalOrCommonJsModule(parent)) { error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); } } @@ -20504,6 +20747,11 @@ var ts; checkExpressionCached(node.initializer); } } + if (node.kind === 163) { + if (node.propertyName && node.propertyName.kind === 136) { + checkComputedPropertyName(node.propertyName); + } + } if (ts.isBindingPattern(node.name)) { ts.forEach(node.name.elements, checkSourceElement); } @@ -20862,6 +21110,7 @@ var ts; var firstDefaultClause; var hasDuplicateDefaultClause = false; var expressionType = checkExpression(node.expression); + var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258); ts.forEach(node.caseBlock.clauses, function (clause) { if (clause.kind === 242 && !hasDuplicateDefaultClause) { if (firstDefaultClause === undefined) { @@ -20878,6 +21127,9 @@ var ts; if (produceDiagnostics && clause.kind === 241) { var caseClause = clause; var caseType = checkExpression(caseClause.expression); + if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) { + return; + } if (!isTypeAssignableTo(expressionType, caseType)) { checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined); } @@ -21285,11 +21537,14 @@ var ts; var enumIsConst = ts.isConst(node); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.name.kind === 136) { + if (isComputedNonLiteralName(member.name)) { error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums); } - else if (isNumericLiteralName(member.name.text)) { - error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + else { + var text = getTextOfPropertyName(member.name); + if (isNumericLiteralName(text)) { + error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + } } var previousEnumMemberIsNonConstant = autoValue === undefined; var initializer = member.initializer; @@ -21987,8 +22242,10 @@ var ts; function checkSourceFileWorker(node) { var links = getNodeLinks(node); if (!(links.flags & 1)) { - if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) { - return; + if (compilerOptions.skipDefaultLibCheck) { + if (node.hasNoDefaultLib) { + return; + } } checkGrammarSourceFile(node); emitExtends = false; @@ -21997,7 +22254,7 @@ var ts; potentialThisCollisions.length = 0; ts.forEach(node.statements, checkSourceElement); checkFunctionAndClassExpressionBodies(node); - if (ts.isExternalModule(node)) { + if (ts.isExternalOrCommonJsModule(node)) { checkExternalModuleExports(node); } if (potentialThisCollisions.length) { @@ -22075,7 +22332,7 @@ var ts; } switch (location.kind) { case 248: - if (!ts.isExternalModule(location)) { + if (!ts.isExternalOrCommonJsModule(location)) { break; } case 218: @@ -22634,15 +22891,24 @@ var ts; getReferencedValueDeclaration: getReferencedValueDeclaration, getTypeReferenceSerializationKind: getTypeReferenceSerializationKind, isOptionalParameter: isOptionalParameter, - isArgumentsLocalBinding: isArgumentsLocalBinding + isArgumentsLocalBinding: isArgumentsLocalBinding, + getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration }; } + function getExternalModuleFileFromDeclaration(declaration) { + var specifier = ts.getExternalModuleName(declaration); + var moduleSymbol = getSymbolAtLocation(specifier); + if (!moduleSymbol) { + return undefined; + } + return ts.getDeclarationOfKind(moduleSymbol, 248); + } function initializeTypeChecker() { ts.forEach(host.getSourceFiles(), function (file) { ts.bindSourceFile(file, compilerOptions); }); ts.forEach(host.getSourceFiles(), function (file) { - if (!ts.isExternalModule(file)) { + if (!ts.isExternalOrCommonJsModule(file)) { mergeSymbolTable(globals, file.locals); } }); @@ -23319,7 +23585,7 @@ var ts; } } function checkGrammarForNonSymbolComputedProperty(node, message) { - if (node.kind === 136 && !ts.isWellKnownSymbolSyntactically(node.expression)) { + if (ts.isDynamicName(node)) { return grammarErrorOnNode(node, message); } } @@ -23633,11 +23899,15 @@ var ts; var writeTextOfNode; var writer = createAndSetNewTextWriterWithSymbolWriter(); var enclosingDeclaration; - var currentSourceFile; + var currentText; + var currentLineMap; + var currentIdentifiers; + var isCurrentFileExternalModule; var reportedDeclarationError = false; var errorNameNode; var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments; var emit = compilerOptions.stripInternal ? stripInternal : emitNode; + var noDeclare = !root; var moduleElementDeclarationEmitInfo = []; var asynchronousSubModuleDeclarationEmitInfo; var referencePathsOutput = ""; @@ -23673,21 +23943,53 @@ var ts; } else { var emittedReferencedFiles = []; + var prevModuleElementDeclarationEmitInfo = []; ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + if (!ts.isDeclarationFile(sourceFile)) { if (!compilerOptions.noResolve) { ts.forEach(sourceFile.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference); - if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) && + if (referencedFile && (ts.isDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) { writeReferencePath(referencedFile); emittedReferencedFiles.push(referencedFile); } }); } + } + if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + noDeclare = false; + emitSourceFile(sourceFile); + } + else if (ts.isExternalModule(sourceFile)) { + noDeclare = true; + write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {"); + writeLine(); + increaseIndent(); emitSourceFile(sourceFile); + decreaseIndent(); + write("}"); + writeLine(); + if (moduleElementDeclarationEmitInfo.length) { + var oldWriter = writer; + ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) { + if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { + ts.Debug.assert(aliasEmitInfo.node.kind === 222); + createAndSetNewTextWriterWithSymbolWriter(); + ts.Debug.assert(aliasEmitInfo.indent === 1); + increaseIndent(); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + decreaseIndent(); + } + }); + setWriter(oldWriter); + } + prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); + moduleElementDeclarationEmitInfo = []; } }); + moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo); } return { reportedDeclarationError: reportedDeclarationError, @@ -23696,13 +23998,12 @@ var ts; referencePathsOutput: referencePathsOutput }; function hasInternalAnnotation(range) { - var text = currentSourceFile.text; - var comment = text.substring(range.pos, range.end); + var comment = currentText.substring(range.pos, range.end); return comment.indexOf("@internal") >= 0; } function stripInternal(node) { if (node) { - var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos); if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) { return; } @@ -23783,7 +24084,7 @@ var ts; var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); if (errorInfo) { if (errorInfo.typeName) { - diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); + diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); } else { diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); @@ -23847,9 +24148,9 @@ var ts; } function writeJsDocComments(declaration) { if (declaration) { - var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile); - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); - ts.emitComments(currentSourceFile, writer, jsDocComments, true, newLine, ts.writeCommentRange); + var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments); + ts.emitComments(currentText, currentLineMap, writer, jsDocComments, true, newLine, ts.writeCommentRange); } } function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) { @@ -23866,7 +24167,7 @@ var ts; case 103: case 97: case 9: - return writeTextOfNode(currentSourceFile, type); + return writeTextOfNode(currentText, type); case 188: return emitExpressionWithTypeArguments(type); case 151: @@ -23897,14 +24198,14 @@ var ts; } function writeEntityName(entityName) { if (entityName.kind === 69) { - writeTextOfNode(currentSourceFile, entityName); + writeTextOfNode(currentText, entityName); } else { var left = entityName.kind === 135 ? entityName.left : entityName.expression; var right = entityName.kind === 135 ? entityName.right : entityName.name; writeEntityName(left); write("."); - writeTextOfNode(currentSourceFile, right); + writeTextOfNode(currentText, right); } } function emitEntityName(entityName) { @@ -23932,7 +24233,7 @@ var ts; } } function emitTypePredicate(type) { - writeTextOfNode(currentSourceFile, type.parameterName); + writeTextOfNode(currentText, type.parameterName); write(" is "); emitType(type.type); } @@ -23972,20 +24273,23 @@ var ts; } } function emitSourceFile(node) { - currentSourceFile = node; + currentText = node.text; + currentLineMap = ts.getLineStarts(node); + currentIdentifiers = node.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(node); enclosingDeclaration = node; - ts.emitDetachedComments(currentSourceFile, writer, ts.writeCommentRange, node, newLine, true); + ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true); emitLines(node.statements); } function getExportDefaultTempVariableName() { var baseName = "_default"; - if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) { + if (!ts.hasProperty(currentIdentifiers, baseName)) { return baseName; } var count = 0; while (true) { var name_19 = baseName + "_" + (++count); - if (!ts.hasProperty(currentSourceFile.identifiers, name_19)) { + if (!ts.hasProperty(currentIdentifiers, name_19)) { return name_19; } } @@ -23993,7 +24297,7 @@ var ts; function emitExportAssignment(node) { if (node.expression.kind === 69) { write(node.isExportEquals ? "export = " : "export default "); - writeTextOfNode(currentSourceFile, node.expression); + writeTextOfNode(currentText, node.expression); } else { var tempVarName = getExportDefaultTempVariableName(); @@ -24028,7 +24332,7 @@ var ts; writeModuleElement(node); } else if (node.kind === 221 || - (node.parent.kind === 248 && ts.isExternalModule(currentSourceFile))) { + (node.parent.kind === 248 && isCurrentFileExternalModule)) { var isVisible; if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248) { asynchronousSubModuleDeclarationEmitInfo.push({ @@ -24080,14 +24384,14 @@ var ts; } } function emitModuleElementDeclarationFlags(node) { - if (node.parent === currentSourceFile) { + if (node.parent.kind === 248) { if (node.flags & 2) { write("export "); } if (node.flags & 512) { write("default "); } - else if (node.kind !== 215) { + else if (node.kind !== 215 && !noDeclare) { write("declare "); } } @@ -24112,7 +24416,7 @@ var ts; write("export "); } write("import "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" = "); if (ts.isInternalModuleImportEqualsDeclaration(node)) { emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError); @@ -24120,7 +24424,7 @@ var ts; } else { write("require("); - writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node)); + writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node)); write(");"); } writer.writeLine(); @@ -24154,7 +24458,7 @@ var ts; if (node.importClause) { var currentWriterPos = writer.getTextPos(); if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) { - writeTextOfNode(currentSourceFile, node.importClause.name); + writeTextOfNode(currentText, node.importClause.name); } if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) { if (currentWriterPos !== writer.getTextPos()) { @@ -24162,7 +24466,7 @@ var ts; } if (node.importClause.namedBindings.kind === 224) { write("* as "); - writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name); + writeTextOfNode(currentText, node.importClause.namedBindings.name); } else { write("{ "); @@ -24172,16 +24476,28 @@ var ts; } write(" from "); } - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); write(";"); writer.writeLine(); } + function emitExternalModuleSpecifier(moduleSpecifier) { + if (moduleSpecifier.kind === 9 && (!root) && (compilerOptions.out || compilerOptions.outFile)) { + var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent); + if (moduleName) { + write("\""); + write(moduleName); + write("\""); + return; + } + } + writeTextOfNode(currentText, moduleSpecifier); + } function emitImportOrExportSpecifier(node) { if (node.propertyName) { - writeTextOfNode(currentSourceFile, node.propertyName); + writeTextOfNode(currentText, node.propertyName); write(" as "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } function emitExportSpecifier(node) { emitImportOrExportSpecifier(node); @@ -24201,7 +24517,7 @@ var ts; } if (node.moduleSpecifier) { write(" from "); - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); } write(";"); writer.writeLine(); @@ -24215,11 +24531,11 @@ var ts; else { write("module "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); while (node.body.kind !== 219) { node = node.body; write("."); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; @@ -24238,7 +24554,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("type "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); emitTypeParameters(node.typeParameters); write(" = "); emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError); @@ -24260,7 +24576,7 @@ var ts; write("const "); } write("enum "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" {"); writeLine(); increaseIndent(); @@ -24271,7 +24587,7 @@ var ts; } function emitEnumMemberDeclaration(node) { emitJsDocComments(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var enumMemberValue = resolver.getConstantValue(node); if (enumMemberValue !== undefined) { write(" = "); @@ -24288,7 +24604,7 @@ var ts; increaseIndent(); emitJsDocComments(node); decreaseIndent(); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (node.constraint && !isPrivateMethodTypeParameter(node)) { write(" extends "); if (node.parent.kind === 152 || @@ -24398,7 +24714,7 @@ var ts; write("abstract "); } write("class "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -24421,7 +24737,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("interface "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -24451,7 +24767,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if ((node.kind === 141 || node.kind === 140) && ts.hasQuestionToken(node)) { write("?"); } @@ -24525,7 +24841,7 @@ var ts; emitBindingPattern(bindingElement.name); } else { - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); writeTypeOfDeclaration(bindingElement, undefined, getBindingElementTypeVisibilityError); } } @@ -24566,7 +24882,7 @@ var ts; emitJsDocComments(accessors.getAccessor); emitJsDocComments(accessors.setAccessor); emitClassMemberDeclarationFlags(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (!(node.flags & 16)) { accessorWithTypeAnnotation = node; var type = getTypeAnnotationFromAccessor(node); @@ -24647,13 +24963,13 @@ var ts; } if (node.kind === 213) { write("function "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } else if (node.kind === 144) { write("constructor"); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (ts.hasQuestionToken(node)) { write("?"); } @@ -24766,7 +25082,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } if (resolver.isOptionalParameter(node)) { write("?"); @@ -24865,7 +25181,7 @@ var ts; } else if (bindingElement.kind === 163) { if (bindingElement.propertyName) { - writeTextOfNode(currentSourceFile, bindingElement.propertyName); + writeTextOfNode(currentText, bindingElement.propertyName); write(": "); } if (bindingElement.name) { @@ -24877,7 +25193,7 @@ var ts; if (bindingElement.dotDotDotToken) { write("..."); } - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); } } } @@ -24960,6 +25276,18 @@ var ts; return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile); } ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile; + function getResolvedExternalModuleName(host, file) { + return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName); + } + ts.getResolvedExternalModuleName = getResolvedExternalModuleName; + function getExternalModuleNameFromDeclaration(host, resolver, declaration) { + var file = resolver.getExternalModuleFileFromDeclaration(declaration); + if (!file || ts.isDeclarationFile(file)) { + return undefined; + } + return getResolvedExternalModuleName(host, file); + } + ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration; var entities = { "quot": 0x0022, "amp": 0x0026, @@ -25229,15 +25557,19 @@ var ts; var newLine = host.getNewLine(); var jsxDesugaring = host.getCompilerOptions().jsx !== 1; var shouldEmitJsx = function (s) { return (s.languageVariant === 1 && !jsxDesugaring); }; + var outFile = compilerOptions.outFile || compilerOptions.out; + var emitJavaScript = createFileEmitter(); if (targetSourceFile === undefined) { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { - var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, sourceFile); - } - }); - if (compilerOptions.outFile || compilerOptions.out) { - emitFile(compilerOptions.outFile || compilerOptions.out); + if (outFile) { + emitFile(outFile); + } + else { + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { + var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); + emitFile(jsFilePath, sourceFile); + } + }); } } else { @@ -25245,8 +25577,8 @@ var ts; var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); emitFile(jsFilePath, targetSourceFile); } - else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(compilerOptions.outFile || compilerOptions.out); + else if (!ts.isDeclarationFile(targetSourceFile) && outFile) { + emitFile(outFile); } } diagnostics = ts.sortAndDeduplicateDiagnostics(diagnostics); @@ -25296,20 +25628,26 @@ var ts; } } } - function emitJavaScript(jsFilePath, root) { + function createFileEmitter() { var writer = ts.createTextWriter(newLine); var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var currentText; + var currentLineMap; + var currentFileIdentifiers; + var renamedDependencies; + var isEs6Module; + var isCurrentFileExternalModule; var exportFunctionForFile; - var generatedNameSet = {}; - var nodeToGeneratedName = []; + var generatedNameSet; + var nodeToGeneratedName; var computedPropertyNamesToGeneratedNames; var convertedLoopState; - var extendsEmitted = false; - var decorateEmitted = false; - var paramEmitted = false; - var awaiterEmitted = false; - var tempFlags = 0; + var extendsEmitted; + var decorateEmitted; + var paramEmitted; + var awaiterEmitted; + var tempFlags; var tempVariables; var tempParameters; var externalImports; @@ -25326,6 +25664,7 @@ var ts; var scopeEmitStart = function (scopeDeclaration, scopeName) { }; var scopeEmitEnd = function () { }; var sourceMapData; + var root; var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker; var moduleEmitDelegates = (_a = {}, _a[5] = emitES6Module, @@ -25335,30 +25674,75 @@ var ts; _a[1] = emitCommonJSModule, _a ); - if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { - initializeEmitterWithSourceMaps(); - } - if (root) { - emitSourceFile(root); - } - else { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - emitSourceFile(sourceFile); + var bundleEmitDelegates = (_b = {}, + _b[5] = function () { }, + _b[2] = emitAMDModule, + _b[4] = emitSystemModule, + _b[3] = function () { }, + _b[1] = function () { }, + _b + ); + return doEmit; + function doEmit(jsFilePath, rootFile) { + writer.reset(); + currentSourceFile = undefined; + currentText = undefined; + currentLineMap = undefined; + exportFunctionForFile = undefined; + generatedNameSet = {}; + nodeToGeneratedName = []; + computedPropertyNamesToGeneratedNames = undefined; + convertedLoopState = undefined; + extendsEmitted = false; + decorateEmitted = false; + paramEmitted = false; + awaiterEmitted = false; + tempFlags = 0; + tempVariables = undefined; + tempParameters = undefined; + externalImports = undefined; + exportSpecifiers = undefined; + exportEquals = undefined; + hasExportStars = undefined; + detachedCommentsInfo = undefined; + sourceMapData = undefined; + isEs6Module = false; + renamedDependencies = undefined; + isCurrentFileExternalModule = false; + root = rootFile; + if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { + initializeEmitterWithSourceMaps(jsFilePath, root); + } + if (root) { + emitSourceFile(root); + } + else { + if (modulekind) { + ts.forEach(host.getSourceFiles(), emitEmitHelpers); } - }); + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) { + emitSourceFile(sourceFile); + } + }); + } + writeLine(); + writeEmittedFiles(writer.getText(), jsFilePath, compilerOptions.emitBOM); } - writeLine(); - writeEmittedFiles(writer.getText(), compilerOptions.emitBOM); - return; function emitSourceFile(sourceFile) { currentSourceFile = sourceFile; + currentText = sourceFile.text; + currentLineMap = ts.getLineStarts(sourceFile); exportFunctionForFile = undefined; + isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"]; + renamedDependencies = sourceFile.renamedDependencies; + currentFileIdentifiers = sourceFile.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(sourceFile); emit(sourceFile); } function isUniqueName(name) { return !resolver.hasGlobalName(name) && - !ts.hasProperty(currentSourceFile.identifiers, name) && + !ts.hasProperty(currentFileIdentifiers, name) && !ts.hasProperty(generatedNameSet, name); } function makeTempVariableName(flags) { @@ -25431,7 +25815,7 @@ var ts; var id = ts.getNodeId(node); return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node))); } - function initializeEmitterWithSourceMaps() { + function initializeEmitterWithSourceMaps(jsFilePath, root) { var sourceMapDir; var sourceMapSourceIndex = -1; var sourceMapNameIndexMap = {}; @@ -25500,7 +25884,7 @@ var ts; } } function recordSourceMapSpan(pos) { - var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos); + var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos); sourceLinePos.line++; sourceLinePos.character++; var emittedLine = writer.getLine(); @@ -25528,13 +25912,13 @@ var ts; } } function recordEmitNodeStartSpan(node) { - recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos)); + recordSourceMapSpan(ts.skipTrivia(currentText, node.pos)); } function recordEmitNodeEndSpan(node) { recordSourceMapSpan(node.end); } function writeTextWithSpanRecord(tokenKind, startPos, emitFn) { - var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos); + var tokenStartPos = ts.skipTrivia(currentText, startPos); recordSourceMapSpan(tokenStartPos); var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn); recordSourceMapSpan(tokenEndPos); @@ -25604,9 +25988,9 @@ var ts; sourceMapNameIndices.pop(); } ; - function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) { + function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) { recordSourceMapSpan(comment.pos); - ts.writeCommentRange(currentSourceFile, writer, comment, newLine); + ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine); recordSourceMapSpan(comment.end); } function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) { @@ -25636,7 +26020,7 @@ var ts; return output; } } - function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) { encodeLastRecordedSourceMapSpan(); var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent); sourceMapDataList.push(sourceMapData); @@ -25649,7 +26033,7 @@ var ts; ts.writeFile(host, diagnostics, sourceMapData.sourceMapFilePath, sourceMapText, false); sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL; } - writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark); + writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark); } var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)); sourceMapData = { @@ -25712,7 +26096,7 @@ var ts; scopeEmitEnd = recordScopeNameEnd; writeComment = writeCommentRangeWithMap; } - function writeJavaScriptFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) { ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark); } function createTempVariable(flags) { @@ -25882,7 +26266,7 @@ var ts; return getQuotedEscapedLiteralText("\"", node.text, "\""); } if (node.parent) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + return ts.getTextOfNodeFromSourceText(currentText, node); } switch (node.kind) { case 9: @@ -25904,7 +26288,7 @@ var ts; return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote; } function emitDownlevelRawTemplateLiteral(node) { - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var text = ts.getTextOfNodeFromSourceText(currentText, node); var isLast = node.kind === 11 || node.kind === 14; text = text.substring(1, text.length - (isLast ? 1 : 2)); text = text.replace(/\r\n?/g, "\n"); @@ -26234,7 +26618,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } write("\""); } @@ -26330,7 +26714,7 @@ var ts; else if (declaration.kind === 226) { write(getGeneratedNameForNode(declaration.parent.parent.parent)); var name_24 = declaration.propertyName || declaration.name; - var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_24); + var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24); if (languageVersion === 0 && identifier === "default") { write("[\"default\"]"); } @@ -26354,7 +26738,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function isNameOfNestedRedeclaration(node) { @@ -26391,7 +26775,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function emitThis(node) { @@ -26758,8 +27142,8 @@ var ts; return container && container.kind !== 248; } function emitShorthandPropertyAssignment(node) { - writeTextOfNode(currentSourceFile, node.name); - if (languageVersion < 2 || isNamespaceExportReference(node.name)) { + writeTextOfNode(currentText, node.name); + if (modulekind !== 5 || isNamespaceExportReference(node.name)) { write(": "); emit(node.name); } @@ -26809,10 +27193,10 @@ var ts; } emit(node.expression); var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken); - var shouldEmitSpace; + var shouldEmitSpace = false; if (!indentedBeforeDot) { if (node.expression.kind === 8) { - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression); + var text = ts.getTextOfNodeFromSourceText(currentText, node.expression); shouldEmitSpace = text.indexOf(ts.tokenToString(21)) < 0; } else { @@ -27818,16 +28202,16 @@ var ts; emitToken(16, node.clauses.end); } function nodeStartPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function nodeEndPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, node2.end); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end); } function nodeEndIsOnSameLineAsNodeStart(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function emitCaseOrDefaultClause(node) { if (node.kind === 241) { @@ -27932,7 +28316,7 @@ var ts; if (node.parent.kind === 248) { ts.Debug.assert(!!(node.flags & 512) || node.kind === 227); if (modulekind === 1 || modulekind === 2 || modulekind === 3) { - if (!currentSourceFile.symbol.exports["___esModule"]) { + if (!isEs6Module) { if (languageVersion === 1) { write("Object.defineProperty(exports, \"__esModule\", { value: true });"); writeLine(); @@ -28095,12 +28479,18 @@ var ts; return node; } function createPropertyAccessForDestructuringProperty(object, propName) { - var syntheticName = ts.createSynthesizedNode(propName.kind); - syntheticName.text = propName.text; - if (syntheticName.kind !== 69) { - return createElementAccessExpression(object, syntheticName); + var index; + var nameIsComputed = propName.kind === 136; + if (nameIsComputed) { + index = ensureIdentifier(propName.expression, false); } - return createPropertyAccessExpression(object, syntheticName); + else { + index = ts.createSynthesizedNode(propName.kind); + index.text = propName.text; + } + return !nameIsComputed && index.kind === 69 + ? createPropertyAccessExpression(object, index) + : createElementAccessExpression(object, index); } function createSliceCall(value, sliceIndex) { var call = ts.createSynthesizedNode(168); @@ -28514,7 +28904,6 @@ var ts; var promiseConstructor = ts.getEntityNameFromTypeNode(node.type); var isArrowFunction = node.kind === 174; var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0; - var args; if (!isArrowFunction) { write(" {"); increaseIndent(); @@ -29688,8 +30077,8 @@ var ts; } } function tryRenameExternalModule(moduleName) { - if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) { - return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\""; + if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) { + return "\"" + renamedDependencies[moduleName.text] + "\""; } return undefined; } @@ -29829,7 +30218,7 @@ var ts; return; } if (resolver.isReferencedAliasDeclaration(node) || - (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { + (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); var variableDeclarationIsHoisted = shouldHoistVariable(node, true); @@ -30041,7 +30430,7 @@ var ts; function getLocalNameForExternalImport(node) { var namespaceDeclaration = getNamespaceDeclarationNode(node); if (namespaceDeclaration && !isDefaultImport(node)) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name); + return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name); } if (node.kind === 222 && node.importClause) { return getGeneratedNameForNode(node); @@ -30314,7 +30703,7 @@ var ts; ts.getEnclosingBlockScopeContainer(node).kind === 248; } function isCurrentFileSystemExternalModule() { - return modulekind === 4 && ts.isExternalModule(currentSourceFile); + return modulekind === 4 && isCurrentFileExternalModule; } function emitSystemModuleBody(node, dependencyGroups, startIndex) { emitVariableDeclarationsForImports(); @@ -30427,15 +30816,19 @@ var ts; writeLine(); write("}"); } - function emitSystemModule(node) { + function writeModuleName(node, emitRelativePathAsModuleName) { + var moduleName = node.moduleName; + if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) { + write("\"" + moduleName + "\", "); + } + } + function emitSystemModule(node, emitRelativePathAsModuleName) { collectExternalModuleInfo(node); ts.Debug.assert(!exportFunctionForFile); exportFunctionForFile = makeUniqueName("exports"); writeLine(); write("System.register("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } + writeModuleName(node, emitRelativePathAsModuleName); write("["); var groupIndices = {}; var dependencyGroups = []; @@ -30453,6 +30846,12 @@ var ts; if (i !== 0) { write(", "); } + if (emitRelativePathAsModuleName) { + var name_30 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]); + if (name_30) { + text = "\"" + name_30 + "\""; + } + } write(text); } write("], function(" + exportFunctionForFile + ") {"); @@ -30466,7 +30865,7 @@ var ts; writeLine(); write("});"); } - function getAMDDependencyNames(node, includeNonAmdDependencies) { + function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { var aliasedModuleNames = []; var unaliasedModuleNames = []; var importAliasNames = []; @@ -30483,6 +30882,12 @@ var ts; for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) { var importNode = externalImports_4[_c]; var externalModuleName = getExternalModuleNameText(importNode); + if (emitRelativePathAsModuleName) { + var name_31 = getExternalModuleNameFromDeclaration(host, resolver, importNode); + if (name_31) { + externalModuleName = "\"" + name_31 + "\""; + } + } var importAliasName = getLocalNameForExternalImport(importNode); if (includeNonAmdDependencies && importAliasName) { aliasedModuleNames.push(externalModuleName); @@ -30494,8 +30899,8 @@ var ts; } return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames }; } - function emitAMDDependencies(node, includeNonAmdDependencies) { - var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies); + function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { + var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName); emitAMDDependencyList(dependencyNames); write(", "); emitAMDFactoryHeader(dependencyNames); @@ -30522,15 +30927,13 @@ var ts; } write(") {"); } - function emitAMDModule(node) { + function emitAMDModule(node, emitRelativePathAsModuleName) { emitEmitHelpers(node); collectExternalModuleInfo(node); writeLine(); write("define("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } - emitAMDDependencies(node, true); + writeModuleName(node, emitRelativePathAsModuleName); + emitAMDDependencies(node, true, emitRelativePathAsModuleName); increaseIndent(); var startIndex = emitDirectivePrologues(node.statements, true); emitExportStarHelper(); @@ -30736,8 +31139,13 @@ var ts; emitShebang(); emitDetachedCommentsAndUpdateCommentsInfo(node); if (ts.isExternalModule(node) || compilerOptions.isolatedModules) { - var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1]; - emitModule(node); + if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) { + var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1]; + emitModule(node); + } + else { + bundleEmitDelegates[modulekind](node, true); + } } else { var startIndex = emitDirectivePrologues(node.statements, false); @@ -30981,7 +31389,7 @@ var ts; return detachedCommentsInfo !== undefined && ts.lastOrUndefined(detachedCommentsInfo).nodePos === pos; } function getLeadingCommentsWithoutDetachedComments() { - var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); + var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); if (detachedCommentsInfo.length - 1) { detachedCommentsInfo.pop(); } @@ -30991,10 +31399,10 @@ var ts; return leadingComments; } function isTripleSlashComment(comment) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 && + if (currentText.charCodeAt(comment.pos + 1) === 47 && comment.pos + 2 < comment.end && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 47) { - var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end); + currentText.charCodeAt(comment.pos + 2) === 47) { + var textSubStr = currentText.substring(comment.pos, comment.end); return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) || textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ? true : false; @@ -31008,7 +31416,7 @@ var ts; return getLeadingCommentsWithoutDetachedComments(); } else { - return ts.getLeadingCommentRangesOfNode(node, currentSourceFile); + return ts.getLeadingCommentRangesOfNodeFromText(node, currentText); } } } @@ -31016,7 +31424,7 @@ var ts; function getTrailingCommentsToEmit(node) { if (node.parent) { if (node.parent.kind === 248 || node.end !== node.parent.end) { - return ts.getTrailingCommentRanges(currentSourceFile.text, node.end); + return ts.getTrailingCommentRanges(currentText, node.end); } } } @@ -31039,22 +31447,22 @@ var ts; leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment); } } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment); } function emitTrailingComments(node) { if (compilerOptions.removeComments) { return; } var trailingComments = getTrailingCommentsToEmit(node); - ts.emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, false, newLine, writeComment); } function emitTrailingCommentsOfPosition(pos) { if (compilerOptions.removeComments) { return; } - var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos); - ts.emitComments(currentSourceFile, writer, trailingComments, true, newLine, writeComment); + var trailingComments = ts.getTrailingCommentRanges(currentText, pos); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, true, newLine, writeComment); } function emitLeadingCommentsOfPositionWorker(pos) { if (compilerOptions.removeComments) { @@ -31065,13 +31473,13 @@ var ts; leadingComments = getLeadingCommentsWithoutDetachedComments(); } else { - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos); + leadingComments = ts.getLeadingCommentRanges(currentText, pos); } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments); - ts.emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, true, newLine, writeComment); } function emitDetachedCommentsAndUpdateCommentsInfo(node) { - var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, compilerOptions.removeComments); + var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments); if (currentDetachedCommentInfo) { if (detachedCommentsInfo) { detachedCommentsInfo.push(currentDetachedCommentInfo); @@ -31082,12 +31490,12 @@ var ts; } } function emitShebang() { - var shebang = ts.getShebang(currentSourceFile.text); + var shebang = ts.getShebang(currentText); if (shebang) { write(shebang); } } - var _a; + var _a, _b; } function emitFile(jsFilePath, sourceFile) { emitJavaScript(jsFilePath, sourceFile); @@ -31143,11 +31551,11 @@ var ts; if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { var failedLookupLocations = []; var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName)); - var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host); return resolvedFileName ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations }; @@ -31157,8 +31565,8 @@ var ts; } } ts.nodeModuleNameResolver = nodeModuleNameResolver; - function loadNodeModuleFromFile(candidate, failedLookupLocation, host) { - return ts.forEach(ts.moduleFileExtensions, tryLoad); + function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) { + return ts.forEach(extensions, tryLoad); function tryLoad(ext) { var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (host.fileExists(fileName)) { @@ -31170,7 +31578,7 @@ var ts; } } } - function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) { + function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) { var packageJsonPath = ts.combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { var jsonContent; @@ -31182,7 +31590,7 @@ var ts; jsonContent = { typings: undefined }; } if (jsonContent.typings) { - var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); if (result) { return result; } @@ -31191,7 +31599,7 @@ var ts; else { failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host); + return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName, directory, host) { var failedLookupLocations = []; @@ -31201,11 +31609,11 @@ var ts; if (baseName !== "node_modules") { var nodeModulesFolder = ts.combinePaths(directory, "node_modules"); var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } - result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } @@ -31230,9 +31638,10 @@ var ts; var searchName; var failedLookupLocations = []; var referencedSourceFile; + var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions; while (true) { searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName)); - referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) { + referencedSourceFile = ts.forEach(extensions, function (extension) { if (extension === ".tsx" && !compilerOptions.jsx) { return undefined; } @@ -31260,10 +31669,8 @@ var ts; ts.classicNameResolver = classicNameResolver; ts.defaultInitCompilerOptions = { module: 1, - target: 0, + target: 1, noImplicitAny: false, - outDir: "built", - rootDir: ".", sourceMap: false }; function createCompilerHost(options, setParentNodes) { @@ -31621,35 +32028,47 @@ var ts; if (file.imports) { return; } + var isJavaScriptFile = ts.isSourceFileJavaScript(file); var imports; for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { var node = _a[_i]; - collect(node, true); + collect(node, true, false); } file.imports = imports || emptyArray; - function collect(node, allowRelativeModuleNames) { - switch (node.kind) { - case 222: - case 221: - case 228: - var moduleNameExpr = ts.getExternalModuleName(node); - if (!moduleNameExpr || moduleNameExpr.kind !== 9) { + return; + function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) { + if (!collectOnlyRequireCalls) { + switch (node.kind) { + case 222: + case 221: + case 228: + var moduleNameExpr = ts.getExternalModuleName(node); + if (!moduleNameExpr || moduleNameExpr.kind !== 9) { + break; + } + if (!moduleNameExpr.text) { + break; + } + if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { + (imports || (imports = [])).push(moduleNameExpr); + } break; - } - if (!moduleNameExpr.text) { + case 218: + if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) { + ts.forEachChild(node.body, function (node) { + collect(node, false, collectOnlyRequireCalls); + }); + } break; - } - if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { - (imports || (imports = [])).push(moduleNameExpr); - } - break; - case 218: - if (node.name.kind === 9 && (node.flags & 4 || ts.isDeclarationFile(file))) { - ts.forEachChild(node.body, function (node) { - collect(node, false); - }); - } - break; + } + } + if (isJavaScriptFile) { + if (ts.isRequireCall(node)) { + (imports || (imports = [])).push(node.arguments[0]); + } + else { + ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, true); }); + } } } } @@ -31736,7 +32155,6 @@ var ts; } processImportedModules(file, basePath); if (isDefaultLib) { - file.isDefaultLib = true; files.unshift(file); } else { @@ -31809,6 +32227,9 @@ var ts; commonPathComponents.length = sourcePathComponents.length; } }); + if (!commonPathComponents) { + return currentDirectory; + } return ts.getNormalizedPathFromPathComponents(commonPathComponents); } function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) { @@ -31891,10 +32312,12 @@ var ts; if (options.module === 5 && languageVersion < 2) { programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower)); } + if (outFile && options.module && !(options.module === 2 || options.module === 4)) { + programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile")); + } if (options.outDir || options.sourceRoot || - (options.mapRoot && - (!outFile || firstExternalModuleSourceFile !== undefined))) { + options.mapRoot) { if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory); } @@ -32448,10 +32871,10 @@ var ts; ts.forEach(program.getSourceFiles(), function (sourceFile) { cancellationToken.throwIfCancellationRequested(); var nameToDeclarations = sourceFile.getNamedDeclarations(); - for (var name_30 in nameToDeclarations) { - var declarations = ts.getProperty(nameToDeclarations, name_30); + for (var name_32 in nameToDeclarations) { + var declarations = ts.getProperty(nameToDeclarations, name_32); if (declarations) { - var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_30); + var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32); if (!matches) { continue; } @@ -32462,14 +32885,14 @@ var ts; if (!containers) { return undefined; } - matches = patternMatcher.getMatches(containers, name_30); + matches = patternMatcher.getMatches(containers, name_32); if (!matches) { continue; } } var fileName = sourceFile.fileName; var matchKind = bestMatchKind(matches); - rawItems.push({ name: name_30, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); + rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); } } } @@ -32797,9 +33220,9 @@ var ts; case 211: case 163: var variableDeclarationNode; - var name_31; + var name_33; if (node.kind === 163) { - name_31 = node.name; + name_33 = node.name; variableDeclarationNode = node; while (variableDeclarationNode && variableDeclarationNode.kind !== 211) { variableDeclarationNode = variableDeclarationNode.parent; @@ -32809,16 +33232,16 @@ var ts; else { ts.Debug.assert(!ts.isBindingPattern(node.name)); variableDeclarationNode = node; - name_31 = node.name; + name_33 = node.name; } if (ts.isConst(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.constElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement); } else if (ts.isLet(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.letElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement); } else { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.variableElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement); } case 144: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); @@ -33425,7 +33848,7 @@ var ts; var resolvedSignature = typeChecker.getResolvedSignature(call, candidates); cancellationToken.throwIfCancellationRequested(); if (!candidates.length) { - if (ts.isJavaScript(sourceFile.fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { return createJavaScriptSignatureHelpItems(argumentInfo); } return undefined; @@ -34941,9 +35364,9 @@ var ts; } Rules.prototype.getRuleName = function (rule) { var o = this; - for (var name_32 in o) { - if (o[name_32] === rule) { - return name_32; + for (var name_34 in o) { + if (o[name_34] === rule) { + return name_34; } } throw new Error("Unknown rule"); @@ -35318,7 +35741,7 @@ var ts; function TokenRangeAccess(from, to, except) { this.tokens = []; for (var token = from; token <= to; token++) { - if (except.indexOf(token) < 0) { + if (ts.indexOf(except, token) < 0) { this.tokens.push(token); } } @@ -36706,13 +37129,18 @@ var ts; ]; var jsDocCompletionEntries; function createNode(kind, pos, end, flags, parent) { - var node = new (ts.getNodeConstructor(kind))(pos, end); + var node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; } var NodeObject = (function () { - function NodeObject() { + function NodeObject(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0; + this.parent = undefined; } NodeObject.prototype.getSourceFile = function () { return ts.getSourceFileOfNode(this); @@ -37151,8 +37579,8 @@ var ts; })(); var SourceFileObject = (function (_super) { __extends(SourceFileObject, _super); - function SourceFileObject() { - _super.apply(this, arguments); + function SourceFileObject(kind, pos, end) { + _super.call(this, kind, pos, end); } SourceFileObject.prototype.update = function (newText, textChangeRange) { return ts.updateSourceFile(this, newText, textChangeRange); @@ -37421,6 +37849,9 @@ var ts; ClassificationTypeNames.typeAliasName = "type alias name"; ClassificationTypeNames.parameterName = "parameter name"; ClassificationTypeNames.docCommentTagName = "doc comment tag name"; + ClassificationTypeNames.jsxOpenTagName = "jsx open tag name"; + ClassificationTypeNames.jsxCloseTagName = "jsx close tag name"; + ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name"; return ClassificationTypeNames; })(); ts.ClassificationTypeNames = ClassificationTypeNames; @@ -37740,8 +38171,9 @@ var ts; }; } ts.createDocumentRegistry = createDocumentRegistry; - function preProcessFile(sourceText, readImportFiles) { + function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) { if (readImportFiles === void 0) { readImportFiles = true; } + if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; } var referencedFiles = []; var importedFiles = []; var ambientExternalModules; @@ -37775,62 +38207,70 @@ var ts; end: pos + importPath.length }); } - function processImport() { - scanner.setText(sourceText); - var token = scanner.scan(); - while (token !== 1) { - if (token === 122) { + function tryConsumeDeclare() { + var token = scanner.getToken(); + if (token === 122) { + token = scanner.scan(); + if (token === 125) { token = scanner.scan(); - if (token === 125) { - token = scanner.scan(); - if (token === 9) { - recordAmbientExternalModule(); - continue; - } + if (token === 9) { + recordAmbientExternalModule(); } } - else if (token === 89) { - token = scanner.scan(); - if (token === 9) { - recordModuleName(); - continue; + return true; + } + return false; + } + function tryConsumeImport() { + var token = scanner.getToken(); + if (token === 89) { + token = scanner.scan(); + if (token === 9) { + recordModuleName(); + return true; + } + else { + if (token === 69 || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 133) { + token = scanner.scan(); + if (token === 9) { + recordModuleName(); + return true; + } + } + else if (token === 56) { + if (tryConsumeRequireCall(true)) { + return true; + } + } + else if (token === 24) { + token = scanner.scan(); + } + else { + return true; + } } - else { - if (token === 69 || ts.isKeyword(token)) { + if (token === 15) { + token = scanner.scan(); + while (token !== 16 && token !== 1) { + token = scanner.scan(); + } + if (token === 16) { token = scanner.scan(); if (token === 133) { token = scanner.scan(); if (token === 9) { recordModuleName(); - continue; } } - else if (token === 56) { - token = scanner.scan(); - if (token === 127) { - token = scanner.scan(); - if (token === 17) { - token = scanner.scan(); - if (token === 9) { - recordModuleName(); - continue; - } - } - } - } - else if (token === 24) { - token = scanner.scan(); - } - else { - continue; - } } - if (token === 15) { + } + else if (token === 37) { + token = scanner.scan(); + if (token === 116) { token = scanner.scan(); - while (token !== 16) { - token = scanner.scan(); - } - if (token === 16) { + if (token === 69 || ts.isKeyword(token)) { token = scanner.scan(); if (token === 133) { token = scanner.scan(); @@ -37840,41 +38280,22 @@ var ts; } } } - else if (token === 37) { - token = scanner.scan(); - if (token === 116) { - token = scanner.scan(); - if (token === 69 || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 133) { - token = scanner.scan(); - if (token === 9) { - recordModuleName(); - } - } - } - } - } } } - else if (token === 82) { + return true; + } + return false; + } + function tryConsumeExport() { + var token = scanner.getToken(); + if (token === 82) { + token = scanner.scan(); + if (token === 15) { token = scanner.scan(); - if (token === 15) { + while (token !== 16 && token !== 1) { token = scanner.scan(); - while (token !== 16) { - token = scanner.scan(); - } - if (token === 16) { - token = scanner.scan(); - if (token === 133) { - token = scanner.scan(); - if (token === 9) { - recordModuleName(); - } - } - } } - else if (token === 37) { + if (token === 16) { token = scanner.scan(); if (token === 133) { token = scanner.scan(); @@ -37883,31 +38304,99 @@ var ts; } } } - else if (token === 89) { + } + else if (token === 37) { + token = scanner.scan(); + if (token === 133) { token = scanner.scan(); - if (token === 69 || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 56) { - token = scanner.scan(); - if (token === 127) { - token = scanner.scan(); - if (token === 17) { - token = scanner.scan(); - if (token === 9) { - recordModuleName(); - } - } - } + if (token === 9) { + recordModuleName(); + } + } + } + else if (token === 89) { + token = scanner.scan(); + if (token === 69 || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 56) { + if (tryConsumeRequireCall(true)) { + return true; } } } } + return true; + } + return false; + } + function tryConsumeRequireCall(skipCurrentToken) { + var token = skipCurrentToken ? scanner.scan() : scanner.getToken(); + if (token === 127) { + token = scanner.scan(); + if (token === 17) { + token = scanner.scan(); + if (token === 9) { + recordModuleName(); + } + } + return true; + } + return false; + } + function tryConsumeDefine() { + var token = scanner.getToken(); + if (token === 69 && scanner.getTokenValue() === "define") { + token = scanner.scan(); + if (token !== 17) { + return true; + } + token = scanner.scan(); + if (token === 9) { + token = scanner.scan(); + if (token === 24) { + token = scanner.scan(); + } + else { + return true; + } + } + if (token !== 19) { + return true; + } token = scanner.scan(); + var i = 0; + while (token !== 20 && token !== 1) { + if (token === 9) { + recordModuleName(); + i++; + } + token = scanner.scan(); + } + return true; + } + return false; + } + function processImports() { + scanner.setText(sourceText); + scanner.scan(); + while (true) { + if (scanner.getToken() === 1) { + break; + } + if (tryConsumeDeclare() || + tryConsumeImport() || + tryConsumeExport() || + (detectJavaScriptImports && (tryConsumeRequireCall(false) || tryConsumeDefine()))) { + continue; + } + else { + scanner.scan(); + } } scanner.setText(undefined); } if (readImportFiles) { - processImport(); + processImports(); } processTripleSlashDirectives(); return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules }; @@ -38250,7 +38739,7 @@ var ts; function getSemanticDiagnostics(fileName) { synchronizeHostData(); var targetSourceFile = getValidSourceFile(fileName); - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(targetSourceFile)) { return getJavaScriptSemanticDiagnostics(targetSourceFile); } var semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); @@ -38442,7 +38931,7 @@ var ts; var typeChecker = program.getTypeChecker(); var syntacticStart = new Date().getTime(); var sourceFile = getValidSourceFile(fileName); - var isJavaScriptFile = ts.isJavaScript(fileName); + var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile); var isJsDocTagName = false; var start = new Date().getTime(); var currentToken = ts.getTokenAtPosition(sourceFile, position); @@ -38953,8 +39442,8 @@ var ts; if (element.getStart() <= position && position <= element.getEnd()) { continue; } - var name_33 = element.propertyName || element.name; - exisingImportsOrExports[name_33.text] = true; + var name_35 = element.propertyName || element.name; + exisingImportsOrExports[name_35.text] = true; } if (ts.isEmpty(exisingImportsOrExports)) { return exportsOfModule; @@ -38978,7 +39467,9 @@ var ts; } var existingName = void 0; if (m.kind === 163 && m.propertyName) { - existingName = m.propertyName.text; + if (m.propertyName.kind === 69) { + existingName = m.propertyName.text; + } } else { existingName = m.name.text; @@ -39008,44 +39499,41 @@ var ts; return undefined; } var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName; - var entries; if (isJsDocTagName) { return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - if (isRightOfDot && ts.isJavaScript(fileName)) { - entries = getCompletionEntriesFromSymbols(symbols); - ts.addRange(entries, getJavaScriptCompletionEntries()); + var sourceFile = getValidSourceFile(fileName); + var entries = []; + if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) { + var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); + ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames)); } else { if (!symbols || symbols.length === 0) { return undefined; } - entries = getCompletionEntriesFromSymbols(symbols); + getCompletionEntriesFromSymbols(symbols, entries); } if (!isMemberCompletion && !isJsDocTagName) { ts.addRange(entries, keywordCompletions); } return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries }; - function getJavaScriptCompletionEntries() { + function getJavaScriptCompletionEntries(sourceFile, uniqueNames) { var entries = []; - var allNames = {}; var target = program.getCompilerOptions().target; - for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) { - var sourceFile = _a[_i]; - var nameTable = getNameTable(sourceFile); - for (var name_34 in nameTable) { - if (!allNames[name_34]) { - allNames[name_34] = name_34; - var displayName = getCompletionEntryDisplayName(name_34, target, true); - if (displayName) { - var entry = { - name: displayName, - kind: ScriptElementKind.warning, - kindModifiers: "", - sortText: "1" - }; - entries.push(entry); - } + var nameTable = getNameTable(sourceFile); + for (var name_36 in nameTable) { + if (!uniqueNames[name_36]) { + uniqueNames[name_36] = name_36; + var displayName = getCompletionEntryDisplayName(name_36, target, true); + if (displayName) { + var entry = { + name: displayName, + kind: ScriptElementKind.warning, + kindModifiers: "", + sortText: "1" + }; + entries.push(entry); } } } @@ -39073,25 +39561,24 @@ var ts; sortText: "0" }; } - function getCompletionEntriesFromSymbols(symbols) { + function getCompletionEntriesFromSymbols(symbols, entries) { var start = new Date().getTime(); - var entries = []; + var uniqueNames = {}; if (symbols) { - var nameToSymbol = {}; for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) { var symbol = symbols_3[_i]; var entry = createCompletionEntry(symbol, location); if (entry) { var id = ts.escapeIdentifier(entry.name); - if (!ts.lookUp(nameToSymbol, id)) { + if (!ts.lookUp(uniqueNames, id)) { entries.push(entry); - nameToSymbol[id] = symbol; + uniqueNames[id] = id; } } } } log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start)); - return entries; + return uniqueNames; } } function getCompletionEntryDetails(fileName, position, entryName) { @@ -39272,16 +39759,16 @@ var ts; case ScriptElementKind.letElement: case ScriptElementKind.parameterElement: case ScriptElementKind.localVariableElement: - displayParts.push(ts.punctuationPart(54)); + displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken)); displayParts.push(ts.spacePart()); if (useConstructSignatures) { - displayParts.push(ts.keywordPart(92)); + displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword)); displayParts.push(ts.spacePart()); } - if (!(type.flags & 65536)) { - ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, 1)); + if (!(type.flags & ts.TypeFlags.Anonymous)) { + ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments)); } - addSignatureDisplayParts(signature, allSignatures, 8); + addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature); break; default: addSignatureDisplayParts(signature, allSignatures); @@ -40728,17 +41215,17 @@ var ts; if (isNameOfPropertyAssignment(node)) { var objectLiteral = node.parent.parent; var contextualType = typeChecker.getContextualType(objectLiteral); - var name_35 = node.text; + var name_37 = node.text; if (contextualType) { if (contextualType.flags & 16384) { - var unionProperty = contextualType.getProperty(name_35); + var unionProperty = contextualType.getProperty(name_37); if (unionProperty) { return [unionProperty]; } else { var result_4 = []; ts.forEach(contextualType.types, function (t) { - var symbol = t.getProperty(name_35); + var symbol = t.getProperty(name_37); if (symbol) { result_4.push(symbol); } @@ -40747,7 +41234,7 @@ var ts; } } else { - var symbol_1 = contextualType.getProperty(name_35); + var symbol_1 = contextualType.getProperty(name_37); if (symbol_1) { return [symbol_1]; } @@ -41105,6 +41592,9 @@ var ts; case 16: return ClassificationTypeNames.typeAliasName; case 17: return ClassificationTypeNames.parameterName; case 18: return ClassificationTypeNames.docCommentTagName; + case 19: return ClassificationTypeNames.jsxOpenTagName; + case 20: return ClassificationTypeNames.jsxCloseTagName; + case 21: return ClassificationTypeNames.jsxSelfClosingTagName; } } function convertClassifications(classifications) { @@ -41344,6 +41834,21 @@ var ts; return 17; } return; + case 235: + if (token.parent.tagName === token) { + return 19; + } + return; + case 237: + if (token.parent.tagName === token) { + return 20; + } + return; + case 234: + if (token.parent.tagName === token) { + return 21; + } + return; } } return 2; @@ -42053,18 +42558,8 @@ var ts; ts.getDefaultLibFilePath = getDefaultLibFilePath; function initializeServices() { ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0; - this.parent = undefined; - } - var proto = kind === 248 ? new SourceFileObject() : new NodeObject(); - proto.kind = kind; - Node.prototype = proto; - return Node; - }, + getNodeConstructor: function () { return NodeObject; }, + getSourceFileConstructor: function () { return SourceFileObject; }, getSymbolConstructor: function () { return SymbolObject; }, getTypeConstructor: function () { return TypeObject; }, getSignatureConstructor: function () { return SignatureObject; } @@ -42959,8 +43454,8 @@ var ts; }; Session.prototype.getDiagnosticsForProject = function (delay, fileName) { var _this = this; - var _a = this.getProjectInfo(fileName, true), configFileName = _a.configFileName, fileNamesInProject = _a.fileNames; - fileNamesInProject = fileNamesInProject.filter(function (value, index, array) { return value.indexOf("lib.d.ts") < 0; }); + var _a = this.getProjectInfo(fileName, true), configFileName = _a.configFileName, fileNames = _a.fileNames; + var fileNamesInProject = fileNames.filter(function (value, index, array) { return value.indexOf("lib.d.ts") < 0; }); var highPriorityFiles = []; var mediumPriorityFiles = []; var lowPriorityFiles = []; @@ -43329,6 +43824,9 @@ var ts; this.filenameToSourceFile = {}; this.updateGraphSeq = 0; this.openRefCount = 0; + if (projectOptions && projectOptions.files) { + projectOptions.compilerOptions.allowNonTsExtensions = true; + } this.compilerService = new CompilerService(this, projectOptions && projectOptions.compilerOptions); } Project.prototype.addOpenRef = function () { @@ -43399,6 +43897,7 @@ var ts; Project.prototype.setProjectOptions = function (projectOptions) { this.projectOptions = projectOptions; if (projectOptions.compilerOptions) { + projectOptions.compilerOptions.allowNonTsExtensions = true; this.compilerService.setCompilerOptions(projectOptions.compilerOptions); } }; @@ -43824,7 +44323,6 @@ var ts; } } if (content !== undefined) { - var indentSize; info = new ScriptInfo(this.host, fileName, content, openedByClient); info.setFormatOptions(this.getFormatCodeOptions()); this.filenameToScriptInfo[fileName] = info; @@ -44081,7 +44579,9 @@ var ts; this.setCompilerOptions(opt); } else { - this.setCompilerOptions(ts.getDefaultCompilerOptions()); + var defaultOpts = ts.getDefaultCompilerOptions(); + defaultOpts.allowNonTsExtensions = true; + this.setCompilerOptions(defaultOpts); } this.languageService = ts.createLanguageService(this.host, this.documentRegistry); this.classifier = ts.createClassifier(); @@ -45635,7 +46135,7 @@ var ts; }; CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) { return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () { - var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength())); + var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true); var convertResult = { referencedFiles: [], importedFiles: [], @@ -45696,7 +46196,7 @@ var ts; TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) { try { if (this.documentRegistry === undefined) { - this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames()); + this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); } var hostAdapter = new LanguageServiceShimHostAdapter(host); var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry); @@ -45728,7 +46228,7 @@ var ts; }; TypeScriptServicesFactory.prototype.close = function () { this._shims = []; - this.documentRegistry = ts.createDocumentRegistry(); + this.documentRegistry = undefined; }; TypeScriptServicesFactory.prototype.registerShim = function (shim) { this._shims.push(shim); diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts index 972ebfa472dbd..32a6dee462385 100644 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts @@ -387,6 +387,7 @@ declare namespace ts { right: Identifier; } type EntityName = Identifier | QualifiedName; + type PropertyName = Identifier | LiteralExpression | ComputedPropertyName; type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern; interface Declaration extends Node { _declarationBrand: any; @@ -425,7 +426,7 @@ declare namespace ts { initializer?: Expression; } interface BindingElement extends Declaration { - propertyName?: Identifier; + propertyName?: PropertyName; dotDotDotToken?: Node; name: Identifier | BindingPattern; initializer?: Expression; @@ -452,7 +453,7 @@ declare namespace ts { objectAssignmentInitializer?: Expression; } interface VariableLikeDeclaration extends Declaration { - propertyName?: Identifier; + propertyName?: PropertyName; dotDotDotToken?: Node; name: DeclarationName; questionToken?: Node; @@ -581,7 +582,7 @@ declare namespace ts { asteriskToken?: Node; expression?: Expression; } - interface BinaryExpression extends Expression { + interface BinaryExpression extends Expression, Declaration { left: Expression; operatorToken: Node; right: Expression; @@ -625,7 +626,7 @@ declare namespace ts { interface ObjectLiteralExpression extends PrimaryExpression, Declaration { properties: NodeArray; } - interface PropertyAccessExpression extends MemberExpression { + interface PropertyAccessExpression extends MemberExpression, Declaration { expression: LeftHandSideExpression; dotToken: Node; name: Identifier; @@ -1220,6 +1221,7 @@ declare namespace ts { ObjectLiteral = 524288, ESSymbol = 16777216, ThisType = 33554432, + ObjectLiteralPatternWithComputedProperties = 67108864, StringLike = 258, NumberLike = 132, ObjectType = 80896, @@ -1537,7 +1539,6 @@ declare namespace ts { function getTypeParameterOwner(d: Declaration): Declaration; } declare namespace ts { - function getNodeConstructor(kind: SyntaxKind): new (pos?: number, end?: number) => Node; function createNode(kind: SyntaxKind, pos?: number, end?: number): Node; function forEachChild(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T; function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile; @@ -2126,6 +2127,9 @@ declare namespace ts { static typeAliasName: string; static parameterName: string; static docCommentTagName: string; + static jsxOpenTagName: string; + static jsxCloseTagName: string; + static jsxSelfClosingTagName: string; } enum ClassificationType { comment = 1, @@ -2146,6 +2150,9 @@ declare namespace ts { typeAliasName = 16, parameterName = 17, docCommentTagName = 18, + jsxOpenTagName = 19, + jsxCloseTagName = 20, + jsxSelfClosingTagName = 21, } interface DisplayPartsSymbolWriter extends SymbolWriter { displayParts(): SymbolDisplayPart[]; @@ -2171,7 +2178,7 @@ declare namespace ts { function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile; function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string; function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry; - function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo; + function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo; function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService; function createClassifier(): Classifier; /** diff --git a/lib/typescript.js b/lib/typescript.js index 8b0ef04f96e45..498ddc3786075 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -622,6 +622,7 @@ var ts; TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType"; TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol"; TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType"; + TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties"; /* @internal */ TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic"; /* @internal */ @@ -1530,12 +1531,7 @@ var ts; * List of supported extensions in order of file resolution precedence. */ ts.supportedExtensions = [".ts", ".tsx", ".d.ts"]; - /** - * List of extensions that will be used to look for external modules. - * This list is kept separate from supportedExtensions to for cases when we'll allow to include .js files in compilation, - * but still would like to load only TypeScript files as modules - */ - ts.moduleFileExtensions = ts.supportedExtensions; + ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx"); function isSupportedSourceFileName(fileName) { if (!fileName) { return false; @@ -1586,17 +1582,16 @@ var ts; } function Signature(checker) { } + function Node(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0 /* None */; + this.parent = undefined; + } ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0 /* None */; - this.parent = undefined; - } - Node.prototype = { kind: kind }; - return Node; - }, + getNodeConstructor: function () { return Node; }, + getSourceFileConstructor: function () { return Node; }, getSymbolConstructor: function () { return Symbol; }, getTypeConstructor: function () { return Type; }, getSignatureConstructor: function () { return Signature; } @@ -1913,7 +1908,16 @@ var ts; if (writeByteOrderMark) { data = "\uFEFF" + data; } - _fs.writeFileSync(fileName, data, "utf8"); + var fd; + try { + fd = _fs.openSync(fileName, "w"); + _fs.writeSync(fd, data, undefined, "utf8"); + } + finally { + if (fd !== undefined) { + _fs.closeSync(fd); + } + } } function getCanonicalPath(path) { return useCaseSensitiveFileNames ? path.toLowerCase() : path; @@ -2614,6 +2618,7 @@ var ts; Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." }, Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" }, Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." }, + Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." }, @@ -3173,7 +3178,7 @@ var ts; function getCommentRanges(text, pos, trailing) { var result; var collecting = trailing || pos === 0; - while (true) { + while (pos < text.length) { var ch = text.charCodeAt(pos); switch (ch) { case 13 /* carriageReturn */: @@ -3242,6 +3247,7 @@ var ts; } return result; } + return result; } function getLeadingCommentRanges(text, pos) { return getCommentRanges(text, pos, /*trailing*/ false); @@ -3343,7 +3349,7 @@ var ts; error(ts.Diagnostics.Digit_expected); } } - return +(text.substring(start, end)); + return "" + +(text.substring(start, end)); } function scanOctalDigits() { var start = pos; @@ -3770,7 +3776,7 @@ var ts; return pos++, token = 36 /* MinusToken */; case 46 /* dot */: if (isDigit(text.charCodeAt(pos + 1))) { - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8 /* NumericLiteral */; } if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) { @@ -3873,7 +3879,7 @@ var ts; case 55 /* _7 */: case 56 /* _8 */: case 57 /* _9 */: - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8 /* NumericLiteral */; case 58 /* colon */: return pos++, token = 54 /* ColonToken */; @@ -4177,1558 +4183,243 @@ var ts; } ts.createScanner = createScanner; })(ts || (ts = {})); -/// +/// /* @internal */ var ts; (function (ts) { - ts.bindTime = 0; - (function (ModuleInstanceState) { - ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated"; - ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated"; - ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly"; - })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {})); - var ModuleInstanceState = ts.ModuleInstanceState; - var Reachability; - (function (Reachability) { - Reachability[Reachability["Unintialized"] = 1] = "Unintialized"; - Reachability[Reachability["Reachable"] = 2] = "Reachable"; - Reachability[Reachability["Unreachable"] = 4] = "Unreachable"; - Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable"; - })(Reachability || (Reachability = {})); - function or(state1, state2) { - return (state1 | state2) & 2 /* Reachable */ - ? 2 /* Reachable */ - : (state1 & state2) & 8 /* ReportedUnreachable */ - ? 8 /* ReportedUnreachable */ - : 4 /* Unreachable */; - } - function getModuleInstanceState(node) { - // A module is uninstantiated if it contains only - // 1. interface declarations, type alias declarations - if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) { - return 0 /* NonInstantiated */; + function getDeclarationOfKind(symbol, kind) { + var declarations = symbol.declarations; + if (declarations) { + for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { + var declaration = declarations_1[_i]; + if (declaration.kind === kind) { + return declaration; + } + } } - else if (ts.isConstEnumDeclaration(node)) { - return 2 /* ConstEnumOnly */; + return undefined; + } + ts.getDeclarationOfKind = getDeclarationOfKind; + // Pool writers to avoid needing to allocate them for every symbol we write. + var stringWriters = []; + function getSingleLineStringWriter() { + if (stringWriters.length === 0) { + var str = ""; + var writeText = function (text) { return str += text; }; + return { + string: function () { return str; }, + writeKeyword: writeText, + writeOperator: writeText, + writePunctuation: writeText, + writeSpace: writeText, + writeStringLiteral: writeText, + writeParameter: writeText, + writeSymbol: writeText, + // Completely ignore indentation for string writers. And map newlines to + // a single space. + writeLine: function () { return str += " "; }, + increaseIndent: function () { }, + decreaseIndent: function () { }, + clear: function () { return str = ""; }, + trackSymbol: function () { }, + reportInaccessibleThisError: function () { } + }; } - else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) { - return 0 /* NonInstantiated */; + return stringWriters.pop(); + } + ts.getSingleLineStringWriter = getSingleLineStringWriter; + function releaseStringWriter(writer) { + writer.clear(); + stringWriters.push(writer); + } + ts.releaseStringWriter = releaseStringWriter; + function getFullWidth(node) { + return node.end - node.pos; + } + ts.getFullWidth = getFullWidth; + function arrayIsEqualTo(array1, array2, equaler) { + if (!array1 || !array2) { + return array1 === array2; } - else if (node.kind === 219 /* ModuleBlock */) { - var state = 0 /* NonInstantiated */; - ts.forEachChild(node, function (n) { - switch (getModuleInstanceState(n)) { - case 0 /* NonInstantiated */: - // child is non-instantiated - continue searching - return false; - case 2 /* ConstEnumOnly */: - // child is const enum only - record state and continue searching - state = 2 /* ConstEnumOnly */; - return false; - case 1 /* Instantiated */: - // child is instantiated - record state and stop - state = 1 /* Instantiated */; - return true; - } - }); - return state; + if (array1.length !== array2.length) { + return false; } - else if (node.kind === 218 /* ModuleDeclaration */) { - return getModuleInstanceState(node.body); + for (var i = 0; i < array1.length; ++i) { + var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; + if (!equals) { + return false; + } } - else { - return 1 /* Instantiated */; + return true; + } + ts.arrayIsEqualTo = arrayIsEqualTo; + function hasResolvedModule(sourceFile, moduleNameText) { + return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); + } + ts.hasResolvedModule = hasResolvedModule; + function getResolvedModule(sourceFile, moduleNameText) { + return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; + } + ts.getResolvedModule = getResolvedModule; + function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { + if (!sourceFile.resolvedModules) { + sourceFile.resolvedModules = {}; } + sourceFile.resolvedModules[moduleNameText] = resolvedModule; } - ts.getModuleInstanceState = getModuleInstanceState; - var ContainerFlags; - (function (ContainerFlags) { - // The current node is not a container, and no container manipulation should happen before - // recursing into it. - ContainerFlags[ContainerFlags["None"] = 0] = "None"; - // The current node is a container. It should be set as the current container (and block- - // container) before recursing into it. The current node does not have locals. Examples: - // - // Classes, ObjectLiterals, TypeLiterals, Interfaces... - ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer"; - // The current node is a block-scoped-container. It should be set as the current block- - // container before recursing into it. Examples: - // - // Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements... - ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer"; - ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals"; - // If the current node is a container that also container that also contains locals. Examples: - // - // Functions, Methods, Modules, Source-files. - ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals"; - })(ContainerFlags || (ContainerFlags = {})); - var binder = createBinder(); - function bindSourceFile(file, options) { - var start = new Date().getTime(); - binder(file, options); - ts.bindTime += new Date().getTime() - start; + ts.setResolvedModule = setResolvedModule; + // Returns true if this node contains a parse error anywhere underneath it. + function containsParseError(node) { + aggregateChildData(node); + return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0; } - ts.bindSourceFile = bindSourceFile; - function createBinder() { - var file; - var options; - var parent; - var container; - var blockScopeContainer; - var lastContainer; - var seenThisKeyword; - // state used by reachability checks - var hasExplicitReturn; - var currentReachabilityState; - var labelStack; - var labelIndexMap; - var implicitLabels; - // If this file is an external module, then it is automatically in strict-mode according to - // ES6. If it is not an external module, then we'll determine if it is in strict mode or - // not depending on if we see "use strict" in certain places (or if we hit a class/namespace). - var inStrictMode; - var symbolCount = 0; - var Symbol; - var classifiableNames; - function bindSourceFile(f, opts) { - file = f; - options = opts; - inStrictMode = !!file.externalModuleIndicator; - classifiableNames = {}; - Symbol = ts.objectAllocator.getSymbolConstructor(); - if (!file.locals) { - bind(file); - file.symbolCount = symbolCount; - file.classifiableNames = classifiableNames; + ts.containsParseError = containsParseError; + function aggregateChildData(node) { + if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) { + // A node is considered to contain a parse error if: + // a) the parser explicitly marked that it had an error + // b) any of it's children reported that it had an error. + var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) || + ts.forEachChild(node, containsParseError); + // If so, mark ourselves accordingly. + if (thisNodeOrAnySubNodesHasError) { + node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */; } - parent = undefined; - container = undefined; - blockScopeContainer = undefined; - lastContainer = undefined; - seenThisKeyword = false; - hasExplicitReturn = false; - labelStack = undefined; - labelIndexMap = undefined; - implicitLabels = undefined; + // Also mark that we've propogated the child information to this node. This way we can + // always consult the bit directly on this node without needing to check its children + // again. + node.parserContextFlags |= 128 /* HasAggregatedChildData */; } - return bindSourceFile; - function createSymbol(flags, name) { - symbolCount++; - return new Symbol(flags, name); + } + function getSourceFileOfNode(node) { + while (node && node.kind !== 248 /* SourceFile */) { + node = node.parent; } - function addDeclarationToSymbol(symbol, node, symbolFlags) { - symbol.flags |= symbolFlags; - node.symbol = symbol; - if (!symbol.declarations) { - symbol.declarations = []; - } - symbol.declarations.push(node); - if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) { - symbol.exports = {}; - } - if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) { - symbol.members = {}; - } - if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) { - symbol.valueDeclaration = node; - } + return node; + } + ts.getSourceFileOfNode = getSourceFileOfNode; + function getStartPositionOfLine(line, sourceFile) { + ts.Debug.assert(line >= 0); + return ts.getLineStarts(sourceFile)[line]; + } + ts.getStartPositionOfLine = getStartPositionOfLine; + // This is a useful function for debugging purposes. + function nodePosToString(node) { + var file = getSourceFileOfNode(node); + var loc = ts.getLineAndCharacterOfPosition(file, node.pos); + return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; + } + ts.nodePosToString = nodePosToString; + function getStartPosOfNode(node) { + return node.pos; + } + ts.getStartPosOfNode = getStartPosOfNode; + // Returns true if this node is missing from the actual source code. A 'missing' node is different + // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes + // in the tree), it is definitely missing. However, a node may be defined, but still be + // missing. This happens whenever the parser knows it needs to parse something, but can't + // get anything in the source code that it expects at that location. For example: + // + // let a: ; + // + // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source + // code). So the parser will attempt to parse out a type, and will create an actual node. + // However, this node will be 'missing' in the sense that no actual source-code/tokens are + // contained within it. + function nodeIsMissing(node) { + if (!node) { + return true; } - // Should not be called on a declaration with a computed property name, - // unless it is a well known Symbol. - function getDeclarationName(node) { - if (node.name) { - if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) { - return "\"" + node.name.text + "\""; - } - if (node.name.kind === 136 /* ComputedPropertyName */) { - var nameExpression = node.name.expression; - ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression)); - return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text); - } - return node.name.text; - } - switch (node.kind) { - case 144 /* Constructor */: - return "__constructor"; - case 152 /* FunctionType */: - case 147 /* CallSignature */: - return "__call"; - case 153 /* ConstructorType */: - case 148 /* ConstructSignature */: - return "__new"; - case 149 /* IndexSignature */: - return "__index"; - case 228 /* ExportDeclaration */: - return "__export"; - case 227 /* ExportAssignment */: - return node.isExportEquals ? "export=" : "default"; - case 213 /* FunctionDeclaration */: - case 214 /* ClassDeclaration */: - return node.flags & 512 /* Default */ ? "default" : undefined; - } + return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */; + } + ts.nodeIsMissing = nodeIsMissing; + function nodeIsPresent(node) { + return !nodeIsMissing(node); + } + ts.nodeIsPresent = nodeIsPresent; + function getTokenPosOfNode(node, sourceFile) { + // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't* + // want to skip trivia because this will launch us forward to the next token. + if (nodeIsMissing(node)) { + return node.pos; } - function getDisplayName(node) { - return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node); + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); + } + ts.getTokenPosOfNode = getTokenPosOfNode; + function getNonDecoratorTokenPosOfNode(node, sourceFile) { + if (nodeIsMissing(node) || !node.decorators) { + return getTokenPosOfNode(node, sourceFile); } - /** - * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names. - * @param symbolTable - The symbol table which node will be added to. - * @param parent - node's parent declaration. - * @param node - The declaration to be added to the symbol table - * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.) - * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations. - */ - function declareSymbol(symbolTable, parent, node, includes, excludes) { - ts.Debug.assert(!ts.hasDynamicName(node)); - var isDefaultExport = node.flags & 512 /* Default */; - // The exported symbol for an export default function/class node is always named "default" - var name = isDefaultExport && parent ? "default" : getDeclarationName(node); - var symbol; - if (name !== undefined) { - // Check and see if the symbol table already has a symbol with this name. If not, - // create a new symbol with this name and add it to the table. Note that we don't - // give the new symbol any flags *yet*. This ensures that it will not conflict - // with the 'excludes' flags we pass in. - // - // If we do get an existing symbol, see if it conflicts with the new symbol we're - // creating. For example, a 'var' symbol and a 'class' symbol will conflict within - // the same symbol table. If we have a conflict, report the issue on each - // declaration we have for this symbol, and then create a new symbol for this - // declaration. - // - // If we created a new symbol, either because we didn't have a symbol with this name - // in the symbol table, or we conflicted with an existing symbol, then just add this - // node as the sole declaration of the new symbol. - // - // Otherwise, we'll be merging into a compatible existing symbol (for example when - // you have multiple 'vars' with the same name in the same container). In this case - // just add this node into the declarations list of the symbol. - symbol = ts.hasProperty(symbolTable, name) - ? symbolTable[name] - : (symbolTable[name] = createSymbol(0 /* None */, name)); - if (name && (includes & 788448 /* Classifiable */)) { - classifiableNames[name] = name; - } - if (symbol.flags & excludes) { - if (node.name) { - node.name.parent = node; - } - // Report errors every position with duplicate declaration - // Report errors on previous encountered declarations - var message = symbol.flags & 2 /* BlockScopedVariable */ - ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 - : ts.Diagnostics.Duplicate_identifier_0; - ts.forEach(symbol.declarations, function (declaration) { - if (declaration.flags & 512 /* Default */) { - message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports; - } - }); - ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); - }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); - symbol = createSymbol(0 /* None */, name); - } - } - else { - symbol = createSymbol(0 /* None */, "__missing"); - } - addDeclarationToSymbol(symbol, node, includes); - symbol.parent = parent; - return symbol; + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); + } + ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; + function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + if (nodeIsMissing(node)) { + return ""; } - function declareModuleMember(node, symbolFlags, symbolExcludes) { - var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */; - if (symbolFlags & 8388608 /* Alias */) { - if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) { - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } + var text = sourceFile.text; + return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); + } + ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; + function getTextOfNodeFromSourceText(sourceText, node) { + if (nodeIsMissing(node)) { + return ""; + } + return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); + } + ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; + function getTextOfNode(node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); + } + ts.getTextOfNode = getTextOfNode; + // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' + function escapeIdentifier(identifier) { + return identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier; + } + ts.escapeIdentifier = escapeIdentifier; + // Remove extra underscore from escaped identifier + function unescapeIdentifier(identifier) { + return identifier.length >= 3 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ && identifier.charCodeAt(2) === 95 /* _ */ ? identifier.substr(1) : identifier; + } + ts.unescapeIdentifier = unescapeIdentifier; + // Make an identifier from an external module name by extracting the string after the last "/" and replacing + // all non-alphanumeric characters with underscores + function makeIdentifierFromModuleName(moduleName) { + return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); + } + ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + // Gets the nearest enclosing block scope container that has the provided node + // as a descendant, that is not the provided node. + function getEnclosingBlockScopeContainer(node) { + var current = node.parent; + while (current) { + if (isFunctionLike(current)) { + return current; } - else { - // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue, - // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set - // on it. There are 2 main reasons: - // - // 1. We treat locals and exports of the same name as mutually exclusive within a container. - // That means the binder will issue a Duplicate Identifier error if you mix locals and exports - // with the same name in the same container. - // TODO: Make this a more specific error and decouple it from the exclusion logic. - // 2. When we checkIdentifier in the checker, we set its resolved symbol to the local symbol, - // but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way - // when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope. - if (hasExportModifier || container.flags & 131072 /* ExportContext */) { - var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) | - (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) | - (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0); - var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes); - local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - node.localSymbol = local; - return local; - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } + switch (current.kind) { + case 248 /* SourceFile */: + case 220 /* CaseBlock */: + case 244 /* CatchClause */: + case 218 /* ModuleDeclaration */: + case 199 /* ForStatement */: + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + return current; + case 192 /* Block */: + // function block is not considered block-scope container + // see comment in binder.ts: bind(...), case for SyntaxKind.Block + if (!isFunctionLike(current.parent)) { + return current; + } } - } - // All container nodes are kept on a linked list in declaration order. This list is used by - // the getLocalNameOfContainer function in the type checker to validate that the local name - // used for a container is unique. - function bindChildren(node) { - // Before we recurse into a node's chilren, we first save the existing parent, container - // and block-container. Then after we pop out of processing the children, we restore - // these saved values. - var saveParent = parent; - var saveContainer = container; - var savedBlockScopeContainer = blockScopeContainer; - // This node will now be set as the parent of all of its children as we recurse into them. - parent = node; - // Depending on what kind of node this is, we may have to adjust the current container - // and block-container. If the current node is a container, then it is automatically - // considered the current block-container as well. Also, for containers that we know - // may contain locals, we proactively initialize the .locals field. We do this because - // it's highly likely that the .locals will be needed to place some child in (for example, - // a parameter, or variable declaration). - // - // However, we do not proactively create the .locals for block-containers because it's - // totally normal and common for block-containers to never actually have a block-scoped - // variable in them. We don't want to end up allocating an object for every 'block' we - // run into when most of them won't be necessary. - // - // Finally, if this is a block-container, then we clear out any existing .locals object - // it may contain within it. This happens in incremental scenarios. Because we can be - // reusing a node from a previous compilation, that node may have had 'locals' created - // for it. We must clear this so we don't accidently move any stale data forward from - // a previous compilation. - var containerFlags = getContainerFlags(node); - if (containerFlags & 1 /* IsContainer */) { - container = blockScopeContainer = node; - if (containerFlags & 4 /* HasLocals */) { - container.locals = {}; - } - addToContainerChain(container); - } - else if (containerFlags & 2 /* IsBlockScopedContainer */) { - blockScopeContainer = node; - blockScopeContainer.locals = undefined; - } - var savedReachabilityState; - var savedLabelStack; - var savedLabels; - var savedImplicitLabels; - var savedHasExplicitReturn; - var kind = node.kind; - var flags = node.flags; - // reset all reachability check related flags on node (for incremental scenarios) - flags &= ~1572864 /* ReachabilityCheckFlags */; - if (kind === 215 /* InterfaceDeclaration */) { - seenThisKeyword = false; - } - var saveState = kind === 248 /* SourceFile */ || kind === 219 /* ModuleBlock */ || ts.isFunctionLikeKind(kind); - if (saveState) { - savedReachabilityState = currentReachabilityState; - savedLabelStack = labelStack; - savedLabels = labelIndexMap; - savedImplicitLabels = implicitLabels; - savedHasExplicitReturn = hasExplicitReturn; - currentReachabilityState = 2 /* Reachable */; - hasExplicitReturn = false; - labelStack = labelIndexMap = implicitLabels = undefined; - } - bindReachableStatement(node); - if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) { - flags |= 524288 /* HasImplicitReturn */; - if (hasExplicitReturn) { - flags |= 1048576 /* HasExplicitReturn */; - } - } - if (kind === 215 /* InterfaceDeclaration */) { - flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */; - } - node.flags = flags; - if (saveState) { - hasExplicitReturn = savedHasExplicitReturn; - currentReachabilityState = savedReachabilityState; - labelStack = savedLabelStack; - labelIndexMap = savedLabels; - implicitLabels = savedImplicitLabels; - } - container = saveContainer; - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; - } - /** - * Returns true if node and its subnodes were successfully traversed. - * Returning false means that node was not examined and caller needs to dive into the node himself. - */ - function bindReachableStatement(node) { - if (checkUnreachable(node)) { - ts.forEachChild(node, bind); - return; - } - switch (node.kind) { - case 198 /* WhileStatement */: - bindWhileStatement(node); - break; - case 197 /* DoStatement */: - bindDoStatement(node); - break; - case 199 /* ForStatement */: - bindForStatement(node); - break; - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - bindForInOrForOfStatement(node); - break; - case 196 /* IfStatement */: - bindIfStatement(node); - break; - case 204 /* ReturnStatement */: - case 208 /* ThrowStatement */: - bindReturnOrThrow(node); - break; - case 203 /* BreakStatement */: - case 202 /* ContinueStatement */: - bindBreakOrContinueStatement(node); - break; - case 209 /* TryStatement */: - bindTryStatement(node); - break; - case 206 /* SwitchStatement */: - bindSwitchStatement(node); - break; - case 220 /* CaseBlock */: - bindCaseBlock(node); - break; - case 207 /* LabeledStatement */: - bindLabeledStatement(node); - break; - default: - ts.forEachChild(node, bind); - break; - } - } - function bindWhileStatement(n) { - var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - // bind expressions (don't affect reachability) - bind(n.expression); - currentReachabilityState = preWhileState; - var postWhileLabel = pushImplicitLabel(); - bind(n.statement); - popImplicitLabel(postWhileLabel, postWhileState); - } - function bindDoStatement(n) { - var preDoState = currentReachabilityState; - var postDoLabel = pushImplicitLabel(); - bind(n.statement); - var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState; - popImplicitLabel(postDoLabel, postDoState); - // bind expressions (don't affect reachability) - bind(n.expression); - } - function bindForStatement(n) { - var preForState = currentReachabilityState; - var postForLabel = pushImplicitLabel(); - // bind expressions (don't affect reachability) - bind(n.initializer); - bind(n.condition); - bind(n.incrementor); - bind(n.statement); - // for statement is considered infinite when it condition is either omitted or is true keyword - // - for(..;;..) - // - for(..;true;..) - var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */); - var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState; - popImplicitLabel(postForLabel, postForState); - } - function bindForInOrForOfStatement(n) { - var preStatementState = currentReachabilityState; - var postStatementLabel = pushImplicitLabel(); - // bind expressions (don't affect reachability) - bind(n.initializer); - bind(n.expression); - bind(n.statement); - popImplicitLabel(postStatementLabel, preStatementState); - } - function bindIfStatement(n) { - // denotes reachability state when entering 'thenStatement' part of the if statement: - // i.e. if condition is false then thenStatement is unreachable - var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - // denotes reachability state when entering 'elseStatement': - // i.e. if condition is true then elseStatement is unreachable - var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - currentReachabilityState = ifTrueState; - // bind expression (don't affect reachability) - bind(n.expression); - bind(n.thenStatement); - if (n.elseStatement) { - var preElseState = currentReachabilityState; - currentReachabilityState = ifFalseState; - bind(n.elseStatement); - currentReachabilityState = or(currentReachabilityState, preElseState); - } - else { - currentReachabilityState = or(currentReachabilityState, ifFalseState); - } - } - function bindReturnOrThrow(n) { - // bind expression (don't affect reachability) - bind(n.expression); - if (n.kind === 204 /* ReturnStatement */) { - hasExplicitReturn = true; - } - currentReachabilityState = 4 /* Unreachable */; - } - function bindBreakOrContinueStatement(n) { - // call bind on label (don't affect reachability) - bind(n.label); - // for continue case touch label so it will be marked a used - var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */); - if (isValidJump) { - currentReachabilityState = 4 /* Unreachable */; - } - } - function bindTryStatement(n) { - // catch\finally blocks has the same reachability as try block - var preTryState = currentReachabilityState; - bind(n.tryBlock); - var postTryState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.catchClause); - var postCatchState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.finallyBlock); - // post catch/finally state is reachable if - // - post try state is reachable - control flow can fall out of try block - // - post catch state is reachable - control flow can fall out of catch block - currentReachabilityState = or(postTryState, postCatchState); - } - function bindSwitchStatement(n) { - var preSwitchState = currentReachabilityState; - var postSwitchLabel = pushImplicitLabel(); - // bind expression (don't affect reachability) - bind(n.expression); - bind(n.caseBlock); - var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; }); - // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case - var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState; - popImplicitLabel(postSwitchLabel, postSwitchState); - } - function bindCaseBlock(n) { - var startState = currentReachabilityState; - for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { - var clause = _a[_i]; - currentReachabilityState = startState; - bind(clause); - if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) { - errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); - } - } - } - function bindLabeledStatement(n) { - // call bind on label (don't affect reachability) - bind(n.label); - var ok = pushNamedLabel(n.label); - bind(n.statement); - if (ok) { - popNamedLabel(n.label, currentReachabilityState); - } - } - function getContainerFlags(node) { - switch (node.kind) { - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - case 215 /* InterfaceDeclaration */: - case 217 /* EnumDeclaration */: - case 155 /* TypeLiteral */: - case 165 /* ObjectLiteralExpression */: - return 1 /* IsContainer */; - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - case 213 /* FunctionDeclaration */: - case 144 /* Constructor */: - case 145 /* GetAccessor */: - case 146 /* SetAccessor */: - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - case 218 /* ModuleDeclaration */: - case 248 /* SourceFile */: - case 216 /* TypeAliasDeclaration */: - return 5 /* IsContainerWithLocals */; - case 244 /* CatchClause */: - case 199 /* ForStatement */: - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - case 220 /* CaseBlock */: - return 2 /* IsBlockScopedContainer */; - case 192 /* Block */: - // do not treat blocks directly inside a function as a block-scoped-container. - // Locals that reside in this block should go to the function locals. Othewise 'x' - // would not appear to be a redeclaration of a block scoped local in the following - // example: - // - // function foo() { - // var x; - // let x; - // } - // - // If we placed 'var x' into the function locals and 'let x' into the locals of - // the block, then there would be no collision. - // - // By not creating a new block-scoped-container here, we ensure that both 'var x' - // and 'let x' go into the Function-container's locals, and we do get a collision - // conflict. - return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */; - } - return 0 /* None */; - } - function addToContainerChain(next) { - if (lastContainer) { - lastContainer.nextContainer = next; - } - lastContainer = next; - } - function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { - // Just call this directly so that the return type of this function stays "void". - declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); - } - function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { - switch (container.kind) { - // Modules, source files, and classes need specialized handling for how their - // members are declared (for example, a member of a class will go into a specific - // symbol table depending on if it is static or not). We defer to specialized - // handlers to take care of declaring these child members. - case 218 /* ModuleDeclaration */: - return declareModuleMember(node, symbolFlags, symbolExcludes); - case 248 /* SourceFile */: - return declareSourceFileMember(node, symbolFlags, symbolExcludes); - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - return declareClassMember(node, symbolFlags, symbolExcludes); - case 217 /* EnumDeclaration */: - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - case 155 /* TypeLiteral */: - case 165 /* ObjectLiteralExpression */: - case 215 /* InterfaceDeclaration */: - // Interface/Object-types always have their children added to the 'members' of - // their container. They are only accessible through an instance of their - // container, and are never in scope otherwise (even inside the body of the - // object / type / interface declaring them). An exception is type parameters, - // which are in scope without qualification (similar to 'locals'). - return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - case 144 /* Constructor */: - case 145 /* GetAccessor */: - case 146 /* SetAccessor */: - case 213 /* FunctionDeclaration */: - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - case 216 /* TypeAliasDeclaration */: - // All the children of these container types are never visible through another - // symbol (i.e. through another symbol's 'exports' or 'members'). Instead, - // they're only accessed 'lexically' (i.e. from code that exists underneath - // their container in the tree. To accomplish this, we simply add their declared - // symbol to the 'locals' of the container. These symbols can then be found as - // the type checker walks up the containers, checking them for matching names. - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - function declareClassMember(node, symbolFlags, symbolExcludes) { - return node.flags & 64 /* Static */ - ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) - : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - } - function declareSourceFileMember(node, symbolFlags, symbolExcludes) { - return ts.isExternalModule(file) - ? declareModuleMember(node, symbolFlags, symbolExcludes) - : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); - } - function hasExportDeclarations(node) { - var body = node.kind === 248 /* SourceFile */ ? node : node.body; - if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) { - for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { - var stat = _a[_i]; - if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) { - return true; - } - } - } - return false; - } - function setExportContextFlag(node) { - // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular - // declarations with export modifiers) is an export context in which declarations are implicitly exported. - if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { - node.flags |= 131072 /* ExportContext */; - } - else { - node.flags &= ~131072 /* ExportContext */; - } - } - function bindModuleDeclaration(node) { - setExportContextFlag(node); - if (node.name.kind === 9 /* StringLiteral */) { - declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); - } - else { - var state = getModuleInstanceState(node); - if (state === 0 /* NonInstantiated */) { - declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */); - } - else { - declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); - if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) { - // if module was already merged with some function, class or non-const enum - // treat is a non-const-enum-only - node.symbol.constEnumOnlyModule = false; - } - else { - var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */; - if (node.symbol.constEnumOnlyModule === undefined) { - // non-merged case - use the current state - node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; - } - else { - // merged case: module is const enum only if all its pieces are non-instantiated or const enum - node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; - } - } - } - } - } - function bindFunctionOrConstructorType(node) { - // For a given function symbol "<...>(...) => T" we want to generate a symbol identical - // to the one we would get for: { <...>(...): T } - // - // We do that by making an anonymous type literal symbol, and then setting the function - // symbol as its sole member. To the rest of the system, this symbol will be indistinguishable - // from an actual type literal symbol you would have gotten had you used the long form. - var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node)); - addDeclarationToSymbol(symbol, node, 131072 /* Signature */); - var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type"); - addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */); - typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); - var _a; - } - function bindObjectLiteralExpression(node) { - var ElementKind; - (function (ElementKind) { - ElementKind[ElementKind["Property"] = 1] = "Property"; - ElementKind[ElementKind["Accessor"] = 2] = "Accessor"; - })(ElementKind || (ElementKind = {})); - if (inStrictMode) { - var seen = {}; - for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { - var prop = _a[_i]; - if (prop.name.kind !== 69 /* Identifier */) { - continue; - } - var identifier = prop.name; - // ECMA-262 11.1.5 Object Initialiser - // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true - // a.This production is contained in strict code and IsDataDescriptor(previous) is true and - // IsDataDescriptor(propId.descriptor) is true. - // b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true. - // c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true. - // d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true - // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields - var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */ - ? 1 /* Property */ - : 2 /* Accessor */; - var existingKind = seen[identifier.text]; - if (!existingKind) { - seen[identifier.text] = currentKind; - continue; - } - if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) { - var span = ts.getErrorSpanForNode(file, identifier); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); - } - } - } - return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object"); - } - function bindAnonymousDeclaration(node, symbolFlags, name) { - var symbol = createSymbol(symbolFlags, name); - addDeclarationToSymbol(symbol, node, symbolFlags); - } - function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { - switch (blockScopeContainer.kind) { - case 218 /* ModuleDeclaration */: - declareModuleMember(node, symbolFlags, symbolExcludes); - break; - case 248 /* SourceFile */: - if (ts.isExternalModule(container)) { - declareModuleMember(node, symbolFlags, symbolExcludes); - break; - } - // fall through. - default: - if (!blockScopeContainer.locals) { - blockScopeContainer.locals = {}; - addToContainerChain(blockScopeContainer); - } - declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - function bindBlockScopedVariableDeclaration(node) { - bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */); - } - // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized - // check for reserved words used as identifiers in strict mode code. - function checkStrictModeIdentifier(node) { - if (inStrictMode && - node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ && - node.originalKeywordKind <= 114 /* LastFutureReservedWord */ && - !ts.isIdentifierName(node)) { - // Report error only if there are no parse errors in file - if (!file.parseDiagnostics.length) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); - } - } - } - function getStrictModeIdentifierMessage(node) { - // Provide specialized messages to help the user understand why we think they're in - // strict mode. - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; - } - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; - } - function checkStrictModeBinaryExpression(node) { - if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { - // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an - // Assignment operator(11.13) or of a PostfixExpression(11.3) - checkStrictModeEvalOrArguments(node, node.left); - } - } - function checkStrictModeCatchClause(node) { - // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the - // Catch production is eval or arguments - if (inStrictMode && node.variableDeclaration) { - checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); - } - } - function checkStrictModeDeleteExpression(node) { - // Grammar checking - if (inStrictMode && node.expression.kind === 69 /* Identifier */) { - // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its - // UnaryExpression is a direct reference to a variable, function argument, or function name - var span = ts.getErrorSpanForNode(file, node.expression); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); - } - } - function isEvalOrArgumentsIdentifier(node) { - return node.kind === 69 /* Identifier */ && - (node.text === "eval" || node.text === "arguments"); - } - function checkStrictModeEvalOrArguments(contextNode, name) { - if (name && name.kind === 69 /* Identifier */) { - var identifier = name; - if (isEvalOrArgumentsIdentifier(identifier)) { - // We check first if the name is inside class declaration or class expression; if so give explicit message - // otherwise report generic error message. - var span = ts.getErrorSpanForNode(file, name); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); - } - } - } - function getStrictModeEvalOrArgumentsMessage(node) { - // Provide specialized messages to help the user understand why we think they're in - // strict mode. - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; - } - return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; - } - function checkStrictModeFunctionName(node) { - if (inStrictMode) { - // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1)) - checkStrictModeEvalOrArguments(node, node.name); - } - } - function checkStrictModeNumericLiteral(node) { - if (inStrictMode && node.flags & 32768 /* OctalLiteral */) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); - } - } - function checkStrictModePostfixUnaryExpression(node) { - // Grammar checking - // The identifier eval or arguments may not appear as the LeftHandSideExpression of an - // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression - // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator. - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.operand); - } - } - function checkStrictModePrefixUnaryExpression(node) { - // Grammar checking - if (inStrictMode) { - if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) { - checkStrictModeEvalOrArguments(node, node.operand); - } - } - } - function checkStrictModeWithStatement(node) { - // Grammar checking for withStatement - if (inStrictMode) { - errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); - } - } - function errorOnFirstToken(node, message, arg0, arg1, arg2) { - var span = ts.getSpanOfTokenAtPosition(file, node.pos); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); - } - function getDestructuringParameterName(node) { - return "__" + ts.indexOf(node.parent.parameters, node); - } - function bind(node) { - if (!node) { - return; - } - node.parent = parent; - var savedInStrictMode = inStrictMode; - if (!savedInStrictMode) { - updateStrictMode(node); - } - // First we bind declaration nodes to a symbol if possible. We'll both create a symbol - // and then potentially add the symbol to an appropriate symbol table. Possible - // destination symbol tables are: - // - // 1) The 'exports' table of the current container's symbol. - // 2) The 'members' table of the current container's symbol. - // 3) The 'locals' table of the current container. - // - // However, not all symbols will end up in any of these tables. 'Anonymous' symbols - // (like TypeLiterals for example) will not be put in any table. - bindWorker(node); - // Then we recurse into the children of the node to bind them as well. For certain - // symbols we do specialized work when we recurse. For example, we'll keep track of - // the current 'container' node when it changes. This helps us know which symbol table - // a local should go into for example. - bindChildren(node); - inStrictMode = savedInStrictMode; - } - function updateStrictMode(node) { - switch (node.kind) { - case 248 /* SourceFile */: - case 219 /* ModuleBlock */: - updateStrictModeStatementList(node.statements); - return; - case 192 /* Block */: - if (ts.isFunctionLike(node.parent)) { - updateStrictModeStatementList(node.statements); - } - return; - case 214 /* ClassDeclaration */: - case 186 /* ClassExpression */: - // All classes are automatically in strict mode in ES6. - inStrictMode = true; - return; - } - } - function updateStrictModeStatementList(statements) { - for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { - var statement = statements_1[_i]; - if (!ts.isPrologueDirective(statement)) { - return; - } - if (isUseStrictPrologueDirective(statement)) { - inStrictMode = true; - return; - } - } - } - /// Should be called only on prologue directives (isPrologueDirective(node) should be true) - function isUseStrictPrologueDirective(node) { - var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); - // Note: the node text must be exactly "use strict" or 'use strict'. It is not ok for the - // string to contain unicode escapes (as per ES5). - return nodeText === "\"use strict\"" || nodeText === "'use strict'"; - } - function bindWorker(node) { - switch (node.kind) { - case 69 /* Identifier */: - return checkStrictModeIdentifier(node); - case 181 /* BinaryExpression */: - return checkStrictModeBinaryExpression(node); - case 244 /* CatchClause */: - return checkStrictModeCatchClause(node); - case 175 /* DeleteExpression */: - return checkStrictModeDeleteExpression(node); - case 8 /* NumericLiteral */: - return checkStrictModeNumericLiteral(node); - case 180 /* PostfixUnaryExpression */: - return checkStrictModePostfixUnaryExpression(node); - case 179 /* PrefixUnaryExpression */: - return checkStrictModePrefixUnaryExpression(node); - case 205 /* WithStatement */: - return checkStrictModeWithStatement(node); - case 97 /* ThisKeyword */: - seenThisKeyword = true; - return; - case 137 /* TypeParameter */: - return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */); - case 138 /* Parameter */: - return bindParameter(node); - case 211 /* VariableDeclaration */: - case 163 /* BindingElement */: - return bindVariableDeclarationOrBindingElement(node); - case 141 /* PropertyDeclaration */: - case 140 /* PropertySignature */: - return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */); - case 245 /* PropertyAssignment */: - case 246 /* ShorthandPropertyAssignment */: - return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */); - case 247 /* EnumMember */: - return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */); - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */); - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - // If this is an ObjectLiteralExpression method, then it sits in the same space - // as other properties in the object literal. So we use SymbolFlags.PropertyExcludes - // so that it will conflict with any other object literal members with the same - // name. - return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */); - case 213 /* FunctionDeclaration */: - checkStrictModeFunctionName(node); - return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */); - case 144 /* Constructor */: - return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */); - case 145 /* GetAccessor */: - return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */); - case 146 /* SetAccessor */: - return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */); - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - return bindFunctionOrConstructorType(node); - case 155 /* TypeLiteral */: - return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type"); - case 165 /* ObjectLiteralExpression */: - return bindObjectLiteralExpression(node); - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - checkStrictModeFunctionName(node); - var bindingName = node.name ? node.name.text : "__function"; - return bindAnonymousDeclaration(node, 16 /* Function */, bindingName); - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - return bindClassLikeDeclaration(node); - case 215 /* InterfaceDeclaration */: - return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */); - case 216 /* TypeAliasDeclaration */: - return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */); - case 217 /* EnumDeclaration */: - return bindEnumDeclaration(node); - case 218 /* ModuleDeclaration */: - return bindModuleDeclaration(node); - case 221 /* ImportEqualsDeclaration */: - case 224 /* NamespaceImport */: - case 226 /* ImportSpecifier */: - case 230 /* ExportSpecifier */: - return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); - case 223 /* ImportClause */: - return bindImportClause(node); - case 228 /* ExportDeclaration */: - return bindExportDeclaration(node); - case 227 /* ExportAssignment */: - return bindExportAssignment(node); - case 248 /* SourceFile */: - return bindSourceFileIfExternalModule(); - } - } - function bindSourceFileIfExternalModule() { - setExportContextFlag(file); - if (ts.isExternalModule(file)) { - bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\""); - } - } - function bindExportAssignment(node) { - if (!container.symbol || !container.symbol.exports) { - // Export assignment in some sort of block construct - bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node)); - } - else if (node.expression.kind === 69 /* Identifier */) { - // An export default clause with an identifier exports all meanings of that identifier - declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); - } - else { - // An export default clause with an expression exports a value - declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); - } - } - function bindExportDeclaration(node) { - if (!container.symbol || !container.symbol.exports) { - // Export * in some sort of block construct - bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node)); - } - else if (!node.exportClause) { - // All export * declarations are collected in an __export symbol - declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */); - } - } - function bindImportClause(node) { - if (node.name) { - declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); - } - } - function bindClassLikeDeclaration(node) { - if (node.kind === 214 /* ClassDeclaration */) { - bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */); - } - else { - var bindingName = node.name ? node.name.text : "__class"; - bindAnonymousDeclaration(node, 32 /* Class */, bindingName); - // Add name of class expression into the map for semantic classifier - if (node.name) { - classifiableNames[node.name.text] = node.name.text; - } - } - var symbol = node.symbol; - // TypeScript 1.0 spec (April 2014): 8.4 - // Every class automatically contains a static property member named 'prototype', the - // type of which is an instantiation of the class type with type Any supplied as a type - // argument for each type parameter. It is an error to explicitly declare a static - // property member with the name 'prototype'. - // - // Note: we check for this here because this class may be merging into a module. The - // module might have an exported variable called 'prototype'. We can't allow that as - // that would clash with the built-in 'prototype' for the class. - var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype"); - if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { - if (node.name) { - node.name.parent = node; - } - file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); - } - symbol.exports[prototypeSymbol.name] = prototypeSymbol; - prototypeSymbol.parent = symbol; - } - function bindEnumDeclaration(node) { - return ts.isConst(node) - ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */) - : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */); - } - function bindVariableDeclarationOrBindingElement(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.name); - } - if (!ts.isBindingPattern(node.name)) { - if (ts.isBlockOrCatchScoped(node)) { - bindBlockScopedVariableDeclaration(node); - } - else if (ts.isParameterDeclaration(node)) { - // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration - // because its parent chain has already been set up, since parents are set before descending into children. - // - // If node is a binding element in parameter declaration, we need to use ParameterExcludes. - // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration - // For example: - // function foo([a,a]) {} // Duplicate Identifier error - // function bar(a,a) {} // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter - // // which correctly set excluded symbols - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); - } - else { - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */); - } - } - } - function bindParameter(node) { - if (inStrictMode) { - // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a - // strict mode FunctionLikeDeclaration or FunctionExpression(13.1) - checkStrictModeEvalOrArguments(node, node.name); - } - if (ts.isBindingPattern(node.name)) { - bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node)); - } - else { - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); - } - // If this is a property-parameter, then also declare the property symbol into the - // containing class. - if (node.flags & 56 /* AccessibilityModifier */ && - node.parent.kind === 144 /* Constructor */ && - ts.isClassLike(node.parent.parent)) { - var classDeclaration = node.parent.parent; - declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */); - } - } - function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { - return ts.hasDynamicName(node) - ? bindAnonymousDeclaration(node, symbolFlags, "__computed") - : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); - } - // reachability checks - function pushNamedLabel(name) { - initializeReachabilityStateIfNecessary(); - if (ts.hasProperty(labelIndexMap, name.text)) { - return false; - } - labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1; - return true; - } - function pushImplicitLabel() { - initializeReachabilityStateIfNecessary(); - var index = labelStack.push(1 /* Unintialized */) - 1; - implicitLabels.push(index); - return index; - } - function popNamedLabel(label, outerState) { - var index = labelIndexMap[label.text]; - ts.Debug.assert(index !== undefined); - ts.Debug.assert(labelStack.length == index + 1); - labelIndexMap[label.text] = undefined; - setCurrentStateAtLabel(labelStack.pop(), outerState, label); - } - function popImplicitLabel(implicitLabelIndex, outerState) { - if (labelStack.length !== implicitLabelIndex + 1) { - ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); - } - var i = implicitLabels.pop(); - if (implicitLabelIndex !== i) { - ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); - } - setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined); - } - function setCurrentStateAtLabel(innerMergedState, outerState, label) { - if (innerMergedState === 1 /* Unintialized */) { - if (label && !options.allowUnusedLabels) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); - } - currentReachabilityState = outerState; - } - else { - currentReachabilityState = or(innerMergedState, outerState); - } - } - function jumpToLabel(label, outerState) { - initializeReachabilityStateIfNecessary(); - var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); - if (index === undefined) { - // reference to unknown label or - // break/continue used outside of loops - return false; - } - var stateAtLabel = labelStack[index]; - labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState); - return true; - } - function checkUnreachable(node) { - switch (currentReachabilityState) { - case 4 /* Unreachable */: - var reportError = - // report error on all statements - ts.isStatement(node) || - // report error on class declarations - node.kind === 214 /* ClassDeclaration */ || - // report error on instantiated modules or const-enums only modules if preserveConstEnums is set - (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) || - // report error on regular enums and const enums if preserveConstEnums is set - (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); - if (reportError) { - currentReachabilityState = 8 /* ReportedUnreachable */; - // unreachable code is reported if - // - user has explicitly asked about it AND - // - statement is in not ambient context (statements in ambient context is already an error - // so we should not report extras) AND - // - node is not variable statement OR - // - node is block scoped variable statement OR - // - node is not block scoped variable statement and at least one variable declaration has initializer - // Rationale: we don't want to report errors on non-initialized var's since they are hoisted - // On the other side we do want to report errors on non-initialized 'lets' because of TDZ - var reportUnreachableCode = !options.allowUnreachableCode && - !ts.isInAmbientContext(node) && - (node.kind !== 193 /* VariableStatement */ || - ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ || - ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); - if (reportUnreachableCode) { - errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); - } - } - case 8 /* ReportedUnreachable */: - return true; - default: - return false; - } - function shouldReportErrorOnModuleDeclaration(node) { - var instanceState = getModuleInstanceState(node); - return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums); - } - } - function initializeReachabilityStateIfNecessary() { - if (labelIndexMap) { - return; - } - currentReachabilityState = 2 /* Reachable */; - labelIndexMap = {}; - labelStack = []; - implicitLabels = []; - } - } -})(ts || (ts = {})); -/// -/// -/* @internal */ -var ts; -(function (ts) { - function getDeclarationOfKind(symbol, kind) { - var declarations = symbol.declarations; - if (declarations) { - for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { - var declaration = declarations_1[_i]; - if (declaration.kind === kind) { - return declaration; - } - } - } - return undefined; - } - ts.getDeclarationOfKind = getDeclarationOfKind; - // Pool writers to avoid needing to allocate them for every symbol we write. - var stringWriters = []; - function getSingleLineStringWriter() { - if (stringWriters.length === 0) { - var str = ""; - var writeText = function (text) { return str += text; }; - return { - string: function () { return str; }, - writeKeyword: writeText, - writeOperator: writeText, - writePunctuation: writeText, - writeSpace: writeText, - writeStringLiteral: writeText, - writeParameter: writeText, - writeSymbol: writeText, - // Completely ignore indentation for string writers. And map newlines to - // a single space. - writeLine: function () { return str += " "; }, - increaseIndent: function () { }, - decreaseIndent: function () { }, - clear: function () { return str = ""; }, - trackSymbol: function () { }, - reportInaccessibleThisError: function () { } - }; - } - return stringWriters.pop(); - } - ts.getSingleLineStringWriter = getSingleLineStringWriter; - function releaseStringWriter(writer) { - writer.clear(); - stringWriters.push(writer); - } - ts.releaseStringWriter = releaseStringWriter; - function getFullWidth(node) { - return node.end - node.pos; - } - ts.getFullWidth = getFullWidth; - function arrayIsEqualTo(array1, array2, equaler) { - if (!array1 || !array2) { - return array1 === array2; - } - if (array1.length !== array2.length) { - return false; - } - for (var i = 0; i < array1.length; ++i) { - var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; - if (!equals) { - return false; - } - } - return true; - } - ts.arrayIsEqualTo = arrayIsEqualTo; - function hasResolvedModule(sourceFile, moduleNameText) { - return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); - } - ts.hasResolvedModule = hasResolvedModule; - function getResolvedModule(sourceFile, moduleNameText) { - return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; - } - ts.getResolvedModule = getResolvedModule; - function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { - if (!sourceFile.resolvedModules) { - sourceFile.resolvedModules = {}; - } - sourceFile.resolvedModules[moduleNameText] = resolvedModule; - } - ts.setResolvedModule = setResolvedModule; - // Returns true if this node contains a parse error anywhere underneath it. - function containsParseError(node) { - aggregateChildData(node); - return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0; - } - ts.containsParseError = containsParseError; - function aggregateChildData(node) { - if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) { - // A node is considered to contain a parse error if: - // a) the parser explicitly marked that it had an error - // b) any of it's children reported that it had an error. - var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) || - ts.forEachChild(node, containsParseError); - // If so, mark ourselves accordingly. - if (thisNodeOrAnySubNodesHasError) { - node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */; - } - // Also mark that we've propogated the child information to this node. This way we can - // always consult the bit directly on this node without needing to check its children - // again. - node.parserContextFlags |= 128 /* HasAggregatedChildData */; - } - } - function getSourceFileOfNode(node) { - while (node && node.kind !== 248 /* SourceFile */) { - node = node.parent; - } - return node; - } - ts.getSourceFileOfNode = getSourceFileOfNode; - function getStartPositionOfLine(line, sourceFile) { - ts.Debug.assert(line >= 0); - return ts.getLineStarts(sourceFile)[line]; - } - ts.getStartPositionOfLine = getStartPositionOfLine; - // This is a useful function for debugging purposes. - function nodePosToString(node) { - var file = getSourceFileOfNode(node); - var loc = ts.getLineAndCharacterOfPosition(file, node.pos); - return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; - } - ts.nodePosToString = nodePosToString; - function getStartPosOfNode(node) { - return node.pos; - } - ts.getStartPosOfNode = getStartPosOfNode; - // Returns true if this node is missing from the actual source code. A 'missing' node is different - // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes - // in the tree), it is definitely missing. However, a node may be defined, but still be - // missing. This happens whenever the parser knows it needs to parse something, but can't - // get anything in the source code that it expects at that location. For example: - // - // let a: ; - // - // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source - // code). So the parser will attempt to parse out a type, and will create an actual node. - // However, this node will be 'missing' in the sense that no actual source-code/tokens are - // contained within it. - function nodeIsMissing(node) { - if (!node) { - return true; - } - return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */; - } - ts.nodeIsMissing = nodeIsMissing; - function nodeIsPresent(node) { - return !nodeIsMissing(node); - } - ts.nodeIsPresent = nodeIsPresent; - function getTokenPosOfNode(node, sourceFile) { - // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't* - // want to skip trivia because this will launch us forward to the next token. - if (nodeIsMissing(node)) { - return node.pos; - } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); - } - ts.getTokenPosOfNode = getTokenPosOfNode; - function getNonDecoratorTokenPosOfNode(node, sourceFile) { - if (nodeIsMissing(node) || !node.decorators) { - return getTokenPosOfNode(node, sourceFile); - } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); - } - ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; - function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - if (nodeIsMissing(node)) { - return ""; - } - var text = sourceFile.text; - return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); - } - ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; - function getTextOfNodeFromSourceText(sourceText, node) { - if (nodeIsMissing(node)) { - return ""; - } - return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); - } - ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; - function getTextOfNode(node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); - } - ts.getTextOfNode = getTextOfNode; - // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' - function escapeIdentifier(identifier) { - return identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier; - } - ts.escapeIdentifier = escapeIdentifier; - // Remove extra underscore from escaped identifier - function unescapeIdentifier(identifier) { - return identifier.length >= 3 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ && identifier.charCodeAt(2) === 95 /* _ */ ? identifier.substr(1) : identifier; - } - ts.unescapeIdentifier = unescapeIdentifier; - // Make an identifier from an external module name by extracting the string after the last "/" and replacing - // all non-alphanumeric characters with underscores - function makeIdentifierFromModuleName(moduleName) { - return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); - } - ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; - function isBlockOrCatchScoped(declaration) { - return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 || - isCatchClauseVariableDeclaration(declaration); - } - ts.isBlockOrCatchScoped = isBlockOrCatchScoped; - // Gets the nearest enclosing block scope container that has the provided node - // as a descendant, that is not the provided node. - function getEnclosingBlockScopeContainer(node) { - var current = node.parent; - while (current) { - if (isFunctionLike(current)) { - return current; - } - switch (current.kind) { - case 248 /* SourceFile */: - case 220 /* CaseBlock */: - case 244 /* CatchClause */: - case 218 /* ModuleDeclaration */: - case 199 /* ForStatement */: - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - return current; - case 192 /* Block */: - // function block is not considered block-scope container - // see comment in binder.ts: bind(...), case for SyntaxKind.Block - if (!isFunctionLike(current.parent)) { - return current; - } - } - current = current.parent; + current = current.parent; } } ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer; @@ -5812,6 +4503,10 @@ var ts; return file.externalModuleIndicator !== undefined; } ts.isExternalModule = isExternalModule; + function isExternalOrCommonJsModule(file) { + return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined; + } + ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule; function isDeclarationFile(file) { return (file.flags & 4096 /* DeclarationFile */) !== 0; } @@ -5865,19 +4560,27 @@ var ts; return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos); } ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; + function getLeadingCommentRangesOfNodeFromText(node, text) { + return ts.getLeadingCommentRanges(text, node.pos); + } + ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText; function getJsDocComments(node, sourceFileOfNode) { + return getJsDocCommentsFromText(node, sourceFileOfNode.text); + } + ts.getJsDocComments = getJsDocComments; + function getJsDocCommentsFromText(node, text) { var commentRanges = (node.kind === 138 /* Parameter */ || node.kind === 137 /* TypeParameter */) ? - ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) : - getLeadingCommentRangesOfNode(node, sourceFileOfNode); + ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) : + getLeadingCommentRangesOfNodeFromText(node, text); return ts.filter(commentRanges, isJsDocComment); function isJsDocComment(comment) { // True if the comment starts with '/**' but not if it is '/**/' - return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && - sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && - sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47 /* slash */; + return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 3) !== 47 /* slash */; } } - ts.getJsDocComments = getJsDocComments; + ts.getJsDocCommentsFromText = getJsDocCommentsFromText; ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*/; ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; function isTypeNode(node) { @@ -6464,6 +5167,57 @@ var ts; return node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 232 /* ExternalModuleReference */; } ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; + function isSourceFileJavaScript(file) { + return isInJavaScriptFile(file); + } + ts.isSourceFileJavaScript = isSourceFileJavaScript; + function isInJavaScriptFile(node) { + return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */); + } + ts.isInJavaScriptFile = isInJavaScriptFile; + /** + * Returns true if the node is a CallExpression to the identifier 'require' with + * exactly one string literal argument. + * This function does not test if the node is in a JavaScript file or not. + */ + function isRequireCall(expression) { + // of the form 'require("name")' + return expression.kind === 168 /* CallExpression */ && + expression.expression.kind === 69 /* Identifier */ && + expression.expression.text === "require" && + expression.arguments.length === 1 && + expression.arguments[0].kind === 9 /* StringLiteral */; + } + ts.isRequireCall = isRequireCall; + /** + * Returns true if the node is an assignment to a property on the identifier 'exports'. + * This function does not test if the node is in a JavaScript file or not. + */ + function isExportsPropertyAssignment(expression) { + // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary + return isInJavaScriptFile(expression) && + (expression.kind === 181 /* BinaryExpression */) && + (expression.operatorToken.kind === 56 /* EqualsToken */) && + (expression.left.kind === 166 /* PropertyAccessExpression */) && + (expression.left.expression.kind === 69 /* Identifier */) && + ((expression.left.expression).text === "exports"); + } + ts.isExportsPropertyAssignment = isExportsPropertyAssignment; + /** + * Returns true if the node is an assignment to the property access expression 'module.exports'. + * This function does not test if the node is in a JavaScript file or not. + */ + function isModuleExportsAssignment(expression) { + // of the form 'module.exports = expr' where 'expr' is arbitrary + return isInJavaScriptFile(expression) && + (expression.kind === 181 /* BinaryExpression */) && + (expression.operatorToken.kind === 56 /* EqualsToken */) && + (expression.left.kind === 166 /* PropertyAccessExpression */) && + (expression.left.expression.kind === 69 /* Identifier */) && + ((expression.left.expression).text === "module") && + (expression.left.name.text === "exports"); + } + ts.isModuleExportsAssignment = isModuleExportsAssignment; function getExternalModuleName(node) { if (node.kind === 222 /* ImportDeclaration */) { return node.moduleSpecifier; @@ -6791,8 +5545,8 @@ var ts; function getFileReferenceFromReferencePath(comment, commentRange) { var simpleReferenceRegEx = /^\/\/\/\s*/gim; - if (simpleReferenceRegEx.exec(comment)) { - if (isNoDefaultLibRegEx.exec(comment)) { + if (simpleReferenceRegEx.test(comment)) { + if (isNoDefaultLibRegEx.test(comment)) { return { isNoDefaultLib: true }; @@ -6834,6 +5588,10 @@ var ts; return isFunctionLike(node) && (node.flags & 256 /* Async */) !== 0 && !isAccessor(node); } ts.isAsyncFunctionLike = isAsyncFunctionLike; + function isStringOrNumericLiteral(kind) { + return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */; + } + ts.isStringOrNumericLiteral = isStringOrNumericLiteral; /** * A declaration has a dynamic name if both of the following are true: * 1. The declaration has a computed property name @@ -6842,11 +5600,15 @@ var ts; * Symbol. */ function hasDynamicName(declaration) { - return declaration.name && - declaration.name.kind === 136 /* ComputedPropertyName */ && - !isWellKnownSymbolSyntactically(declaration.name.expression); + return declaration.name && isDynamicName(declaration.name); } ts.hasDynamicName = hasDynamicName; + function isDynamicName(name) { + return name.kind === 136 /* ComputedPropertyName */ && + !isStringOrNumericLiteral(name.expression.kind) && + !isWellKnownSymbolSyntactically(name.expression); + } + ts.isDynamicName = isDynamicName; /** * Checks if the expression is of the form: * Symbol.name @@ -7087,11 +5849,11 @@ var ts; } ts.getIndentSize = getIndentSize; function createTextWriter(newLine) { - var output = ""; - var indent = 0; - var lineStart = true; - var lineCount = 0; - var linePos = 0; + var output; + var indent; + var lineStart; + var lineCount; + var linePos; function write(s) { if (s && s.length) { if (lineStart) { @@ -7101,6 +5863,13 @@ var ts; output += s; } } + function reset() { + output = ""; + indent = 0; + lineStart = true; + lineCount = 0; + linePos = 0; + } function rawWrite(s) { if (s !== undefined) { if (lineStart) { @@ -7127,9 +5896,10 @@ var ts; lineStart = true; } } - function writeTextOfNode(sourceFile, node) { - write(getSourceTextOfNodeFromSourceFile(sourceFile, node)); + function writeTextOfNode(text, node) { + write(getTextOfNodeFromSourceText(text, node)); } + reset(); return { write: write, rawWrite: rawWrite, @@ -7142,10 +5912,20 @@ var ts; getTextPos: function () { return output.length; }, getLine: function () { return lineCount + 1; }, getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; }, - getText: function () { return output; } + getText: function () { return output; }, + reset: reset }; } ts.createTextWriter = createTextWriter; + /** + * Resolves a local path to a path which is absolute to the base of the emit + */ + function getExternalModuleNameFromPath(host, fileName) { + var dir = host.getCurrentDirectory(); + var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, /*isAbsolutePathAnUrl*/ false); + return ts.removeFileExtension(relativePath); + } + ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath; function getOwnEmitOutputFilePath(sourceFile, host, extension) { var compilerOptions = host.getCompilerOptions(); var emitOutputFilePathWithoutExtension; @@ -7174,6 +5954,10 @@ var ts; return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line; } ts.getLineOfLocalPosition = getLineOfLocalPosition; + function getLineOfLocalPositionFromLineMap(lineMap, pos) { + return ts.computeLineAndCharacterOfPosition(lineMap, pos).line; + } + ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap; function getFirstConstructorWithBody(node) { return ts.forEach(node.members, function (member) { if (member.kind === 144 /* Constructor */ && nodeIsPresent(member.body)) { @@ -7246,22 +6030,22 @@ var ts; }; } ts.getAllAccessorDeclarations = getAllAccessorDeclarations; - function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) { + function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) { // If the leading comments start on different line than the start of node, write new line if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && - getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) { + getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) { writer.writeLine(); } } ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments; - function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) { + function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) { var emitLeadingSpace = !trailingSeparator; ts.forEach(comments, function (comment) { if (emitLeadingSpace) { writer.write(" "); emitLeadingSpace = false; } - writeComment(currentSourceFile, writer, comment, newLine); + writeComment(text, lineMap, writer, comment, newLine); if (comment.hasTrailingNewLine) { writer.writeLine(); } @@ -7279,7 +6063,7 @@ var ts; * Detached comment is a comment at the top of file or function body that is separated from * the next statement by space. */ - function emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, removeComments) { + function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) { var leadingComments; var currentDetachedCommentInfo; if (removeComments) { @@ -7289,12 +6073,12 @@ var ts; // // var x = 10; if (node.pos === 0) { - leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComment); + leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment); } } else { // removeComments is false, just get detached as normal and bypass the process to filter comment - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + leadingComments = ts.getLeadingCommentRanges(text, node.pos); } if (leadingComments) { var detachedComments = []; @@ -7302,8 +6086,8 @@ var ts; for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) { var comment = leadingComments_1[_i]; if (lastComment) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end); - var commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end); + var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos); if (commentLine >= lastCommentLine + 2) { // There was a blank line between the last comment and this comment. This // comment is not part of the copyright comments. Return what we have so @@ -7318,36 +6102,36 @@ var ts; // All comments look like they could have been part of the copyright header. Make // sure there is at least one blank line between it and the node. If not, it's not // a copyright header. - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end); - var nodeLine = getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end); + var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos)); if (nodeLine >= lastCommentLine + 2) { // Valid detachedComments - emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment); + emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments); + emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment); currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end }; } } } return currentDetachedCommentInfo; function isPinnedComment(comment) { - return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 33 /* exclamation */; + return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 2) === 33 /* exclamation */; } } ts.emitDetachedComments = emitDetachedComments; - function writeCommentRange(currentSourceFile, writer, comment, newLine) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) { - var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos); - var lineCount = ts.getLineStarts(currentSourceFile).length; + function writeCommentRange(text, lineMap, writer, comment, newLine) { + if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) { + var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos); + var lineCount = lineMap.length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { var nextLineStart = (currentLine + 1) === lineCount - ? currentSourceFile.text.length + 1 - : getStartPositionOfLine(currentLine + 1, currentSourceFile); + ? text.length + 1 + : lineMap[currentLine + 1]; if (pos !== comment.pos) { // If we are not emitting first line, we need to write the spaces to adjust the alignment if (firstCommentLineIndent === undefined) { - firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); + firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos); } // These are number of spaces writer is going to write at current indent var currentWriterIndentSpacing = writer.getIndent() * getIndentSize(); @@ -7365,7 +6149,7 @@ var ts; // More right indented comment */ --4 = 8 - 4 + 11 // class c { } // } - var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart); + var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart); if (spacesToEmit > 0) { var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize(); var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize()); @@ -7383,45 +6167,45 @@ var ts; } } // Write the comment line text - writeTrimmedCurrentLine(pos, nextLineStart); + writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart); pos = nextLineStart; } } else { // Single line comment of style //.... - writer.write(currentSourceFile.text.substring(comment.pos, comment.end)); - } - function writeTrimmedCurrentLine(pos, nextLineStart) { - var end = Math.min(comment.end, nextLineStart - 1); - var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, ""); - if (currentLineText) { - // trimmed forward and ending spaces text - writer.write(currentLineText); - if (end !== comment.end) { - writer.writeLine(); - } - } - else { - // Empty string - make sure we write empty line - writer.writeLiteral(newLine); + writer.write(text.substring(comment.pos, comment.end)); + } + } + ts.writeCommentRange = writeCommentRange; + function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) { + var end = Math.min(comment.end, nextLineStart - 1); + var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, ""); + if (currentLineText) { + // trimmed forward and ending spaces text + writer.write(currentLineText); + if (end !== comment.end) { + writer.writeLine(); } } - function calculateIndent(pos, end) { - var currentLineIndent = 0; - for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) { - if (currentSourceFile.text.charCodeAt(pos) === 9 /* tab */) { - // Tabs = TabSize = indent size and go to next tabStop - currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); - } - else { - // Single space - currentLineIndent++; - } + else { + // Empty string - make sure we write empty line + writer.writeLiteral(newLine); + } + } + function calculateIndent(text, pos, end) { + var currentLineIndent = 0; + for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) { + if (text.charCodeAt(pos) === 9 /* tab */) { + // Tabs = TabSize = indent size and go to next tabStop + currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); + } + else { + // Single space + currentLineIndent++; } - return currentLineIndent; } + return currentLineIndent; } - ts.writeCommentRange = writeCommentRange; function modifierToFlag(token) { switch (token) { case 113 /* StaticKeyword */: return 64 /* Static */; @@ -7517,14 +6301,14 @@ var ts; return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined; } ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; - function isJavaScript(fileName) { - return ts.fileExtensionIs(fileName, ".js"); + function hasJavaScriptFileExtension(fileName) { + return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isJavaScript = isJavaScript; - function isTsx(fileName) { - return ts.fileExtensionIs(fileName, ".tsx"); + ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension; + function allowsJsxExpressions(fileName) { + return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isTsx = isTsx; + ts.allowsJsxExpressions = allowsJsxExpressions; /** * Replace each instance of non-ascii characters by one, two, three, or four escape sequences * representing the UTF-8 encoding of the character, and return the expanded char code list. @@ -7835,18 +6619,20 @@ var ts; } ts.getTypeParameterOwner = getTypeParameterOwner; })(ts || (ts = {})); -/// /// +/// var ts; (function (ts) { - var nodeConstructors = new Array(272 /* Count */); /* @internal */ ts.parseTime = 0; - function getNodeConstructor(kind) { - return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)); - } - ts.getNodeConstructor = getNodeConstructor; + var NodeConstructor; + var SourceFileConstructor; function createNode(kind, pos, end) { - return new (getNodeConstructor(kind))(pos, end); + if (kind === 248 /* SourceFile */) { + return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end); + } + else { + return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end); + } } ts.createNode = createNode; function visitNode(cbNode, node) { @@ -8269,6 +7055,9 @@ var ts; // up by avoiding the cost of creating/compiling scanners over and over again. var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true); var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */; + // capture constructors in 'initializeState' to avoid null checks + var NodeConstructor; + var SourceFileConstructor; var sourceFile; var parseDiagnostics; var syntaxCursor; @@ -8354,13 +7143,16 @@ var ts; // attached to the EOF token. var parseErrorBeforeNextFinishedNode = false; function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) { - initializeState(fileName, _sourceText, languageVersion, _syntaxCursor); + var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0; + initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor); var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes); clearState(); return result; } Parser.parseSourceFile = parseSourceFile; - function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) { + function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) { + NodeConstructor = ts.objectAllocator.getNodeConstructor(); + SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor(); sourceText = _sourceText; syntaxCursor = _syntaxCursor; parseDiagnostics = []; @@ -8368,13 +7160,13 @@ var ts; identifiers = {}; identifierCount = 0; nodeCount = 0; - contextFlags = ts.isJavaScript(fileName) ? 32 /* JavaScriptFile */ : 0 /* None */; + contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */; parseErrorBeforeNextFinishedNode = false; // Initialize and prime the scanner before parsing the source elements. scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 /* JSX */ : 0 /* Standard */); + scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 /* JSX */ : 0 /* Standard */); } function clearState() { // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily. @@ -8389,6 +7181,9 @@ var ts; } function parseSourceFileWorker(fileName, languageVersion, setParentNodes) { sourceFile = createSourceFile(fileName, languageVersion); + if (contextFlags & 32 /* JavaScriptFile */) { + sourceFile.parserContextFlags = 32 /* JavaScriptFile */; + } // Prime the scanner. token = nextToken(); processReferenceComments(sourceFile); @@ -8406,7 +7201,7 @@ var ts; // If this is a javascript file, proactively see if we can get JSDoc comments for // relevant nodes in the file. We'll use these to provide typing informaion if they're // available. - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { addJSDocComments(); } return sourceFile; @@ -8461,15 +7256,16 @@ var ts; } Parser.fixupParentReferences = fixupParentReferences; function createSourceFile(fileName, languageVersion) { - var sourceFile = createNode(248 /* SourceFile */, /*pos*/ 0); - sourceFile.pos = 0; - sourceFile.end = sourceText.length; + // code from createNode is inlined here so createNode won't have to deal with special case of creating source files + // this is quite rare comparing to other nodes and createNode should be as fast as possible + var sourceFile = new SourceFileConstructor(248 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length); + nodeCount++; sourceFile.text = sourceText; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0; - sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */; + sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */; return sourceFile; } function setContextFlag(val, flag) { @@ -8734,12 +7530,13 @@ var ts; return parseExpected(23 /* SemicolonToken */); } } + // note: this function creates only node function createNode(kind, pos) { nodeCount++; if (!(pos >= 0)) { pos = scanner.getStartPos(); } - return new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))(pos, pos); + return new NodeConstructor(kind, pos, pos); } function finishNode(node, end) { node.end = end === undefined ? scanner.getStartPos() : end; @@ -8904,7 +7701,7 @@ var ts; case 12 /* ObjectLiteralMembers */: return token === 19 /* OpenBracketToken */ || token === 37 /* AsteriskToken */ || isLiteralPropertyName(); case 9 /* ObjectBindingElements */: - return isLiteralPropertyName(); + return token === 19 /* OpenBracketToken */ || isLiteralPropertyName(); case 7 /* HeritageClauseElement */: // If we see { } then only consume it as an expression if it is followed by , or { // That way we won't consume the body of a class in its heritage clause. @@ -9584,9 +8381,7 @@ var ts; } function parseParameterType() { if (parseOptional(54 /* ColonToken */)) { - return token === 9 /* StringLiteral */ - ? parseLiteralNode(/*internName*/ true) - : parseType(); + return parseType(); } return undefined; } @@ -9917,6 +8712,8 @@ var ts; // If these are followed by a dot, then parse these out as a dotted type reference instead. var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); + case 9 /* StringLiteral */: + return parseLiteralNode(/*internName*/ true); case 103 /* VoidKeyword */: case 97 /* ThisKeyword */: return parseTokenNode(); @@ -9946,6 +8743,7 @@ var ts; case 19 /* OpenBracketToken */: case 25 /* LessThanToken */: case 92 /* NewKeyword */: + case 9 /* StringLiteral */: return true; case 17 /* OpenParenToken */: // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier, @@ -10362,7 +9160,7 @@ var ts; return 1 /* True */; } // This *could* be a parenthesized arrow function. - // Return Unknown to let the caller know. + // Return Unknown to const the caller know. return 2 /* Unknown */; } else { @@ -10448,7 +9246,7 @@ var ts; // user meant to supply a block. For example, if the user wrote: // // a => - // let v = 0; + // const v = 0; // } // // they may be missing an open brace. Check to see if that's the case so we can @@ -10485,3202 +9283,4567 @@ var ts; function isInOrOfKeyword(t) { return t === 90 /* InKeyword */ || t === 134 /* OfKeyword */; } - function parseBinaryExpressionRest(precedence, leftOperand) { + function parseBinaryExpressionRest(precedence, leftOperand) { + while (true) { + // We either have a binary operator here, or we're finished. We call + // reScanGreaterToken so that we merge token sequences like > and = into >= + reScanGreaterToken(); + var newPrecedence = getBinaryOperatorPrecedence(); + // Check the precedence to see if we should "take" this operator + // - For left associative operator (all operator but **), consume the operator, + // recursively call the function below, and parse binaryExpression as a rightOperand + // of the caller if the new precendence of the operator is greater then or equal to the current precendence. + // For example: + // a - b - c; + // ^token; leftOperand = b. Return b to the caller as a rightOperand + // a * b - c + // ^token; leftOperand = b. Return b to the caller as a rightOperand + // a - b * c; + // ^token; leftOperand = b. Return b * c to the caller as a rightOperand + // - For right associative operator (**), consume the operator, recursively call the function + // and parse binaryExpression as a rightOperand of the caller if the new precendence of + // the operator is strictly grater than the current precendence + // For example: + // a ** b ** c; + // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand + // a - b ** c; + // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand + // a ** b - c + // ^token; leftOperand = b. Return b to the caller as a rightOperand + var consumeCurrentOperator = token === 38 /* AsteriskAsteriskToken */ ? + newPrecedence >= precedence : + newPrecedence > precedence; + if (!consumeCurrentOperator) { + break; + } + if (token === 90 /* InKeyword */ && inDisallowInContext()) { + break; + } + if (token === 116 /* AsKeyword */) { + // Make sure we *do* perform ASI for constructs like this: + // var x = foo + // as (Bar) + // This should be parsed as an initialized variable, followed + // by a function call to 'as' with the argument 'Bar' + if (scanner.hasPrecedingLineBreak()) { + break; + } + else { + nextToken(); + leftOperand = makeAsExpression(leftOperand, parseType()); + } + } + else { + leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + } + } + return leftOperand; + } + function isBinaryOperator() { + if (inDisallowInContext() && token === 90 /* InKeyword */) { + return false; + } + return getBinaryOperatorPrecedence() > 0; + } + function getBinaryOperatorPrecedence() { + switch (token) { + case 52 /* BarBarToken */: + return 1; + case 51 /* AmpersandAmpersandToken */: + return 2; + case 47 /* BarToken */: + return 3; + case 48 /* CaretToken */: + return 4; + case 46 /* AmpersandToken */: + return 5; + case 30 /* EqualsEqualsToken */: + case 31 /* ExclamationEqualsToken */: + case 32 /* EqualsEqualsEqualsToken */: + case 33 /* ExclamationEqualsEqualsToken */: + return 6; + case 25 /* LessThanToken */: + case 27 /* GreaterThanToken */: + case 28 /* LessThanEqualsToken */: + case 29 /* GreaterThanEqualsToken */: + case 91 /* InstanceOfKeyword */: + case 90 /* InKeyword */: + case 116 /* AsKeyword */: + return 7; + case 43 /* LessThanLessThanToken */: + case 44 /* GreaterThanGreaterThanToken */: + case 45 /* GreaterThanGreaterThanGreaterThanToken */: + return 8; + case 35 /* PlusToken */: + case 36 /* MinusToken */: + return 9; + case 37 /* AsteriskToken */: + case 39 /* SlashToken */: + case 40 /* PercentToken */: + return 10; + case 38 /* AsteriskAsteriskToken */: + return 11; + } + // -1 is lower than all other precedences. Returning it will cause binary expression + // parsing to stop. + return -1; + } + function makeBinaryExpression(left, operatorToken, right) { + var node = createNode(181 /* BinaryExpression */, left.pos); + node.left = left; + node.operatorToken = operatorToken; + node.right = right; + return finishNode(node); + } + function makeAsExpression(left, right) { + var node = createNode(189 /* AsExpression */, left.pos); + node.expression = left; + node.type = right; + return finishNode(node); + } + function parsePrefixUnaryExpression() { + var node = createNode(179 /* PrefixUnaryExpression */); + node.operator = token; + nextToken(); + node.operand = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseDeleteExpression() { + var node = createNode(175 /* DeleteExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseTypeOfExpression() { + var node = createNode(176 /* TypeOfExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseVoidExpression() { + var node = createNode(177 /* VoidExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function isAwaitExpression() { + if (token === 119 /* AwaitKeyword */) { + if (inAwaitContext()) { + return true; + } + // here we are using similar heuristics as 'isYieldExpression' + return lookAhead(nextTokenIsIdentifierOnSameLine); + } + return false; + } + function parseAwaitExpression() { + var node = createNode(178 /* AwaitExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + /** + * Parse ES7 unary expression and await expression + * + * ES7 UnaryExpression: + * 1) SimpleUnaryExpression[?yield] + * 2) IncrementExpression[?yield] ** UnaryExpression[?yield] + */ + function parseUnaryExpressionOrHigher() { + if (isAwaitExpression()) { + return parseAwaitExpression(); + } + if (isIncrementExpression()) { + var incrementExpression = parseIncrementExpression(); + return token === 38 /* AsteriskAsteriskToken */ ? + parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : + incrementExpression; + } + var unaryOperator = token; + var simpleUnaryExpression = parseSimpleUnaryExpression(); + if (token === 38 /* AsteriskAsteriskToken */) { + var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); + if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); + } + else { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); + } + } + return simpleUnaryExpression; + } + /** + * Parse ES7 simple-unary expression or higher: + * + * ES7 SimpleUnaryExpression: + * 1) IncrementExpression[?yield] + * 2) delete UnaryExpression[?yield] + * 3) void UnaryExpression[?yield] + * 4) typeof UnaryExpression[?yield] + * 5) + UnaryExpression[?yield] + * 6) - UnaryExpression[?yield] + * 7) ~ UnaryExpression[?yield] + * 8) ! UnaryExpression[?yield] + */ + function parseSimpleUnaryExpression() { + switch (token) { + case 35 /* PlusToken */: + case 36 /* MinusToken */: + case 50 /* TildeToken */: + case 49 /* ExclamationToken */: + return parsePrefixUnaryExpression(); + case 78 /* DeleteKeyword */: + return parseDeleteExpression(); + case 101 /* TypeOfKeyword */: + return parseTypeOfExpression(); + case 103 /* VoidKeyword */: + return parseVoidExpression(); + case 25 /* LessThanToken */: + // This is modified UnaryExpression grammar in TypeScript + // UnaryExpression (modified): + // < type > UnaryExpression + return parseTypeAssertion(); + default: + return parseIncrementExpression(); + } + } + /** + * Check if the current token can possibly be an ES7 increment expression. + * + * ES7 IncrementExpression: + * LeftHandSideExpression[?Yield] + * LeftHandSideExpression[?Yield][no LineTerminator here]++ + * LeftHandSideExpression[?Yield][no LineTerminator here]-- + * ++LeftHandSideExpression[?Yield] + * --LeftHandSideExpression[?Yield] + */ + function isIncrementExpression() { + // This function is called inside parseUnaryExpression to decide + // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly + switch (token) { + case 35 /* PlusToken */: + case 36 /* MinusToken */: + case 50 /* TildeToken */: + case 49 /* ExclamationToken */: + case 78 /* DeleteKeyword */: + case 101 /* TypeOfKeyword */: + case 103 /* VoidKeyword */: + return false; + case 25 /* LessThanToken */: + // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression + if (sourceFile.languageVariant !== 1 /* JSX */) { + return false; + } + // We are in JSX context and the token is part of JSXElement. + // Fall through + default: + return true; + } + } + /** + * Parse ES7 IncrementExpression. IncrementExpression is used instead of ES6's PostFixExpression. + * + * ES7 IncrementExpression[yield]: + * 1) LeftHandSideExpression[?yield] + * 2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++ + * 3) LeftHandSideExpression[?yield] [[no LineTerminator here]]-- + * 4) ++LeftHandSideExpression[?yield] + * 5) --LeftHandSideExpression[?yield] + * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression + */ + function parseIncrementExpression() { + if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) { + var node = createNode(179 /* PrefixUnaryExpression */); + node.operator = token; + nextToken(); + node.operand = parseLeftHandSideExpressionOrHigher(); + return finishNode(node); + } + else if (sourceFile.languageVariant === 1 /* JSX */ && token === 25 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeyword)) { + // JSXElement is part of primaryExpression + return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); + } + var expression = parseLeftHandSideExpressionOrHigher(); + ts.Debug.assert(ts.isLeftHandSideExpression(expression)); + if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) { + var node = createNode(180 /* PostfixUnaryExpression */, expression.pos); + node.operand = expression; + node.operator = token; + nextToken(); + return finishNode(node); + } + return expression; + } + function parseLeftHandSideExpressionOrHigher() { + // Original Ecma: + // LeftHandSideExpression: See 11.2 + // NewExpression + // CallExpression + // + // Our simplification: + // + // LeftHandSideExpression: See 11.2 + // MemberExpression + // CallExpression + // + // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with + // MemberExpression to make our lives easier. + // + // to best understand the below code, it's important to see how CallExpression expands + // out into its own productions: + // + // CallExpression: + // MemberExpression Arguments + // CallExpression Arguments + // CallExpression[Expression] + // CallExpression.IdentifierName + // super ( ArgumentListopt ) + // super.IdentifierName + // + // Because of the recursion in these calls, we need to bottom out first. There are two + // bottom out states we can run into. Either we see 'super' which must start either of + // the last two CallExpression productions. Or we have a MemberExpression which either + // completes the LeftHandSideExpression, or starts the beginning of the first four + // CallExpression productions. + var expression = token === 95 /* SuperKeyword */ + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); + // Now, we *may* be complete. However, we might have consumed the start of a + // CallExpression. As such, we need to consume the rest of it here to be complete. + return parseCallExpressionRest(expression); + } + function parseMemberExpressionOrHigher() { + // Note: to make our lives simpler, we decompose the the NewExpression productions and + // place ObjectCreationExpression and FunctionExpression into PrimaryExpression. + // like so: + // + // PrimaryExpression : See 11.1 + // this + // Identifier + // Literal + // ArrayLiteral + // ObjectLiteral + // (Expression) + // FunctionExpression + // new MemberExpression Arguments? + // + // MemberExpression : See 11.2 + // PrimaryExpression + // MemberExpression[Expression] + // MemberExpression.IdentifierName + // + // CallExpression : See 11.2 + // MemberExpression + // CallExpression Arguments + // CallExpression[Expression] + // CallExpression.IdentifierName + // + // Technically this is ambiguous. i.e. CallExpression defines: + // + // CallExpression: + // CallExpression Arguments + // + // If you see: "new Foo()" + // + // Then that could be treated as a single ObjectCreationExpression, or it could be + // treated as the invocation of "new Foo". We disambiguate that in code (to match + // the original grammar) by making sure that if we see an ObjectCreationExpression + // we always consume arguments if they are there. So we treat "new Foo()" as an + // object creation only, and not at all as an invocation) Another way to think + // about this is that for every "new" that we see, we will consume an argument list if + // it is there as part of the *associated* object creation node. Any additional + // argument lists we see, will become invocation expressions. + // + // Because there are no other places in the grammar now that refer to FunctionExpression + // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression + // production. + // + // Because CallExpression and MemberExpression are left recursive, we need to bottom out + // of the recursion immediately. So we parse out a primary expression to start with. + var expression = parsePrimaryExpression(); + return parseMemberExpressionRest(expression); + } + function parseSuperExpression() { + var expression = parseTokenNode(); + if (token === 17 /* OpenParenToken */ || token === 21 /* DotToken */ || token === 19 /* OpenBracketToken */) { + return expression; + } + // If we have seen "super" it must be followed by '(' or '.'. + // If it wasn't then just try to parse out a '.' and report an error. + var node = createNode(166 /* PropertyAccessExpression */, expression.pos); + node.expression = expression; + node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); + return finishNode(node); + } + function parseJsxElementOrSelfClosingElement(inExpressionContext) { + var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); + var result; + if (opening.kind === 235 /* JsxOpeningElement */) { + var node = createNode(233 /* JsxElement */, opening.pos); + node.openingElement = opening; + node.children = parseJsxChildren(node.openingElement.tagName); + node.closingElement = parseJsxClosingElement(inExpressionContext); + result = finishNode(node); + } + else { + ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */); + // Nothing else to do for self-closing elements + result = opening; + } + // If the user writes the invalid code '
' in an expression context (i.e. not wrapped in + // an enclosing tag), we'll naively try to parse ^ this as a 'less than' operator and the remainder of the tag + // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX + // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter + // does less damage and we can report a better error. + // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios + // of one sort or another. + if (inExpressionContext && token === 25 /* LessThanToken */) { + var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); }); + if (invalidElement) { + parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); + var badNode = createNode(181 /* BinaryExpression */, result.pos); + badNode.end = invalidElement.end; + badNode.left = result; + badNode.right = invalidElement; + badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); + badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; + return badNode; + } + } + return result; + } + function parseJsxText() { + var node = createNode(236 /* JsxText */, scanner.getStartPos()); + token = scanner.scanJsxToken(); + return finishNode(node); + } + function parseJsxChild() { + switch (token) { + case 236 /* JsxText */: + return parseJsxText(); + case 15 /* OpenBraceToken */: + return parseJsxExpression(/*inExpressionContext*/ false); + case 25 /* LessThanToken */: + return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ false); + } + ts.Debug.fail("Unknown JSX child kind " + token); + } + function parseJsxChildren(openingTagName) { + var result = []; + result.pos = scanner.getStartPos(); + var saveParsingContext = parsingContext; + parsingContext |= 1 << 14 /* JsxChildren */; while (true) { - // We either have a binary operator here, or we're finished. We call - // reScanGreaterToken so that we merge token sequences like > and = into >= - reScanGreaterToken(); - var newPrecedence = getBinaryOperatorPrecedence(); - // Check the precedence to see if we should "take" this operator - // - For left associative operator (all operator but **), consume the operator, - // recursively call the function below, and parse binaryExpression as a rightOperand - // of the caller if the new precendence of the operator is greater then or equal to the current precendence. - // For example: - // a - b - c; - // ^token; leftOperand = b. Return b to the caller as a rightOperand - // a * b - c - // ^token; leftOperand = b. Return b to the caller as a rightOperand - // a - b * c; - // ^token; leftOperand = b. Return b * c to the caller as a rightOperand - // - For right associative operator (**), consume the operator, recursively call the function - // and parse binaryExpression as a rightOperand of the caller if the new precendence of - // the operator is strictly grater than the current precendence - // For example: - // a ** b ** c; - // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand - // a - b ** c; - // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand - // a ** b - c - // ^token; leftOperand = b. Return b to the caller as a rightOperand - var consumeCurrentOperator = token === 38 /* AsteriskAsteriskToken */ ? - newPrecedence >= precedence : - newPrecedence > precedence; - if (!consumeCurrentOperator) { + token = scanner.reScanJsxToken(); + if (token === 26 /* LessThanSlashToken */) { break; } - if (token === 90 /* InKeyword */ && inDisallowInContext()) { + else if (token === 1 /* EndOfFileToken */) { + parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); break; } - if (token === 116 /* AsKeyword */) { - // Make sure we *do* perform ASI for constructs like this: - // var x = foo - // as (Bar) - // This should be parsed as an initialized variable, followed - // by a function call to 'as' with the argument 'Bar' - if (scanner.hasPrecedingLineBreak()) { - break; - } - else { - nextToken(); - leftOperand = makeAsExpression(leftOperand, parseType()); - } + result.push(parseJsxChild()); + } + result.end = scanner.getTokenPos(); + parsingContext = saveParsingContext; + return result; + } + function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { + var fullStart = scanner.getStartPos(); + parseExpected(25 /* LessThanToken */); + var tagName = parseJsxElementName(); + var attributes = parseList(13 /* JsxAttributes */, parseJsxAttribute); + var node; + if (token === 27 /* GreaterThanToken */) { + // Closing tag, so scan the immediately-following text with the JSX scanning instead + // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate + // scanning errors + node = createNode(235 /* JsxOpeningElement */, fullStart); + scanJsxText(); + } + else { + parseExpected(39 /* SlashToken */); + if (inExpressionContext) { + parseExpected(27 /* GreaterThanToken */); } else { - leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); + scanJsxText(); } + node = createNode(234 /* JsxSelfClosingElement */, fullStart); } - return leftOperand; + node.tagName = tagName; + node.attributes = attributes; + return finishNode(node); } - function isBinaryOperator() { - if (inDisallowInContext() && token === 90 /* InKeyword */) { - return false; + function parseJsxElementName() { + scanJsxIdentifier(); + var elementName = parseIdentifierName(); + while (parseOptional(21 /* DotToken */)) { + scanJsxIdentifier(); + var node = createNode(135 /* QualifiedName */, elementName.pos); + node.left = elementName; + node.right = parseIdentifierName(); + elementName = finishNode(node); } - return getBinaryOperatorPrecedence() > 0; + return elementName; } - function getBinaryOperatorPrecedence() { - switch (token) { - case 52 /* BarBarToken */: - return 1; - case 51 /* AmpersandAmpersandToken */: - return 2; - case 47 /* BarToken */: - return 3; - case 48 /* CaretToken */: - return 4; - case 46 /* AmpersandToken */: - return 5; - case 30 /* EqualsEqualsToken */: - case 31 /* ExclamationEqualsToken */: - case 32 /* EqualsEqualsEqualsToken */: - case 33 /* ExclamationEqualsEqualsToken */: - return 6; - case 25 /* LessThanToken */: - case 27 /* GreaterThanToken */: - case 28 /* LessThanEqualsToken */: - case 29 /* GreaterThanEqualsToken */: - case 91 /* InstanceOfKeyword */: - case 90 /* InKeyword */: - case 116 /* AsKeyword */: - return 7; - case 43 /* LessThanLessThanToken */: - case 44 /* GreaterThanGreaterThanToken */: - case 45 /* GreaterThanGreaterThanGreaterThanToken */: - return 8; - case 35 /* PlusToken */: - case 36 /* MinusToken */: - return 9; - case 37 /* AsteriskToken */: - case 39 /* SlashToken */: - case 40 /* PercentToken */: - return 10; - case 38 /* AsteriskAsteriskToken */: - return 11; + function parseJsxExpression(inExpressionContext) { + var node = createNode(240 /* JsxExpression */); + parseExpected(15 /* OpenBraceToken */); + if (token !== 16 /* CloseBraceToken */) { + node.expression = parseExpression(); + } + if (inExpressionContext) { + parseExpected(16 /* CloseBraceToken */); + } + else { + parseExpected(16 /* CloseBraceToken */, /*message*/ undefined, /*advance*/ false); + scanJsxText(); } - // -1 is lower than all other precedences. Returning it will cause binary expression - // parsing to stop. - return -1; - } - function makeBinaryExpression(left, operatorToken, right) { - var node = createNode(181 /* BinaryExpression */, left.pos); - node.left = left; - node.operatorToken = operatorToken; - node.right = right; return finishNode(node); } - function makeAsExpression(left, right) { - var node = createNode(189 /* AsExpression */, left.pos); - node.expression = left; - node.type = right; + function parseJsxAttribute() { + if (token === 15 /* OpenBraceToken */) { + return parseJsxSpreadAttribute(); + } + scanJsxIdentifier(); + var node = createNode(238 /* JsxAttribute */); + node.name = parseIdentifierName(); + if (parseOptional(56 /* EqualsToken */)) { + switch (token) { + case 9 /* StringLiteral */: + node.initializer = parseLiteralNode(); + break; + default: + node.initializer = parseJsxExpression(/*inExpressionContext*/ true); + break; + } + } return finishNode(node); } - function parsePrefixUnaryExpression() { - var node = createNode(179 /* PrefixUnaryExpression */); - node.operator = token; - nextToken(); - node.operand = parseSimpleUnaryExpression(); + function parseJsxSpreadAttribute() { + var node = createNode(239 /* JsxSpreadAttribute */); + parseExpected(15 /* OpenBraceToken */); + parseExpected(22 /* DotDotDotToken */); + node.expression = parseExpression(); + parseExpected(16 /* CloseBraceToken */); return finishNode(node); } - function parseDeleteExpression() { - var node = createNode(175 /* DeleteExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); + function parseJsxClosingElement(inExpressionContext) { + var node = createNode(237 /* JsxClosingElement */); + parseExpected(26 /* LessThanSlashToken */); + node.tagName = parseJsxElementName(); + if (inExpressionContext) { + parseExpected(27 /* GreaterThanToken */); + } + else { + parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); + scanJsxText(); + } return finishNode(node); } - function parseTypeOfExpression() { - var node = createNode(176 /* TypeOfExpression */); - nextToken(); + function parseTypeAssertion() { + var node = createNode(171 /* TypeAssertionExpression */); + parseExpected(25 /* LessThanToken */); + node.type = parseType(); + parseExpected(27 /* GreaterThanToken */); node.expression = parseSimpleUnaryExpression(); return finishNode(node); } - function parseVoidExpression() { - var node = createNode(177 /* VoidExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseMemberExpressionRest(expression) { + while (true) { + var dotToken = parseOptionalToken(21 /* DotToken */); + if (dotToken) { + var propertyAccess = createNode(166 /* PropertyAccessExpression */, expression.pos); + propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; + propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); + expression = finishNode(propertyAccess); + continue; + } + // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName + if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) { + var indexedAccess = createNode(167 /* ElementAccessExpression */, expression.pos); + indexedAccess.expression = expression; + // It's not uncommon for a user to write: "new Type[]". + // Check for that common pattern and report a better error message. + if (token !== 20 /* CloseBracketToken */) { + indexedAccess.argumentExpression = allowInAnd(parseExpression); + if (indexedAccess.argumentExpression.kind === 9 /* StringLiteral */ || indexedAccess.argumentExpression.kind === 8 /* NumericLiteral */) { + var literal = indexedAccess.argumentExpression; + literal.text = internIdentifier(literal.text); + } + } + parseExpected(20 /* CloseBracketToken */); + expression = finishNode(indexedAccess); + continue; + } + if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) { + var tagExpression = createNode(170 /* TaggedTemplateExpression */, expression.pos); + tagExpression.tag = expression; + tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */ + ? parseLiteralNode() + : parseTemplateExpression(); + expression = finishNode(tagExpression); + continue; + } + return expression; + } } - function isAwaitExpression() { - if (token === 119 /* AwaitKeyword */) { - if (inAwaitContext()) { - return true; + function parseCallExpressionRest(expression) { + while (true) { + expression = parseMemberExpressionRest(expression); + if (token === 25 /* LessThanToken */) { + // See if this is the start of a generic invocation. If so, consume it and + // keep checking for postfix expressions. Otherwise, it's just a '<' that's + // part of an arithmetic expression. Break out so we consume it higher in the + // stack. + var typeArguments = tryParse(parseTypeArgumentsInExpression); + if (!typeArguments) { + return expression; + } + var callExpr = createNode(168 /* CallExpression */, expression.pos); + callExpr.expression = expression; + callExpr.typeArguments = typeArguments; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; } - // here we are using similar heuristics as 'isYieldExpression' - return lookAhead(nextTokenIsIdentifierOnSameLine); + else if (token === 17 /* OpenParenToken */) { + var callExpr = createNode(168 /* CallExpression */, expression.pos); + callExpr.expression = expression; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; + } + return expression; } - return false; } - function parseAwaitExpression() { - var node = createNode(178 /* AwaitExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseArgumentList() { + parseExpected(17 /* OpenParenToken */); + var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression); + parseExpected(18 /* CloseParenToken */); + return result; } - /** - * Parse ES7 unary expression and await expression - * - * ES7 UnaryExpression: - * 1) SimpleUnaryExpression[?yield] - * 2) IncrementExpression[?yield] ** UnaryExpression[?yield] - */ - function parseUnaryExpressionOrHigher() { - if (isAwaitExpression()) { - return parseAwaitExpression(); - } - if (isIncrementExpression()) { - var incrementExpression = parseIncrementExpression(); - return token === 38 /* AsteriskAsteriskToken */ ? - parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : - incrementExpression; + function parseTypeArgumentsInExpression() { + if (!parseOptional(25 /* LessThanToken */)) { + return undefined; } - var unaryOperator = token; - var simpleUnaryExpression = parseSimpleUnaryExpression(); - if (token === 38 /* AsteriskAsteriskToken */) { - var diagnostic; - var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); - if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); - } - else { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); - } + var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType); + if (!parseExpected(27 /* GreaterThanToken */)) { + // If it doesn't have the closing > then it's definitely not an type argument list. + return undefined; } - return simpleUnaryExpression; + // If we have a '<', then only parse this as a arugment list if the type arguments + // are complete and we have an open paren. if we don't, rewind and return nothing. + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } - /** - * Parse ES7 simple-unary expression or higher: - * - * ES7 SimpleUnaryExpression: - * 1) IncrementExpression[?yield] - * 2) delete UnaryExpression[?yield] - * 3) void UnaryExpression[?yield] - * 4) typeof UnaryExpression[?yield] - * 5) + UnaryExpression[?yield] - * 6) - UnaryExpression[?yield] - * 7) ~ UnaryExpression[?yield] - * 8) ! UnaryExpression[?yield] - */ - function parseSimpleUnaryExpression() { + function canFollowTypeArgumentsInExpression() { switch (token) { - case 35 /* PlusToken */: - case 36 /* MinusToken */: - case 50 /* TildeToken */: - case 49 /* ExclamationToken */: - return parsePrefixUnaryExpression(); - case 78 /* DeleteKeyword */: - return parseDeleteExpression(); - case 101 /* TypeOfKeyword */: - return parseTypeOfExpression(); - case 103 /* VoidKeyword */: - return parseVoidExpression(); - case 25 /* LessThanToken */: - // This is modified UnaryExpression grammar in TypeScript - // UnaryExpression (modified): - // < type > UnaryExpression - return parseTypeAssertion(); + case 17 /* OpenParenToken */: // foo( + // this case are the only case where this token can legally follow a type argument + // list. So we definitely want to treat this as a type arg list. + case 21 /* DotToken */: // foo. + case 18 /* CloseParenToken */: // foo) + case 20 /* CloseBracketToken */: // foo] + case 54 /* ColonToken */: // foo: + case 23 /* SemicolonToken */: // foo; + case 53 /* QuestionToken */: // foo? + case 30 /* EqualsEqualsToken */: // foo == + case 32 /* EqualsEqualsEqualsToken */: // foo === + case 31 /* ExclamationEqualsToken */: // foo != + case 33 /* ExclamationEqualsEqualsToken */: // foo !== + case 51 /* AmpersandAmpersandToken */: // foo && + case 52 /* BarBarToken */: // foo || + case 48 /* CaretToken */: // foo ^ + case 46 /* AmpersandToken */: // foo & + case 47 /* BarToken */: // foo | + case 16 /* CloseBraceToken */: // foo } + case 1 /* EndOfFileToken */: + // these cases can't legally follow a type arg list. However, they're not legal + // expressions either. The user is probably in the middle of a generic type. So + // treat it as such. + return true; + case 24 /* CommaToken */: // foo, + case 15 /* OpenBraceToken */: // foo { + // We don't want to treat these as type arguments. Otherwise we'll parse this + // as an invocation expression. Instead, we want to parse out the expression + // in isolation from the type arguments. default: - return parseIncrementExpression(); + // Anything else treat as an expression. + return false; } } - /** - * Check if the current token can possibly be an ES7 increment expression. - * - * ES7 IncrementExpression: - * LeftHandSideExpression[?Yield] - * LeftHandSideExpression[?Yield][no LineTerminator here]++ - * LeftHandSideExpression[?Yield][no LineTerminator here]-- - * ++LeftHandSideExpression[?Yield] - * --LeftHandSideExpression[?Yield] - */ - function isIncrementExpression() { - // This function is called inside parseUnaryExpression to decide - // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly + function parsePrimaryExpression() { switch (token) { - case 35 /* PlusToken */: - case 36 /* MinusToken */: - case 50 /* TildeToken */: - case 49 /* ExclamationToken */: - case 78 /* DeleteKeyword */: - case 101 /* TypeOfKeyword */: - case 103 /* VoidKeyword */: - return false; - case 25 /* LessThanToken */: - // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression - if (sourceFile.languageVariant !== 1 /* JSX */) { - return false; + case 8 /* NumericLiteral */: + case 9 /* StringLiteral */: + case 11 /* NoSubstitutionTemplateLiteral */: + return parseLiteralNode(); + case 97 /* ThisKeyword */: + case 95 /* SuperKeyword */: + case 93 /* NullKeyword */: + case 99 /* TrueKeyword */: + case 84 /* FalseKeyword */: + return parseTokenNode(); + case 17 /* OpenParenToken */: + return parseParenthesizedExpression(); + case 19 /* OpenBracketToken */: + return parseArrayLiteralExpression(); + case 15 /* OpenBraceToken */: + return parseObjectLiteralExpression(); + case 118 /* AsyncKeyword */: + // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher. + // If we encounter `async [no LineTerminator here] function` then this is an async + // function; otherwise, its an identifier. + if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { + break; } - // We are in JSX context and the token is part of JSXElement. - // Fall through - default: - return true; + return parseFunctionExpression(); + case 73 /* ClassKeyword */: + return parseClassExpression(); + case 87 /* FunctionKeyword */: + return parseFunctionExpression(); + case 92 /* NewKeyword */: + return parseNewExpression(); + case 39 /* SlashToken */: + case 61 /* SlashEqualsToken */: + if (reScanSlashToken() === 10 /* RegularExpressionLiteral */) { + return parseLiteralNode(); + } + break; + case 12 /* TemplateHead */: + return parseTemplateExpression(); + } + return parseIdentifier(ts.Diagnostics.Expression_expected); + } + function parseParenthesizedExpression() { + var node = createNode(172 /* ParenthesizedExpression */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + return finishNode(node); + } + function parseSpreadElement() { + var node = createNode(185 /* SpreadElementExpression */); + parseExpected(22 /* DotDotDotToken */); + node.expression = parseAssignmentExpressionOrHigher(); + return finishNode(node); + } + function parseArgumentOrArrayLiteralElement() { + return token === 22 /* DotDotDotToken */ ? parseSpreadElement() : + token === 24 /* CommaToken */ ? createNode(187 /* OmittedExpression */) : + parseAssignmentExpressionOrHigher(); + } + function parseArgumentExpression() { + return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); + } + function parseArrayLiteralExpression() { + var node = createNode(164 /* ArrayLiteralExpression */); + parseExpected(19 /* OpenBracketToken */); + if (scanner.hasPrecedingLineBreak()) + node.flags |= 1024 /* MultiLine */; + node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); + parseExpected(20 /* CloseBracketToken */); + return finishNode(node); + } + function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { + if (parseContextualModifier(123 /* GetKeyword */)) { + return parseAccessorDeclaration(145 /* GetAccessor */, fullStart, decorators, modifiers); + } + else if (parseContextualModifier(129 /* SetKeyword */)) { + return parseAccessorDeclaration(146 /* SetAccessor */, fullStart, decorators, modifiers); } + return undefined; } - /** - * Parse ES7 IncrementExpression. IncrementExpression is used instead of ES6's PostFixExpression. - * - * ES7 IncrementExpression[yield]: - * 1) LeftHandSideExpression[?yield] - * 2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++ - * 3) LeftHandSideExpression[?yield] [[no LineTerminator here]]-- - * 4) ++LeftHandSideExpression[?yield] - * 5) --LeftHandSideExpression[?yield] - * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression - */ - function parseIncrementExpression() { - if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) { - var node = createNode(179 /* PrefixUnaryExpression */); - node.operator = token; - nextToken(); - node.operand = parseLeftHandSideExpressionOrHigher(); - return finishNode(node); + function parseObjectLiteralElement() { + var fullStart = scanner.getStartPos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; } - else if (sourceFile.languageVariant === 1 /* JSX */ && token === 25 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeyword)) { - // JSXElement is part of primaryExpression - return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); + var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var tokenIsIdentifier = isIdentifier(); + var nameToken = token; + var propertyName = parsePropertyName(); + // Disallowing of optional property assignments happens in the grammar checker. + var questionToken = parseOptionalToken(53 /* QuestionToken */); + if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); } - var expression = parseLeftHandSideExpressionOrHigher(); - ts.Debug.assert(ts.isLeftHandSideExpression(expression)); - if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) { - var node = createNode(180 /* PostfixUnaryExpression */, expression.pos); - node.operand = expression; - node.operator = token; - nextToken(); - return finishNode(node); + // check if it is short-hand property assignment or normal property assignment + // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production + // CoverInitializedName[Yield] : + // IdentifierReference[?Yield] Initializer[In, ?Yield] + // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern + var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */); + if (isShorthandPropertyAssignment) { + var shorthandDeclaration = createNode(246 /* ShorthandPropertyAssignment */, fullStart); + shorthandDeclaration.name = propertyName; + shorthandDeclaration.questionToken = questionToken; + var equalsToken = parseOptionalToken(56 /* EqualsToken */); + if (equalsToken) { + shorthandDeclaration.equalsToken = equalsToken; + shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); + } + return finishNode(shorthandDeclaration); + } + else { + var propertyAssignment = createNode(245 /* PropertyAssignment */, fullStart); + propertyAssignment.name = propertyName; + propertyAssignment.questionToken = questionToken; + parseExpected(54 /* ColonToken */); + propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); + return finishNode(propertyAssignment); } - return expression; } - function parseLeftHandSideExpressionOrHigher() { - // Original Ecma: - // LeftHandSideExpression: See 11.2 - // NewExpression - // CallExpression - // - // Our simplification: - // - // LeftHandSideExpression: See 11.2 - // MemberExpression - // CallExpression - // - // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with - // MemberExpression to make our lives easier. - // - // to best understand the below code, it's important to see how CallExpression expands - // out into its own productions: - // - // CallExpression: - // MemberExpression Arguments - // CallExpression Arguments - // CallExpression[Expression] - // CallExpression.IdentifierName - // super ( ArgumentListopt ) - // super.IdentifierName - // - // Because of the recursion in these calls, we need to bottom out first. There are two - // bottom out states we can run into. Either we see 'super' which must start either of - // the last two CallExpression productions. Or we have a MemberExpression which either - // completes the LeftHandSideExpression, or starts the beginning of the first four - // CallExpression productions. - var expression = token === 95 /* SuperKeyword */ - ? parseSuperExpression() - : parseMemberExpressionOrHigher(); - // Now, we *may* be complete. However, we might have consumed the start of a - // CallExpression. As such, we need to consume the rest of it here to be complete. - return parseCallExpressionRest(expression); + function parseObjectLiteralExpression() { + var node = createNode(165 /* ObjectLiteralExpression */); + parseExpected(15 /* OpenBraceToken */); + if (scanner.hasPrecedingLineBreak()) { + node.flags |= 1024 /* MultiLine */; + } + node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true); + parseExpected(16 /* CloseBraceToken */); + return finishNode(node); } - function parseMemberExpressionOrHigher() { - // Note: to make our lives simpler, we decompose the the NewExpression productions and - // place ObjectCreationExpression and FunctionExpression into PrimaryExpression. - // like so: - // - // PrimaryExpression : See 11.1 - // this - // Identifier - // Literal - // ArrayLiteral - // ObjectLiteral - // (Expression) - // FunctionExpression - // new MemberExpression Arguments? - // - // MemberExpression : See 11.2 - // PrimaryExpression - // MemberExpression[Expression] - // MemberExpression.IdentifierName - // - // CallExpression : See 11.2 - // MemberExpression - // CallExpression Arguments - // CallExpression[Expression] - // CallExpression.IdentifierName - // - // Technically this is ambiguous. i.e. CallExpression defines: - // - // CallExpression: - // CallExpression Arguments - // - // If you see: "new Foo()" - // - // Then that could be treated as a single ObjectCreationExpression, or it could be - // treated as the invocation of "new Foo". We disambiguate that in code (to match - // the original grammar) by making sure that if we see an ObjectCreationExpression - // we always consume arguments if they are there. So we treat "new Foo()" as an - // object creation only, and not at all as an invocation) Another way to think - // about this is that for every "new" that we see, we will consume an argument list if - // it is there as part of the *associated* object creation node. Any additional - // argument lists we see, will become invocation expressions. - // - // Because there are no other places in the grammar now that refer to FunctionExpression - // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression - // production. + function parseFunctionExpression() { + // GeneratorExpression: + // function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody } // - // Because CallExpression and MemberExpression are left recursive, we need to bottom out - // of the recursion immediately. So we parse out a primary expression to start with. - var expression = parsePrimaryExpression(); - return parseMemberExpressionRest(expression); + // FunctionExpression: + // function BindingIdentifier[opt](FormalParameters){ FunctionBody } + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); + } + var node = createNode(173 /* FunctionExpression */); + setModifiers(node, parseModifiers()); + parseExpected(87 /* FunctionKeyword */); + node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var isGenerator = !!node.asteriskToken; + var isAsync = !!(node.flags & 256 /* Async */); + node.name = + isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : + isGenerator ? doInYieldContext(parseOptionalIdentifier) : + isAsync ? doInAwaitContext(parseOptionalIdentifier) : + parseOptionalIdentifier(); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false); + if (saveDecoratorContext) { + setDecoratorContext(true); + } + return finishNode(node); } - function parseSuperExpression() { - var expression = parseTokenNode(); - if (token === 17 /* OpenParenToken */ || token === 21 /* DotToken */ || token === 19 /* OpenBracketToken */) { - return expression; + function parseOptionalIdentifier() { + return isIdentifier() ? parseIdentifier() : undefined; + } + function parseNewExpression() { + var node = createNode(169 /* NewExpression */); + parseExpected(92 /* NewKeyword */); + node.expression = parseMemberExpressionOrHigher(); + node.typeArguments = tryParse(parseTypeArgumentsInExpression); + if (node.typeArguments || token === 17 /* OpenParenToken */) { + node.arguments = parseArgumentList(); } - // If we have seen "super" it must be followed by '(' or '.'. - // If it wasn't then just try to parse out a '.' and report an error. - var node = createNode(166 /* PropertyAccessExpression */, expression.pos); - node.expression = expression; - node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); - node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); return finishNode(node); } - function parseJsxElementOrSelfClosingElement(inExpressionContext) { - var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); - var result; - if (opening.kind === 235 /* JsxOpeningElement */) { - var node = createNode(233 /* JsxElement */, opening.pos); - node.openingElement = opening; - node.children = parseJsxChildren(node.openingElement.tagName); - node.closingElement = parseJsxClosingElement(inExpressionContext); - result = finishNode(node); + // STATEMENTS + function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { + var node = createNode(192 /* Block */); + if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) { + node.statements = parseList(1 /* BlockStatements */, parseStatement); + parseExpected(16 /* CloseBraceToken */); } else { - ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */); - // Nothing else to do for self-closing elements - result = opening; + node.statements = createMissingList(); } - // If the user writes the invalid code '
' in an expression context (i.e. not wrapped in - // an enclosing tag), we'll naively try to parse ^ this as a 'less than' operator and the remainder of the tag - // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX - // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter - // does less damage and we can report a better error. - // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios - // of one sort or another. - if (inExpressionContext && token === 25 /* LessThanToken */) { - var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); }); - if (invalidElement) { - parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); - var badNode = createNode(181 /* BinaryExpression */, result.pos); - badNode.end = invalidElement.end; - badNode.left = result; - badNode.right = invalidElement; - badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); - badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; - return badNode; - } + return finishNode(node); + } + function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { + var savedYieldContext = inYieldContext(); + setYieldContext(allowYield); + var savedAwaitContext = inAwaitContext(); + setAwaitContext(allowAwait); + // We may be in a [Decorator] context when parsing a function expression or + // arrow function. The body of the function is not in [Decorator] context. + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); } - return result; + var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); + if (saveDecoratorContext) { + setDecoratorContext(true); + } + setYieldContext(savedYieldContext); + setAwaitContext(savedAwaitContext); + return block; } - function parseJsxText() { - var node = createNode(236 /* JsxText */, scanner.getStartPos()); - token = scanner.scanJsxToken(); + function parseEmptyStatement() { + var node = createNode(194 /* EmptyStatement */); + parseExpected(23 /* SemicolonToken */); return finishNode(node); } - function parseJsxChild() { - switch (token) { - case 236 /* JsxText */: - return parseJsxText(); - case 15 /* OpenBraceToken */: - return parseJsxExpression(/*inExpressionContext*/ false); - case 25 /* LessThanToken */: - return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ false); - } - ts.Debug.fail("Unknown JSX child kind " + token); + function parseIfStatement() { + var node = createNode(196 /* IfStatement */); + parseExpected(88 /* IfKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.thenStatement = parseStatement(); + node.elseStatement = parseOptional(80 /* ElseKeyword */) ? parseStatement() : undefined; + return finishNode(node); } - function parseJsxChildren(openingTagName) { - var result = []; - result.pos = scanner.getStartPos(); - var saveParsingContext = parsingContext; - parsingContext |= 1 << 14 /* JsxChildren */; - while (true) { - token = scanner.reScanJsxToken(); - if (token === 26 /* LessThanSlashToken */) { - break; + function parseDoStatement() { + var node = createNode(197 /* DoStatement */); + parseExpected(79 /* DoKeyword */); + node.statement = parseStatement(); + parseExpected(104 /* WhileKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html + // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in + // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby + // do;while(0)x will have a semicolon inserted before x. + parseOptional(23 /* SemicolonToken */); + return finishNode(node); + } + function parseWhileStatement() { + var node = createNode(198 /* WhileStatement */); + parseExpected(104 /* WhileKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.statement = parseStatement(); + return finishNode(node); + } + function parseForOrForInOrForOfStatement() { + var pos = getNodePos(); + parseExpected(86 /* ForKeyword */); + parseExpected(17 /* OpenParenToken */); + var initializer = undefined; + if (token !== 23 /* SemicolonToken */) { + if (token === 102 /* VarKeyword */ || token === 108 /* LetKeyword */ || token === 74 /* ConstKeyword */) { + initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true); } - else if (token === 1 /* EndOfFileToken */) { - parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); - break; + else { + initializer = disallowInAnd(parseExpression); } - result.push(parseJsxChild()); } - result.end = scanner.getTokenPos(); - parsingContext = saveParsingContext; - return result; - } - function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { - var fullStart = scanner.getStartPos(); - parseExpected(25 /* LessThanToken */); - var tagName = parseJsxElementName(); - var attributes = parseList(13 /* JsxAttributes */, parseJsxAttribute); - var node; - if (token === 27 /* GreaterThanToken */) { - // Closing tag, so scan the immediately-following text with the JSX scanning instead - // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate - // scanning errors - node = createNode(235 /* JsxOpeningElement */, fullStart); - scanJsxText(); + var forOrForInOrForOfStatement; + if (parseOptional(90 /* InKeyword */)) { + var forInStatement = createNode(200 /* ForInStatement */, pos); + forInStatement.initializer = initializer; + forInStatement.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forInStatement; + } + else if (parseOptional(134 /* OfKeyword */)) { + var forOfStatement = createNode(201 /* ForOfStatement */, pos); + forOfStatement.initializer = initializer; + forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forOfStatement; } else { - parseExpected(39 /* SlashToken */); - if (inExpressionContext) { - parseExpected(27 /* GreaterThanToken */); + var forStatement = createNode(199 /* ForStatement */, pos); + forStatement.initializer = initializer; + parseExpected(23 /* SemicolonToken */); + if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) { + forStatement.condition = allowInAnd(parseExpression); } - else { - parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); - scanJsxText(); + parseExpected(23 /* SemicolonToken */); + if (token !== 18 /* CloseParenToken */) { + forStatement.incrementor = allowInAnd(parseExpression); } - node = createNode(234 /* JsxSelfClosingElement */, fullStart); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forStatement; } - node.tagName = tagName; - node.attributes = attributes; + forOrForInOrForOfStatement.statement = parseStatement(); + return finishNode(forOrForInOrForOfStatement); + } + function parseBreakOrContinueStatement(kind) { + var node = createNode(kind); + parseExpected(kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */); + if (!canParseSemicolon()) { + node.label = parseIdentifier(); + } + parseSemicolon(); return finishNode(node); } - function parseJsxElementName() { - scanJsxIdentifier(); - var elementName = parseIdentifierName(); - while (parseOptional(21 /* DotToken */)) { - scanJsxIdentifier(); - var node = createNode(135 /* QualifiedName */, elementName.pos); - node.left = elementName; - node.right = parseIdentifierName(); - elementName = finishNode(node); + function parseReturnStatement() { + var node = createNode(204 /* ReturnStatement */); + parseExpected(94 /* ReturnKeyword */); + if (!canParseSemicolon()) { + node.expression = allowInAnd(parseExpression); } - return elementName; + parseSemicolon(); + return finishNode(node); } - function parseJsxExpression(inExpressionContext) { - var node = createNode(240 /* JsxExpression */); + function parseWithStatement() { + var node = createNode(205 /* WithStatement */); + parseExpected(105 /* WithKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.statement = parseStatement(); + return finishNode(node); + } + function parseCaseClause() { + var node = createNode(241 /* CaseClause */); + parseExpected(71 /* CaseKeyword */); + node.expression = allowInAnd(parseExpression); + parseExpected(54 /* ColonToken */); + node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(node); + } + function parseDefaultClause() { + var node = createNode(242 /* DefaultClause */); + parseExpected(77 /* DefaultKeyword */); + parseExpected(54 /* ColonToken */); + node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(node); + } + function parseCaseOrDefaultClause() { + return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + } + function parseSwitchStatement() { + var node = createNode(206 /* SwitchStatement */); + parseExpected(96 /* SwitchKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + var caseBlock = createNode(220 /* CaseBlock */, scanner.getStartPos()); parseExpected(15 /* OpenBraceToken */); - if (token !== 16 /* CloseBraceToken */) { - node.expression = parseExpression(); - } - if (inExpressionContext) { - parseExpected(16 /* CloseBraceToken */); - } - else { - parseExpected(16 /* CloseBraceToken */, /*message*/ undefined, /*advance*/ false); - scanJsxText(); - } + caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); + parseExpected(16 /* CloseBraceToken */); + node.caseBlock = finishNode(caseBlock); return finishNode(node); } - function parseJsxAttribute() { - if (token === 15 /* OpenBraceToken */) { - return parseJsxSpreadAttribute(); - } - scanJsxIdentifier(); - var node = createNode(238 /* JsxAttribute */); - node.name = parseIdentifierName(); - if (parseOptional(56 /* EqualsToken */)) { - switch (token) { - case 9 /* StringLiteral */: - node.initializer = parseLiteralNode(); - break; - default: - node.initializer = parseJsxExpression(/*inExpressionContext*/ true); - break; - } + function parseThrowStatement() { + // ThrowStatement[Yield] : + // throw [no LineTerminator here]Expression[In, ?Yield]; + // Because of automatic semicolon insertion, we need to report error if this + // throw could be terminated with a semicolon. Note: we can't call 'parseExpression' + // directly as that might consume an expression on the following line. + // We just return 'undefined' in that case. The actual error will be reported in the + // grammar walker. + var node = createNode(208 /* ThrowStatement */); + parseExpected(98 /* ThrowKeyword */); + node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + parseSemicolon(); + return finishNode(node); + } + // TODO: Review for error recovery + function parseTryStatement() { + var node = createNode(209 /* TryStatement */); + parseExpected(100 /* TryKeyword */); + node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); + node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined; + // If we don't have a catch clause, then we must have a finally clause. Try to parse + // one out no matter what. + if (!node.catchClause || token === 85 /* FinallyKeyword */) { + parseExpected(85 /* FinallyKeyword */); + node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); } return finishNode(node); } - function parseJsxSpreadAttribute() { - var node = createNode(239 /* JsxSpreadAttribute */); - parseExpected(15 /* OpenBraceToken */); - parseExpected(22 /* DotDotDotToken */); - node.expression = parseExpression(); - parseExpected(16 /* CloseBraceToken */); + function parseCatchClause() { + var result = createNode(244 /* CatchClause */); + parseExpected(72 /* CatchKeyword */); + if (parseExpected(17 /* OpenParenToken */)) { + result.variableDeclaration = parseVariableDeclaration(); + } + parseExpected(18 /* CloseParenToken */); + result.block = parseBlock(/*ignoreMissingOpenBrace*/ false); + return finishNode(result); + } + function parseDebuggerStatement() { + var node = createNode(210 /* DebuggerStatement */); + parseExpected(76 /* DebuggerKeyword */); + parseSemicolon(); return finishNode(node); } - function parseJsxClosingElement(inExpressionContext) { - var node = createNode(237 /* JsxClosingElement */); - parseExpected(26 /* LessThanSlashToken */); - node.tagName = parseJsxElementName(); - if (inExpressionContext) { - parseExpected(27 /* GreaterThanToken */); + function parseExpressionOrLabeledStatement() { + // Avoiding having to do the lookahead for a labeled statement by just trying to parse + // out an expression, seeing if it is identifier and then seeing if it is followed by + // a colon. + var fullStart = scanner.getStartPos(); + var expression = allowInAnd(parseExpression); + if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) { + var labeledStatement = createNode(207 /* LabeledStatement */, fullStart); + labeledStatement.label = expression; + labeledStatement.statement = parseStatement(); + return finishNode(labeledStatement); } else { - parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); - scanJsxText(); + var expressionStatement = createNode(195 /* ExpressionStatement */, fullStart); + expressionStatement.expression = expression; + parseSemicolon(); + return finishNode(expressionStatement); } - return finishNode(node); } - function parseTypeAssertion() { - var node = createNode(171 /* TypeAssertionExpression */); - parseExpected(25 /* LessThanToken */); - node.type = parseType(); - parseExpected(27 /* GreaterThanToken */); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function nextTokenIsIdentifierOrKeywordOnSameLine() { + nextToken(); + return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); } - function parseMemberExpressionRest(expression) { - while (true) { - var dotToken = parseOptionalToken(21 /* DotToken */); - if (dotToken) { - var propertyAccess = createNode(166 /* PropertyAccessExpression */, expression.pos); - propertyAccess.expression = expression; - propertyAccess.dotToken = dotToken; - propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); - expression = finishNode(propertyAccess); - continue; - } - // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName - if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) { - var indexedAccess = createNode(167 /* ElementAccessExpression */, expression.pos); - indexedAccess.expression = expression; - // It's not uncommon for a user to write: "new Type[]". - // Check for that common pattern and report a better error message. - if (token !== 20 /* CloseBracketToken */) { - indexedAccess.argumentExpression = allowInAnd(parseExpression); - if (indexedAccess.argumentExpression.kind === 9 /* StringLiteral */ || indexedAccess.argumentExpression.kind === 8 /* NumericLiteral */) { - var literal = indexedAccess.argumentExpression; - literal.text = internIdentifier(literal.text); - } - } - parseExpected(20 /* CloseBracketToken */); - expression = finishNode(indexedAccess); - continue; - } - if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) { - var tagExpression = createNode(170 /* TaggedTemplateExpression */, expression.pos); - tagExpression.tag = expression; - tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */ - ? parseLiteralNode() - : parseTemplateExpression(); - expression = finishNode(tagExpression); - continue; - } - return expression; - } + function nextTokenIsFunctionKeywordOnSameLine() { + nextToken(); + return token === 87 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); } - function parseCallExpressionRest(expression) { + function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { + nextToken(); + return (ts.tokenIsIdentifierOrKeyword(token) || token === 8 /* NumericLiteral */) && !scanner.hasPrecedingLineBreak(); + } + function isDeclaration() { while (true) { - expression = parseMemberExpressionRest(expression); - if (token === 25 /* LessThanToken */) { - // See if this is the start of a generic invocation. If so, consume it and - // keep checking for postfix expressions. Otherwise, it's just a '<' that's - // part of an arithmetic expression. Break out so we consume it higher in the - // stack. - var typeArguments = tryParse(parseTypeArgumentsInExpression); - if (!typeArguments) { - return expression; - } - var callExpr = createNode(168 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.typeArguments = typeArguments; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; - } - else if (token === 17 /* OpenParenToken */) { - var callExpr = createNode(168 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; + switch (token) { + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 74 /* ConstKeyword */: + case 87 /* FunctionKeyword */: + case 73 /* ClassKeyword */: + case 81 /* EnumKeyword */: + return true; + // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers; + // however, an identifier cannot be followed by another identifier on the same line. This is what we + // count on to parse out the respective declarations. For instance, we exploit this to say that + // + // namespace n + // + // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees + // + // namespace + // n + // + // as the identifier 'namespace' on one line followed by the identifier 'n' on another. + // We need to look one token ahead to see if it permissible to try parsing a declaration. + // + // *Note*: 'interface' is actually a strict mode reserved word. So while + // + // "use strict" + // interface + // I {} + // + // could be legal, it would add complexity for very little gain. + case 107 /* InterfaceKeyword */: + case 132 /* TypeKeyword */: + return nextTokenIsIdentifierOnSameLine(); + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + return nextTokenIsIdentifierOrStringLiteralOnSameLine(); + case 115 /* AbstractKeyword */: + case 118 /* AsyncKeyword */: + case 122 /* DeclareKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 112 /* PublicKeyword */: + nextToken(); + // ASI takes effect for this modifier. + if (scanner.hasPrecedingLineBreak()) { + return false; + } + continue; + case 89 /* ImportKeyword */: + nextToken(); + return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token); + case 82 /* ExportKeyword */: + nextToken(); + if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) { + return true; + } + continue; + case 113 /* StaticKeyword */: + nextToken(); + continue; + default: + return false; } - return expression; } } - function parseArgumentList() { - parseExpected(17 /* OpenParenToken */); - var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression); - parseExpected(18 /* CloseParenToken */); - return result; - } - function parseTypeArgumentsInExpression() { - if (!parseOptional(25 /* LessThanToken */)) { - return undefined; - } - var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType); - if (!parseExpected(27 /* GreaterThanToken */)) { - // If it doesn't have the closing > then it's definitely not an type argument list. - return undefined; - } - // If we have a '<', then only parse this as a arugment list if the type arguments - // are complete and we have an open paren. if we don't, rewind and return nothing. - return typeArguments && canFollowTypeArgumentsInExpression() - ? typeArguments - : undefined; + function isStartOfDeclaration() { + return lookAhead(isDeclaration); } - function canFollowTypeArgumentsInExpression() { + function isStartOfStatement() { switch (token) { - case 17 /* OpenParenToken */: // foo( - // this case are the only case where this token can legally follow a type argument - // list. So we definitely want to treat this as a type arg list. - case 21 /* DotToken */: // foo. - case 18 /* CloseParenToken */: // foo) - case 20 /* CloseBracketToken */: // foo] - case 54 /* ColonToken */: // foo: - case 23 /* SemicolonToken */: // foo; - case 53 /* QuestionToken */: // foo? - case 30 /* EqualsEqualsToken */: // foo == - case 32 /* EqualsEqualsEqualsToken */: // foo === - case 31 /* ExclamationEqualsToken */: // foo != - case 33 /* ExclamationEqualsEqualsToken */: // foo !== - case 51 /* AmpersandAmpersandToken */: // foo && - case 52 /* BarBarToken */: // foo || - case 48 /* CaretToken */: // foo ^ - case 46 /* AmpersandToken */: // foo & - case 47 /* BarToken */: // foo | - case 16 /* CloseBraceToken */: // foo } - case 1 /* EndOfFileToken */: - // these cases can't legally follow a type arg list. However, they're not legal - // expressions either. The user is probably in the middle of a generic type. So - // treat it as such. + case 55 /* AtToken */: + case 23 /* SemicolonToken */: + case 15 /* OpenBraceToken */: + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 87 /* FunctionKeyword */: + case 73 /* ClassKeyword */: + case 81 /* EnumKeyword */: + case 88 /* IfKeyword */: + case 79 /* DoKeyword */: + case 104 /* WhileKeyword */: + case 86 /* ForKeyword */: + case 75 /* ContinueKeyword */: + case 70 /* BreakKeyword */: + case 94 /* ReturnKeyword */: + case 105 /* WithKeyword */: + case 96 /* SwitchKeyword */: + case 98 /* ThrowKeyword */: + case 100 /* TryKeyword */: + case 76 /* DebuggerKeyword */: + // 'catch' and 'finally' do not actually indicate that the code is part of a statement, + // however, we say they are here so that we may gracefully parse them and error later. + case 72 /* CatchKeyword */: + case 85 /* FinallyKeyword */: return true; - case 24 /* CommaToken */: // foo, - case 15 /* OpenBraceToken */: // foo { - // We don't want to treat these as type arguments. Otherwise we'll parse this - // as an invocation expression. Instead, we want to parse out the expression - // in isolation from the type arguments. + case 74 /* ConstKeyword */: + case 82 /* ExportKeyword */: + case 89 /* ImportKeyword */: + return isStartOfDeclaration(); + case 118 /* AsyncKeyword */: + case 122 /* DeclareKeyword */: + case 107 /* InterfaceKeyword */: + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + case 132 /* TypeKeyword */: + // When these don't start a declaration, they're an identifier in an expression statement + return true; + case 112 /* PublicKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 113 /* StaticKeyword */: + // When these don't start a declaration, they may be the start of a class member if an identifier + // immediately follows. Otherwise they're an identifier in an expression statement. + return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); default: - // Anything else treat as an expression. - return false; + return isStartOfExpression(); } } - function parsePrimaryExpression() { + function nextTokenIsIdentifierOrStartOfDestructuring() { + nextToken(); + return isIdentifier() || token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */; + } + function isLetDeclaration() { + // In ES6 'let' always starts a lexical declaration if followed by an identifier or { + // or [. + return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + } + function parseStatement() { switch (token) { - case 8 /* NumericLiteral */: - case 9 /* StringLiteral */: - case 11 /* NoSubstitutionTemplateLiteral */: - return parseLiteralNode(); - case 97 /* ThisKeyword */: - case 95 /* SuperKeyword */: - case 93 /* NullKeyword */: - case 99 /* TrueKeyword */: - case 84 /* FalseKeyword */: - return parseTokenNode(); - case 17 /* OpenParenToken */: - return parseParenthesizedExpression(); - case 19 /* OpenBracketToken */: - return parseArrayLiteralExpression(); + case 23 /* SemicolonToken */: + return parseEmptyStatement(); case 15 /* OpenBraceToken */: - return parseObjectLiteralExpression(); - case 118 /* AsyncKeyword */: - // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher. - // If we encounter `async [no LineTerminator here] function` then this is an async - // function; otherwise, its an identifier. - if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { - break; + return parseBlock(/*ignoreMissingOpenBrace*/ false); + case 102 /* VarKeyword */: + return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 108 /* LetKeyword */: + if (isLetDeclaration()) { + return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); } - return parseFunctionExpression(); - case 73 /* ClassKeyword */: - return parseClassExpression(); + break; case 87 /* FunctionKeyword */: - return parseFunctionExpression(); - case 92 /* NewKeyword */: - return parseNewExpression(); - case 39 /* SlashToken */: - case 61 /* SlashEqualsToken */: - if (reScanSlashToken() === 10 /* RegularExpressionLiteral */) { - return parseLiteralNode(); + return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 73 /* ClassKeyword */: + return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 88 /* IfKeyword */: + return parseIfStatement(); + case 79 /* DoKeyword */: + return parseDoStatement(); + case 104 /* WhileKeyword */: + return parseWhileStatement(); + case 86 /* ForKeyword */: + return parseForOrForInOrForOfStatement(); + case 75 /* ContinueKeyword */: + return parseBreakOrContinueStatement(202 /* ContinueStatement */); + case 70 /* BreakKeyword */: + return parseBreakOrContinueStatement(203 /* BreakStatement */); + case 94 /* ReturnKeyword */: + return parseReturnStatement(); + case 105 /* WithKeyword */: + return parseWithStatement(); + case 96 /* SwitchKeyword */: + return parseSwitchStatement(); + case 98 /* ThrowKeyword */: + return parseThrowStatement(); + case 100 /* TryKeyword */: + // Include 'catch' and 'finally' for error recovery. + case 72 /* CatchKeyword */: + case 85 /* FinallyKeyword */: + return parseTryStatement(); + case 76 /* DebuggerKeyword */: + return parseDebuggerStatement(); + case 55 /* AtToken */: + return parseDeclaration(); + case 118 /* AsyncKeyword */: + case 107 /* InterfaceKeyword */: + case 132 /* TypeKeyword */: + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + case 122 /* DeclareKeyword */: + case 74 /* ConstKeyword */: + case 81 /* EnumKeyword */: + case 82 /* ExportKeyword */: + case 89 /* ImportKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 112 /* PublicKeyword */: + case 115 /* AbstractKeyword */: + case 113 /* StaticKeyword */: + if (isStartOfDeclaration()) { + return parseDeclaration(); } break; - case 12 /* TemplateHead */: - return parseTemplateExpression(); } - return parseIdentifier(ts.Diagnostics.Expression_expected); - } - function parseParenthesizedExpression() { - var node = createNode(172 /* ParenthesizedExpression */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - return finishNode(node); - } - function parseSpreadElement() { - var node = createNode(185 /* SpreadElementExpression */); - parseExpected(22 /* DotDotDotToken */); - node.expression = parseAssignmentExpressionOrHigher(); - return finishNode(node); - } - function parseArgumentOrArrayLiteralElement() { - return token === 22 /* DotDotDotToken */ ? parseSpreadElement() : - token === 24 /* CommaToken */ ? createNode(187 /* OmittedExpression */) : - parseAssignmentExpressionOrHigher(); + return parseExpressionOrLabeledStatement(); } - function parseArgumentExpression() { - return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); + function parseDeclaration() { + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + switch (token) { + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 74 /* ConstKeyword */: + return parseVariableStatement(fullStart, decorators, modifiers); + case 87 /* FunctionKeyword */: + return parseFunctionDeclaration(fullStart, decorators, modifiers); + case 73 /* ClassKeyword */: + return parseClassDeclaration(fullStart, decorators, modifiers); + case 107 /* InterfaceKeyword */: + return parseInterfaceDeclaration(fullStart, decorators, modifiers); + case 132 /* TypeKeyword */: + return parseTypeAliasDeclaration(fullStart, decorators, modifiers); + case 81 /* EnumKeyword */: + return parseEnumDeclaration(fullStart, decorators, modifiers); + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + return parseModuleDeclaration(fullStart, decorators, modifiers); + case 89 /* ImportKeyword */: + return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); + case 82 /* ExportKeyword */: + nextToken(); + return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ? + parseExportAssignment(fullStart, decorators, modifiers) : + parseExportDeclaration(fullStart, decorators, modifiers); + default: + if (decorators || modifiers) { + // We reached this point because we encountered decorators and/or modifiers and assumed a declaration + // would follow. For recovery and error reporting purposes, return an incomplete declaration. + var node = createMissingNode(231 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + node.pos = fullStart; + node.decorators = decorators; + setModifiers(node, modifiers); + return finishNode(node); + } + } } - function parseArrayLiteralExpression() { - var node = createNode(164 /* ArrayLiteralExpression */); - parseExpected(19 /* OpenBracketToken */); - if (scanner.hasPrecedingLineBreak()) - node.flags |= 1024 /* MultiLine */; - node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); - parseExpected(20 /* CloseBracketToken */); - return finishNode(node); + function nextTokenIsIdentifierOrStringLiteralOnSameLine() { + nextToken(); + return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9 /* StringLiteral */); } - function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { - if (parseContextualModifier(123 /* GetKeyword */)) { - return parseAccessorDeclaration(145 /* GetAccessor */, fullStart, decorators, modifiers); - } - else if (parseContextualModifier(129 /* SetKeyword */)) { - return parseAccessorDeclaration(146 /* SetAccessor */, fullStart, decorators, modifiers); + function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { + if (token !== 15 /* OpenBraceToken */ && canParseSemicolon()) { + parseSemicolon(); + return; } - return undefined; + return parseFunctionBlock(isGenerator, isAsync, /*ignoreMissingOpenBrace*/ false, diagnosticMessage); } - function parseObjectLiteralElement() { - var fullStart = scanner.getStartPos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; - } - var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var tokenIsIdentifier = isIdentifier(); - var nameToken = token; - var propertyName = parsePropertyName(); - // Disallowing of optional property assignments happens in the grammar checker. - var questionToken = parseOptionalToken(53 /* QuestionToken */); - if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { - return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); + // DECLARATIONS + function parseArrayBindingElement() { + if (token === 24 /* CommaToken */) { + return createNode(187 /* OmittedExpression */); } - // check if it is short-hand property assignment or normal property assignment - // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production - // CoverInitializedName[Yield] : - // IdentifierReference[?Yield] Initializer[In, ?Yield] - // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern - var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */); - if (isShorthandPropertyAssignment) { - var shorthandDeclaration = createNode(246 /* ShorthandPropertyAssignment */, fullStart); - shorthandDeclaration.name = propertyName; - shorthandDeclaration.questionToken = questionToken; - var equalsToken = parseOptionalToken(56 /* EqualsToken */); - if (equalsToken) { - shorthandDeclaration.equalsToken = equalsToken; - shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); - } - return finishNode(shorthandDeclaration); + var node = createNode(163 /* BindingElement */); + node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */); + node.name = parseIdentifierOrPattern(); + node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + return finishNode(node); + } + function parseObjectBindingElement() { + var node = createNode(163 /* BindingElement */); + var tokenIsIdentifier = isIdentifier(); + var propertyName = parsePropertyName(); + if (tokenIsIdentifier && token !== 54 /* ColonToken */) { + node.name = propertyName; } else { - var propertyAssignment = createNode(245 /* PropertyAssignment */, fullStart); - propertyAssignment.name = propertyName; - propertyAssignment.questionToken = questionToken; parseExpected(54 /* ColonToken */); - propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); - return finishNode(propertyAssignment); + node.propertyName = propertyName; + node.name = parseIdentifierOrPattern(); } + node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + return finishNode(node); } - function parseObjectLiteralExpression() { - var node = createNode(165 /* ObjectLiteralExpression */); + function parseObjectBindingPattern() { + var node = createNode(161 /* ObjectBindingPattern */); parseExpected(15 /* OpenBraceToken */); - if (scanner.hasPrecedingLineBreak()) { - node.flags |= 1024 /* MultiLine */; - } - node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true); + node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); parseExpected(16 /* CloseBraceToken */); return finishNode(node); } - function parseFunctionExpression() { - // GeneratorExpression: - // function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody } - // - // FunctionExpression: - // function BindingIdentifier[opt](FormalParameters){ FunctionBody } - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var node = createNode(173 /* FunctionExpression */); - setModifiers(node, parseModifiers()); - parseExpected(87 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var isGenerator = !!node.asteriskToken; - var isAsync = !!(node.flags & 256 /* Async */); - node.name = - isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : - isGenerator ? doInYieldContext(parseOptionalIdentifier) : - isAsync ? doInAwaitContext(parseOptionalIdentifier) : - parseOptionalIdentifier(); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false); - if (saveDecoratorContext) { - setDecoratorContext(true); - } + function parseArrayBindingPattern() { + var node = createNode(162 /* ArrayBindingPattern */); + parseExpected(19 /* OpenBracketToken */); + node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); + parseExpected(20 /* CloseBracketToken */); return finishNode(node); } - function parseOptionalIdentifier() { - return isIdentifier() ? parseIdentifier() : undefined; + function isIdentifierOrPattern() { + return token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */ || isIdentifier(); } - function parseNewExpression() { - var node = createNode(169 /* NewExpression */); - parseExpected(92 /* NewKeyword */); - node.expression = parseMemberExpressionOrHigher(); - node.typeArguments = tryParse(parseTypeArgumentsInExpression); - if (node.typeArguments || token === 17 /* OpenParenToken */) { - node.arguments = parseArgumentList(); + function parseIdentifierOrPattern() { + if (token === 19 /* OpenBracketToken */) { + return parseArrayBindingPattern(); + } + if (token === 15 /* OpenBraceToken */) { + return parseObjectBindingPattern(); + } + return parseIdentifier(); + } + function parseVariableDeclaration() { + var node = createNode(211 /* VariableDeclaration */); + node.name = parseIdentifierOrPattern(); + node.type = parseTypeAnnotation(); + if (!isInOrOfKeyword(token)) { + node.initializer = parseInitializer(/*inParameter*/ false); } return finishNode(node); } - // STATEMENTS - function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { - var node = createNode(192 /* Block */); - if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) { - node.statements = parseList(1 /* BlockStatements */, parseStatement); - parseExpected(16 /* CloseBraceToken */); + function parseVariableDeclarationList(inForStatementInitializer) { + var node = createNode(212 /* VariableDeclarationList */); + switch (token) { + case 102 /* VarKeyword */: + break; + case 108 /* LetKeyword */: + node.flags |= 8192 /* Let */; + break; + case 74 /* ConstKeyword */: + node.flags |= 16384 /* Const */; + break; + default: + ts.Debug.fail(); + } + nextToken(); + // The user may have written the following: + // + // for (let of X) { } + // + // In this case, we want to parse an empty declaration list, and then parse 'of' + // as a keyword. The reason this is not automatic is that 'of' is a valid identifier. + // So we need to look ahead to determine if 'of' should be treated as a keyword in + // this context. + // The checker will then give an error that there is an empty declaration list. + if (token === 134 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { + node.declarations = createMissingList(); } else { - node.statements = createMissingList(); + var savedDisallowIn = inDisallowInContext(); + setDisallowInContext(inForStatementInitializer); + node.declarations = parseDelimitedList(8 /* VariableDeclarations */, parseVariableDeclaration); + setDisallowInContext(savedDisallowIn); } return finishNode(node); } - function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { - var savedYieldContext = inYieldContext(); - setYieldContext(allowYield); - var savedAwaitContext = inAwaitContext(); - setAwaitContext(allowAwait); - // We may be in a [Decorator] context when parsing a function expression or - // arrow function. The body of the function is not in [Decorator] context. - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); - if (saveDecoratorContext) { - setDecoratorContext(true); - } - setYieldContext(savedYieldContext); - setAwaitContext(savedAwaitContext); - return block; + function canFollowContextualOfKeyword() { + return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */; } - function parseEmptyStatement() { - var node = createNode(194 /* EmptyStatement */); - parseExpected(23 /* SemicolonToken */); + function parseVariableStatement(fullStart, decorators, modifiers) { + var node = createNode(193 /* VariableStatement */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); + parseSemicolon(); return finishNode(node); } - function parseIfStatement() { - var node = createNode(196 /* IfStatement */); - parseExpected(88 /* IfKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.thenStatement = parseStatement(); - node.elseStatement = parseOptional(80 /* ElseKeyword */) ? parseStatement() : undefined; + function parseFunctionDeclaration(fullStart, decorators, modifiers) { + var node = createNode(213 /* FunctionDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(87 /* FunctionKeyword */); + node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier(); + var isGenerator = !!node.asteriskToken; + var isAsync = !!(node.flags & 256 /* Async */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected); return finishNode(node); } - function parseDoStatement() { - var node = createNode(197 /* DoStatement */); - parseExpected(79 /* DoKeyword */); - node.statement = parseStatement(); - parseExpected(104 /* WhileKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html - // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in - // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby - // do;while(0)x will have a semicolon inserted before x. - parseOptional(23 /* SemicolonToken */); + function parseConstructorDeclaration(pos, decorators, modifiers) { + var node = createNode(144 /* Constructor */, pos); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(121 /* ConstructorKeyword */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected); return finishNode(node); } - function parseWhileStatement() { - var node = createNode(198 /* WhileStatement */); - parseExpected(104 /* WhileKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.statement = parseStatement(); + function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) { + var method = createNode(143 /* MethodDeclaration */, fullStart); + method.decorators = decorators; + setModifiers(method, modifiers); + method.asteriskToken = asteriskToken; + method.name = name; + method.questionToken = questionToken; + var isGenerator = !!asteriskToken; + var isAsync = !!(method.flags & 256 /* Async */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method); + method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); + return finishNode(method); + } + function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) { + var property = createNode(141 /* PropertyDeclaration */, fullStart); + property.decorators = decorators; + setModifiers(property, modifiers); + property.name = name; + property.questionToken = questionToken; + property.type = parseTypeAnnotation(); + // For instance properties specifically, since they are evaluated inside the constructor, + // we do *not * want to parse yield expressions, so we specifically turn the yield context + // off. The grammar would look something like this: + // + // MemberVariableDeclaration[Yield]: + // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; + // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; + // + // The checker may still error in the static case to explicitly disallow the yield expression. + property.initializer = modifiers && modifiers.flags & 64 /* Static */ + ? allowInAnd(parseNonParameterInitializer) + : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer); + parseSemicolon(); + return finishNode(property); + } + function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) { + var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var name = parsePropertyName(); + // Note: this is not legal as per the grammar. But we allow it in the parser and + // report an error in the grammar checker. + var questionToken = parseOptionalToken(53 /* QuestionToken */); + if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected); + } + else { + return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken); + } + } + function parseNonParameterInitializer() { + return parseInitializer(/*inParameter*/ false); + } + function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parsePropertyName(); + fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false); return finishNode(node); } - function parseForOrForInOrForOfStatement() { - var pos = getNodePos(); - parseExpected(86 /* ForKeyword */); - parseExpected(17 /* OpenParenToken */); - var initializer = undefined; - if (token !== 23 /* SemicolonToken */) { - if (token === 102 /* VarKeyword */ || token === 108 /* LetKeyword */ || token === 74 /* ConstKeyword */) { - initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true); + function isClassMemberModifier(idToken) { + switch (idToken) { + case 112 /* PublicKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 113 /* StaticKeyword */: + return true; + default: + return false; + } + } + function isClassMemberStart() { + var idToken; + if (token === 55 /* AtToken */) { + return true; + } + // Eat up all modifiers, but hold on to the last one in case it is actually an identifier. + while (ts.isModifier(token)) { + idToken = token; + // If the idToken is a class modifier (protected, private, public, and static), it is + // certain that we are starting to parse class member. This allows better error recovery + // Example: + // public foo() ... // true + // public @dec blah ... // true; we will then report an error later + // export public ... // true; we will then report an error later + if (isClassMemberModifier(idToken)) { + return true; } - else { - initializer = disallowInAnd(parseExpression); + nextToken(); + } + if (token === 37 /* AsteriskToken */) { + return true; + } + // Try to get the first property-like token following all modifiers. + // This can either be an identifier or the 'get' or 'set' keywords. + if (isLiteralPropertyName()) { + idToken = token; + nextToken(); + } + // Index signatures and computed properties are class members; we can parse. + if (token === 19 /* OpenBracketToken */) { + return true; + } + // If we were able to get any potential identifier... + if (idToken !== undefined) { + // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse. + if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) { + return true; + } + // If it *is* a keyword, but not an accessor, check a little farther along + // to see if it should actually be parsed as a class member. + switch (token) { + case 17 /* OpenParenToken */: // Method declaration + case 25 /* LessThanToken */: // Generic Method declaration + case 54 /* ColonToken */: // Type Annotation for declaration + case 56 /* EqualsToken */: // Initializer for declaration + case 53 /* QuestionToken */: + return true; + default: + // Covers + // - Semicolons (declaration termination) + // - Closing braces (end-of-class, must be declaration) + // - End-of-files (not valid, but permitted so that it gets caught later on) + // - Line-breaks (enabling *automatic semicolon insertion*) + return canParseSemicolon(); } } - var forOrForInOrForOfStatement; - if (parseOptional(90 /* InKeyword */)) { - var forInStatement = createNode(200 /* ForInStatement */, pos); - forInStatement.initializer = initializer; - forInStatement.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forInStatement; + return false; + } + function parseDecorators() { + var decorators; + while (true) { + var decoratorStart = getNodePos(); + if (!parseOptional(55 /* AtToken */)) { + break; + } + if (!decorators) { + decorators = []; + decorators.pos = scanner.getStartPos(); + } + var decorator = createNode(139 /* Decorator */, decoratorStart); + decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); + decorators.push(finishNode(decorator)); } - else if (parseOptional(134 /* OfKeyword */)) { - var forOfStatement = createNode(201 /* ForOfStatement */, pos); - forOfStatement.initializer = initializer; - forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forOfStatement; + if (decorators) { + decorators.end = getNodeEnd(); } - else { - var forStatement = createNode(199 /* ForStatement */, pos); - forStatement.initializer = initializer; - parseExpected(23 /* SemicolonToken */); - if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) { - forStatement.condition = allowInAnd(parseExpression); + return decorators; + } + function parseModifiers() { + var flags = 0; + var modifiers; + while (true) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + if (!parseAnyContextualModifier()) { + break; } - parseExpected(23 /* SemicolonToken */); - if (token !== 18 /* CloseParenToken */) { - forStatement.incrementor = allowInAnd(parseExpression); + if (!modifiers) { + modifiers = []; + modifiers.pos = modifierStart; } - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forStatement; + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); } - forOrForInOrForOfStatement.statement = parseStatement(); - return finishNode(forOrForInOrForOfStatement); + if (modifiers) { + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); + } + return modifiers; } - function parseBreakOrContinueStatement(kind) { - var node = createNode(kind); - parseExpected(kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */); - if (!canParseSemicolon()) { - node.label = parseIdentifier(); + function parseModifiersForArrowFunction() { + var flags = 0; + var modifiers; + if (token === 118 /* AsyncKeyword */) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + nextToken(); + modifiers = []; + modifiers.pos = modifierStart; + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); } - parseSemicolon(); - return finishNode(node); + return modifiers; } - function parseReturnStatement() { - var node = createNode(204 /* ReturnStatement */); - parseExpected(94 /* ReturnKeyword */); - if (!canParseSemicolon()) { - node.expression = allowInAnd(parseExpression); + function parseClassElement() { + if (token === 23 /* SemicolonToken */) { + var result = createNode(191 /* SemicolonClassElement */); + nextToken(); + return finishNode(result); } - parseSemicolon(); - return finishNode(node); + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; + } + if (token === 121 /* ConstructorKeyword */) { + return parseConstructorDeclaration(fullStart, decorators, modifiers); + } + if (isIndexSignature()) { + return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); + } + // It is very important that we check this *after* checking indexers because + // the [ token can start an index signature or a computed property name + if (ts.tokenIsIdentifierOrKeyword(token) || + token === 9 /* StringLiteral */ || + token === 8 /* NumericLiteral */ || + token === 37 /* AsteriskToken */ || + token === 19 /* OpenBracketToken */) { + return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); + } + if (decorators || modifiers) { + // treat this as a property declaration with a missing name. + var name_7 = createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, /*questionToken*/ undefined); + } + // 'isClassMemberStart' should have hinted not to attempt parsing. + ts.Debug.fail("Should not have attempted to parse class member declaration."); } - function parseWithStatement() { - var node = createNode(205 /* WithStatement */); - parseExpected(105 /* WithKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.statement = parseStatement(); + function parseClassExpression() { + return parseClassDeclarationOrExpression( + /*fullStart*/ scanner.getStartPos(), + /*decorators*/ undefined, + /*modifiers*/ undefined, 186 /* ClassExpression */); + } + function parseClassDeclaration(fullStart, decorators, modifiers) { + return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214 /* ClassDeclaration */); + } + function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(73 /* ClassKeyword */); + node.name = parseNameOfClassDeclarationOrExpression(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ true); + if (parseExpected(15 /* OpenBraceToken */)) { + // ClassTail[Yield,Await] : (Modified) See 14.5 + // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } + node.members = parseClassMembers(); + parseExpected(16 /* CloseBraceToken */); + } + else { + node.members = createMissingList(); + } return finishNode(node); } - function parseCaseClause() { - var node = createNode(241 /* CaseClause */); - parseExpected(71 /* CaseKeyword */); - node.expression = allowInAnd(parseExpression); - parseExpected(54 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); - return finishNode(node); + function parseNameOfClassDeclarationOrExpression() { + // implements is a future reserved word so + // 'class implements' might mean either + // - class expression with omitted name, 'implements' starts heritage clause + // - class with name 'implements' + // 'isImplementsClause' helps to disambiguate between these two cases + return isIdentifier() && !isImplementsClause() + ? parseIdentifier() + : undefined; + } + function isImplementsClause() { + return token === 106 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); + } + function parseHeritageClauses(isClassHeritageClause) { + // ClassTail[Yield,Await] : (Modified) See 14.5 + // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } + if (isHeritageClause()) { + return parseList(20 /* HeritageClauses */, parseHeritageClause); + } + return undefined; + } + function parseHeritageClausesWorker() { + return parseList(20 /* HeritageClauses */, parseHeritageClause); + } + function parseHeritageClause() { + if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) { + var node = createNode(243 /* HeritageClause */); + node.token = token; + nextToken(); + node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); + return finishNode(node); + } + return undefined; } - function parseDefaultClause() { - var node = createNode(242 /* DefaultClause */); - parseExpected(77 /* DefaultKeyword */); - parseExpected(54 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + function parseExpressionWithTypeArguments() { + var node = createNode(188 /* ExpressionWithTypeArguments */); + node.expression = parseLeftHandSideExpressionOrHigher(); + if (token === 25 /* LessThanToken */) { + node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */); + } return finishNode(node); } - function parseCaseOrDefaultClause() { - return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + function isHeritageClause() { + return token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */; } - function parseSwitchStatement() { - var node = createNode(206 /* SwitchStatement */); - parseExpected(96 /* SwitchKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - var caseBlock = createNode(220 /* CaseBlock */, scanner.getStartPos()); - parseExpected(15 /* OpenBraceToken */); - caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); - parseExpected(16 /* CloseBraceToken */); - node.caseBlock = finishNode(caseBlock); + function parseClassMembers() { + return parseList(5 /* ClassMembers */, parseClassElement); + } + function parseInterfaceDeclaration(fullStart, decorators, modifiers) { + var node = createNode(215 /* InterfaceDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(107 /* InterfaceKeyword */); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ false); + node.members = parseObjectTypeMembers(); return finishNode(node); } - function parseThrowStatement() { - // ThrowStatement[Yield] : - // throw [no LineTerminator here]Expression[In, ?Yield]; - // Because of automatic semicolon insertion, we need to report error if this - // throw could be terminated with a semicolon. Note: we can't call 'parseExpression' - // directly as that might consume an expression on the following line. - // We just return 'undefined' in that case. The actual error will be reported in the - // grammar walker. - var node = createNode(208 /* ThrowStatement */); - parseExpected(98 /* ThrowKeyword */); - node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { + var node = createNode(216 /* TypeAliasDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(132 /* TypeKeyword */); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + parseExpected(56 /* EqualsToken */); + node.type = parseType(); parseSemicolon(); return finishNode(node); } - // TODO: Review for error recovery - function parseTryStatement() { - var node = createNode(209 /* TryStatement */); - parseExpected(100 /* TryKeyword */); - node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); - node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined; - // If we don't have a catch clause, then we must have a finally clause. Try to parse - // one out no matter what. - if (!node.catchClause || token === 85 /* FinallyKeyword */) { - parseExpected(85 /* FinallyKeyword */); - node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); - } + // In an ambient declaration, the grammar only allows integer literals as initializers. + // In a non-ambient declaration, the grammar allows uninitialized members only in a + // ConstantEnumMemberSection, which starts at the beginning of an enum declaration + // or any time an integer literal initializer is encountered. + function parseEnumMember() { + var node = createNode(247 /* EnumMember */, scanner.getStartPos()); + node.name = parsePropertyName(); + node.initializer = allowInAnd(parseNonParameterInitializer); return finishNode(node); } - function parseCatchClause() { - var result = createNode(244 /* CatchClause */); - parseExpected(72 /* CatchKeyword */); - if (parseExpected(17 /* OpenParenToken */)) { - result.variableDeclaration = parseVariableDeclaration(); + function parseEnumDeclaration(fullStart, decorators, modifiers) { + var node = createNode(217 /* EnumDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(81 /* EnumKeyword */); + node.name = parseIdentifier(); + if (parseExpected(15 /* OpenBraceToken */)) { + node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember); + parseExpected(16 /* CloseBraceToken */); + } + else { + node.members = createMissingList(); } - parseExpected(18 /* CloseParenToken */); - result.block = parseBlock(/*ignoreMissingOpenBrace*/ false); - return finishNode(result); - } - function parseDebuggerStatement() { - var node = createNode(210 /* DebuggerStatement */); - parseExpected(76 /* DebuggerKeyword */); - parseSemicolon(); return finishNode(node); } - function parseExpressionOrLabeledStatement() { - // Avoiding having to do the lookahead for a labeled statement by just trying to parse - // out an expression, seeing if it is identifier and then seeing if it is followed by - // a colon. - var fullStart = scanner.getStartPos(); - var expression = allowInAnd(parseExpression); - if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) { - var labeledStatement = createNode(207 /* LabeledStatement */, fullStart); - labeledStatement.label = expression; - labeledStatement.statement = parseStatement(); - return finishNode(labeledStatement); + function parseModuleBlock() { + var node = createNode(219 /* ModuleBlock */, scanner.getStartPos()); + if (parseExpected(15 /* OpenBraceToken */)) { + node.statements = parseList(1 /* BlockStatements */, parseStatement); + parseExpected(16 /* CloseBraceToken */); } else { - var expressionStatement = createNode(195 /* ExpressionStatement */, fullStart); - expressionStatement.expression = expression; - parseSemicolon(); - return finishNode(expressionStatement); + node.statements = createMissingList(); } + return finishNode(node); } - function nextTokenIsIdentifierOrKeywordOnSameLine() { - nextToken(); - return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); - } - function nextTokenIsFunctionKeywordOnSameLine() { - nextToken(); - return token === 87 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); + function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { + var node = createNode(218 /* ModuleDeclaration */, fullStart); + // If we are parsing a dotted namespace name, we want to + // propagate the 'Namespace' flag across the names if set. + var namespaceFlag = flags & 65536 /* Namespace */; + node.decorators = decorators; + setModifiers(node, modifiers); + node.flags |= flags; + node.name = parseIdentifier(); + node.body = parseOptional(21 /* DotToken */) + ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag) + : parseModuleBlock(); + return finishNode(node); } - function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { - nextToken(); - return (ts.tokenIsIdentifierOrKeyword(token) || token === 8 /* NumericLiteral */) && !scanner.hasPrecedingLineBreak(); + function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { + var node = createNode(218 /* ModuleDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parseLiteralNode(/*internName*/ true); + node.body = parseModuleBlock(); + return finishNode(node); } - function isDeclaration() { - while (true) { - switch (token) { - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 74 /* ConstKeyword */: - case 87 /* FunctionKeyword */: - case 73 /* ClassKeyword */: - case 81 /* EnumKeyword */: - return true; - // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers; - // however, an identifier cannot be followed by another identifier on the same line. This is what we - // count on to parse out the respective declarations. For instance, we exploit this to say that - // - // namespace n - // - // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees - // - // namespace - // n - // - // as the identifier 'namespace' on one line followed by the identifier 'n' on another. - // We need to look one token ahead to see if it permissible to try parsing a declaration. - // - // *Note*: 'interface' is actually a strict mode reserved word. So while - // - // "use strict" - // interface - // I {} - // - // could be legal, it would add complexity for very little gain. - case 107 /* InterfaceKeyword */: - case 132 /* TypeKeyword */: - return nextTokenIsIdentifierOnSameLine(); - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - return nextTokenIsIdentifierOrStringLiteralOnSameLine(); - case 115 /* AbstractKeyword */: - case 118 /* AsyncKeyword */: - case 122 /* DeclareKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 112 /* PublicKeyword */: - nextToken(); - // ASI takes effect for this modifier. - if (scanner.hasPrecedingLineBreak()) { - return false; - } - continue; - case 89 /* ImportKeyword */: - nextToken(); - return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token); - case 82 /* ExportKeyword */: - nextToken(); - if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) { - return true; - } - continue; - case 113 /* StaticKeyword */: - nextToken(); - continue; - default: - return false; - } + function parseModuleDeclaration(fullStart, decorators, modifiers) { + var flags = modifiers ? modifiers.flags : 0; + if (parseOptional(126 /* NamespaceKeyword */)) { + flags |= 65536 /* Namespace */; } - } - function isStartOfDeclaration() { - return lookAhead(isDeclaration); - } - function isStartOfStatement() { - switch (token) { - case 55 /* AtToken */: - case 23 /* SemicolonToken */: - case 15 /* OpenBraceToken */: - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 87 /* FunctionKeyword */: - case 73 /* ClassKeyword */: - case 81 /* EnumKeyword */: - case 88 /* IfKeyword */: - case 79 /* DoKeyword */: - case 104 /* WhileKeyword */: - case 86 /* ForKeyword */: - case 75 /* ContinueKeyword */: - case 70 /* BreakKeyword */: - case 94 /* ReturnKeyword */: - case 105 /* WithKeyword */: - case 96 /* SwitchKeyword */: - case 98 /* ThrowKeyword */: - case 100 /* TryKeyword */: - case 76 /* DebuggerKeyword */: - // 'catch' and 'finally' do not actually indicate that the code is part of a statement, - // however, we say they are here so that we may gracefully parse them and error later. - case 72 /* CatchKeyword */: - case 85 /* FinallyKeyword */: - return true; - case 74 /* ConstKeyword */: - case 82 /* ExportKeyword */: - case 89 /* ImportKeyword */: - return isStartOfDeclaration(); - case 118 /* AsyncKeyword */: - case 122 /* DeclareKeyword */: - case 107 /* InterfaceKeyword */: - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - case 132 /* TypeKeyword */: - // When these don't start a declaration, they're an identifier in an expression statement - return true; - case 112 /* PublicKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 113 /* StaticKeyword */: - // When these don't start a declaration, they may be the start of a class member if an identifier - // immediately follows. Otherwise they're an identifier in an expression statement. - return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); - default: - return isStartOfExpression(); + else { + parseExpected(125 /* ModuleKeyword */); + if (token === 9 /* StringLiteral */) { + return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); + } } + return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); } - function nextTokenIsIdentifierOrStartOfDestructuring() { - nextToken(); - return isIdentifier() || token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */; - } - function isLetDeclaration() { - // In ES6 'let' always starts a lexical declaration if followed by an identifier or { - // or [. - return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + function isExternalModuleReference() { + return token === 127 /* RequireKeyword */ && + lookAhead(nextTokenIsOpenParen); } - function parseStatement() { - switch (token) { - case 23 /* SemicolonToken */: - return parseEmptyStatement(); - case 15 /* OpenBraceToken */: - return parseBlock(/*ignoreMissingOpenBrace*/ false); - case 102 /* VarKeyword */: - return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 108 /* LetKeyword */: - if (isLetDeclaration()) { - return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - } - break; - case 87 /* FunctionKeyword */: - return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 73 /* ClassKeyword */: - return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 88 /* IfKeyword */: - return parseIfStatement(); - case 79 /* DoKeyword */: - return parseDoStatement(); - case 104 /* WhileKeyword */: - return parseWhileStatement(); - case 86 /* ForKeyword */: - return parseForOrForInOrForOfStatement(); - case 75 /* ContinueKeyword */: - return parseBreakOrContinueStatement(202 /* ContinueStatement */); - case 70 /* BreakKeyword */: - return parseBreakOrContinueStatement(203 /* BreakStatement */); - case 94 /* ReturnKeyword */: - return parseReturnStatement(); - case 105 /* WithKeyword */: - return parseWithStatement(); - case 96 /* SwitchKeyword */: - return parseSwitchStatement(); - case 98 /* ThrowKeyword */: - return parseThrowStatement(); - case 100 /* TryKeyword */: - // Include 'catch' and 'finally' for error recovery. - case 72 /* CatchKeyword */: - case 85 /* FinallyKeyword */: - return parseTryStatement(); - case 76 /* DebuggerKeyword */: - return parseDebuggerStatement(); - case 55 /* AtToken */: - return parseDeclaration(); - case 118 /* AsyncKeyword */: - case 107 /* InterfaceKeyword */: - case 132 /* TypeKeyword */: - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - case 122 /* DeclareKeyword */: - case 74 /* ConstKeyword */: - case 81 /* EnumKeyword */: - case 82 /* ExportKeyword */: - case 89 /* ImportKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 112 /* PublicKeyword */: - case 115 /* AbstractKeyword */: - case 113 /* StaticKeyword */: - if (isStartOfDeclaration()) { - return parseDeclaration(); - } - break; - } - return parseExpressionOrLabeledStatement(); + function nextTokenIsOpenParen() { + return nextToken() === 17 /* OpenParenToken */; } - function parseDeclaration() { - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - switch (token) { - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 74 /* ConstKeyword */: - return parseVariableStatement(fullStart, decorators, modifiers); - case 87 /* FunctionKeyword */: - return parseFunctionDeclaration(fullStart, decorators, modifiers); - case 73 /* ClassKeyword */: - return parseClassDeclaration(fullStart, decorators, modifiers); - case 107 /* InterfaceKeyword */: - return parseInterfaceDeclaration(fullStart, decorators, modifiers); - case 132 /* TypeKeyword */: - return parseTypeAliasDeclaration(fullStart, decorators, modifiers); - case 81 /* EnumKeyword */: - return parseEnumDeclaration(fullStart, decorators, modifiers); - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - return parseModuleDeclaration(fullStart, decorators, modifiers); - case 89 /* ImportKeyword */: - return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); - case 82 /* ExportKeyword */: - nextToken(); - return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ? - parseExportAssignment(fullStart, decorators, modifiers) : - parseExportDeclaration(fullStart, decorators, modifiers); - default: - if (decorators || modifiers) { - // We reached this point because we encountered decorators and/or modifiers and assumed a declaration - // would follow. For recovery and error reporting purposes, return an incomplete declaration. - var node = createMissingNode(231 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - node.pos = fullStart; - node.decorators = decorators; - setModifiers(node, modifiers); - return finishNode(node); - } - } + function nextTokenIsSlash() { + return nextToken() === 39 /* SlashToken */; } - function nextTokenIsIdentifierOrStringLiteralOnSameLine() { + function nextTokenIsCommaOrFromKeyword() { nextToken(); - return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9 /* StringLiteral */); + return token === 24 /* CommaToken */ || + token === 133 /* FromKeyword */; } - function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { - if (token !== 15 /* OpenBraceToken */ && canParseSemicolon()) { - parseSemicolon(); - return; + function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { + parseExpected(89 /* ImportKeyword */); + var afterImportPos = scanner.getStartPos(); + var identifier; + if (isIdentifier()) { + identifier = parseIdentifier(); + if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) { + // ImportEquals declaration of type: + // import x = require("mod"); or + // import x = M.x; + var importEqualsDeclaration = createNode(221 /* ImportEqualsDeclaration */, fullStart); + importEqualsDeclaration.decorators = decorators; + setModifiers(importEqualsDeclaration, modifiers); + importEqualsDeclaration.name = identifier; + parseExpected(56 /* EqualsToken */); + importEqualsDeclaration.moduleReference = parseModuleReference(); + parseSemicolon(); + return finishNode(importEqualsDeclaration); + } } - return parseFunctionBlock(isGenerator, isAsync, /*ignoreMissingOpenBrace*/ false, diagnosticMessage); - } - // DECLARATIONS - function parseArrayBindingElement() { - if (token === 24 /* CommaToken */) { - return createNode(187 /* OmittedExpression */); + // Import statement + var importDeclaration = createNode(222 /* ImportDeclaration */, fullStart); + importDeclaration.decorators = decorators; + setModifiers(importDeclaration, modifiers); + // ImportDeclaration: + // import ImportClause from ModuleSpecifier ; + // import ModuleSpecifier; + if (identifier || + token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */) { + importDeclaration.importClause = parseImportClause(identifier, afterImportPos); + parseExpected(133 /* FromKeyword */); } - var node = createNode(163 /* BindingElement */); - node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */); - node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); - return finishNode(node); + importDeclaration.moduleSpecifier = parseModuleSpecifier(); + parseSemicolon(); + return finishNode(importDeclaration); } - function parseObjectBindingElement() { - var node = createNode(163 /* BindingElement */); - // TODO(andersh): Handle computed properties - var tokenIsIdentifier = isIdentifier(); - var propertyName = parsePropertyName(); - if (tokenIsIdentifier && token !== 54 /* ColonToken */) { - node.name = propertyName; + function parseImportClause(identifier, fullStart) { + // ImportClause: + // ImportedDefaultBinding + // NameSpaceImport + // NamedImports + // ImportedDefaultBinding, NameSpaceImport + // ImportedDefaultBinding, NamedImports + var importClause = createNode(223 /* ImportClause */, fullStart); + if (identifier) { + // ImportedDefaultBinding: + // ImportedBinding + importClause.name = identifier; } - else { - parseExpected(54 /* ColonToken */); - node.propertyName = propertyName; - node.name = parseIdentifierOrPattern(); + // If there was no default import or if there is comma token after default import + // parse namespace or named imports + if (!importClause.name || + parseOptional(24 /* CommaToken */)) { + importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(225 /* NamedImports */); } - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); - return finishNode(node); - } - function parseObjectBindingPattern() { - var node = createNode(161 /* ObjectBindingPattern */); - parseExpected(15 /* OpenBraceToken */); - node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); - parseExpected(16 /* CloseBraceToken */); - return finishNode(node); + return finishNode(importClause); } - function parseArrayBindingPattern() { - var node = createNode(162 /* ArrayBindingPattern */); - parseExpected(19 /* OpenBracketToken */); - node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); - parseExpected(20 /* CloseBracketToken */); - return finishNode(node); + function parseModuleReference() { + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(/*allowReservedWords*/ false); } - function isIdentifierOrPattern() { - return token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */ || isIdentifier(); + function parseExternalModuleReference() { + var node = createNode(232 /* ExternalModuleReference */); + parseExpected(127 /* RequireKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = parseModuleSpecifier(); + parseExpected(18 /* CloseParenToken */); + return finishNode(node); } - function parseIdentifierOrPattern() { - if (token === 19 /* OpenBracketToken */) { - return parseArrayBindingPattern(); - } - if (token === 15 /* OpenBraceToken */) { - return parseObjectBindingPattern(); + function parseModuleSpecifier() { + // We allow arbitrary expressions here, even though the grammar only allows string + // literals. We check to ensure that it is only a string literal later in the grammar + // walker. + var result = parseExpression(); + // Ensure the string being required is in our 'identifier' table. This will ensure + // that features like 'find refs' will look inside this file when search for its name. + if (result.kind === 9 /* StringLiteral */) { + internIdentifier(result.text); } - return parseIdentifier(); + return result; } - function parseVariableDeclaration() { - var node = createNode(211 /* VariableDeclaration */); - node.name = parseIdentifierOrPattern(); - node.type = parseTypeAnnotation(); - if (!isInOrOfKeyword(token)) { - node.initializer = parseInitializer(/*inParameter*/ false); - } + function parseNamespaceImport() { + // NameSpaceImport: + // * as ImportedBinding + var namespaceImport = createNode(224 /* NamespaceImport */); + parseExpected(37 /* AsteriskToken */); + parseExpected(116 /* AsKeyword */); + namespaceImport.name = parseIdentifier(); + return finishNode(namespaceImport); + } + function parseNamedImportsOrExports(kind) { + var node = createNode(kind); + // NamedImports: + // { } + // { ImportsList } + // { ImportsList, } + // ImportsList: + // ImportSpecifier + // ImportsList, ImportSpecifier + node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 225 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */); return finishNode(node); } - function parseVariableDeclarationList(inForStatementInitializer) { - var node = createNode(212 /* VariableDeclarationList */); - switch (token) { - case 102 /* VarKeyword */: - break; - case 108 /* LetKeyword */: - node.flags |= 8192 /* Let */; - break; - case 74 /* ConstKeyword */: - node.flags |= 16384 /* Const */; - break; - default: - ts.Debug.fail(); - } - nextToken(); - // The user may have written the following: - // - // for (let of X) { } - // - // In this case, we want to parse an empty declaration list, and then parse 'of' - // as a keyword. The reason this is not automatic is that 'of' is a valid identifier. - // So we need to look ahead to determine if 'of' should be treated as a keyword in - // this context. - // The checker will then give an error that there is an empty declaration list. - if (token === 134 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { - node.declarations = createMissingList(); + function parseExportSpecifier() { + return parseImportOrExportSpecifier(230 /* ExportSpecifier */); + } + function parseImportSpecifier() { + return parseImportOrExportSpecifier(226 /* ImportSpecifier */); + } + function parseImportOrExportSpecifier(kind) { + var node = createNode(kind); + // ImportSpecifier: + // BindingIdentifier + // IdentifierName as BindingIdentifier + // ExportSpecififer: + // IdentifierName + // IdentifierName as IdentifierName + var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + var checkIdentifierStart = scanner.getTokenPos(); + var checkIdentifierEnd = scanner.getTextPos(); + var identifierName = parseIdentifierName(); + if (token === 116 /* AsKeyword */) { + node.propertyName = identifierName; + parseExpected(116 /* AsKeyword */); + checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + checkIdentifierStart = scanner.getTokenPos(); + checkIdentifierEnd = scanner.getTextPos(); + node.name = parseIdentifierName(); } else { - var savedDisallowIn = inDisallowInContext(); - setDisallowInContext(inForStatementInitializer); - node.declarations = parseDelimitedList(8 /* VariableDeclarations */, parseVariableDeclaration); - setDisallowInContext(savedDisallowIn); + node.name = identifierName; + } + if (kind === 226 /* ImportSpecifier */ && checkIdentifierIsKeyword) { + // Report error identifier expected + parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); } return finishNode(node); } - function canFollowContextualOfKeyword() { - return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */; - } - function parseVariableStatement(fullStart, decorators, modifiers) { - var node = createNode(193 /* VariableStatement */, fullStart); + function parseExportDeclaration(fullStart, decorators, modifiers) { + var node = createNode(228 /* ExportDeclaration */, fullStart); node.decorators = decorators; setModifiers(node, modifiers); - node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); + if (parseOptional(37 /* AsteriskToken */)) { + parseExpected(133 /* FromKeyword */); + node.moduleSpecifier = parseModuleSpecifier(); + } + else { + node.exportClause = parseNamedImportsOrExports(229 /* NamedExports */); + // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios, + // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`) + // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect. + if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { + parseExpected(133 /* FromKeyword */); + node.moduleSpecifier = parseModuleSpecifier(); + } + } parseSemicolon(); return finishNode(node); } - function parseFunctionDeclaration(fullStart, decorators, modifiers) { - var node = createNode(213 /* FunctionDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(87 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier(); - var isGenerator = !!node.asteriskToken; - var isAsync = !!(node.flags & 256 /* Async */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected); - return finishNode(node); - } - function parseConstructorDeclaration(pos, decorators, modifiers) { - var node = createNode(144 /* Constructor */, pos); + function parseExportAssignment(fullStart, decorators, modifiers) { + var node = createNode(227 /* ExportAssignment */, fullStart); node.decorators = decorators; setModifiers(node, modifiers); - parseExpected(121 /* ConstructorKeyword */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected); - return finishNode(node); - } - function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) { - var method = createNode(143 /* MethodDeclaration */, fullStart); - method.decorators = decorators; - setModifiers(method, modifiers); - method.asteriskToken = asteriskToken; - method.name = name; - method.questionToken = questionToken; - var isGenerator = !!asteriskToken; - var isAsync = !!(method.flags & 256 /* Async */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method); - method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); - return finishNode(method); - } - function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) { - var property = createNode(141 /* PropertyDeclaration */, fullStart); - property.decorators = decorators; - setModifiers(property, modifiers); - property.name = name; - property.questionToken = questionToken; - property.type = parseTypeAnnotation(); - // For instance properties specifically, since they are evaluated inside the constructor, - // we do *not * want to parse yield expressions, so we specifically turn the yield context - // off. The grammar would look something like this: - // - // MemberVariableDeclaration[Yield]: - // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; - // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; - // - // The checker may still error in the static case to explicitly disallow the yield expression. - property.initializer = modifiers && modifiers.flags & 64 /* Static */ - ? allowInAnd(parseNonParameterInitializer) - : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer); - parseSemicolon(); - return finishNode(property); - } - function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) { - var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var name = parsePropertyName(); - // Note: this is not legal as per the grammar. But we allow it in the parser and - // report an error in the grammar checker. - var questionToken = parseOptionalToken(53 /* QuestionToken */); - if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { - return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected); + if (parseOptional(56 /* EqualsToken */)) { + node.isExportEquals = true; } else { - return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken); + parseExpected(77 /* DefaultKeyword */); } - } - function parseNonParameterInitializer() { - return parseInitializer(/*inParameter*/ false); - } - function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) { - var node = createNode(kind, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.name = parsePropertyName(); - fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false); + node.expression = parseAssignmentExpressionOrHigher(); + parseSemicolon(); return finishNode(node); } - function isClassMemberModifier(idToken) { - switch (idToken) { - case 112 /* PublicKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 113 /* StaticKeyword */: - return true; - default: - return false; + function processReferenceComments(sourceFile) { + var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText); + var referencedFiles = []; + var amdDependencies = []; + var amdModuleName; + // Keep scanning all the leading trivia in the file until we get to something that + // isn't trivia. Any single line comment will be analyzed to see if it is a + // reference comment. + while (true) { + var kind = triviaScanner.scan(); + if (kind === 5 /* WhitespaceTrivia */ || kind === 4 /* NewLineTrivia */ || kind === 3 /* MultiLineCommentTrivia */) { + continue; + } + if (kind !== 2 /* SingleLineCommentTrivia */) { + break; + } + var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; + var comment = sourceText.substring(range.pos, range.end); + var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); + if (referencePathMatchResult) { + var fileReference = referencePathMatchResult.fileReference; + sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; + var diagnosticMessage = referencePathMatchResult.diagnosticMessage; + if (fileReference) { + referencedFiles.push(fileReference); + } + if (diagnosticMessage) { + parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); + } + } + else { + var amdModuleNameRegEx = /^\/\/\/\s*".length; + return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); } + } + function parseQualifiedName(left) { + var result = createNode(135 /* QualifiedName */, left.pos); + result.left = left; + result.right = parseIdentifierName(); + return finishNode(result); + } + function parseJSDocRecordType() { + var result = createNode(257 /* JSDocRecordType */); nextToken(); + result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember); + checkForTrailingComma(result.members); + parseExpected(16 /* CloseBraceToken */); + return finishNode(result); } - if (token === 37 /* AsteriskToken */) { - return true; + function parseJSDocRecordMember() { + var result = createNode(258 /* JSDocRecordMember */); + result.name = parseSimplePropertyName(); + if (token === 54 /* ColonToken */) { + nextToken(); + result.type = parseJSDocType(); + } + return finishNode(result); } - // Try to get the first property-like token following all modifiers. - // This can either be an identifier or the 'get' or 'set' keywords. - if (isLiteralPropertyName()) { - idToken = token; + function parseJSDocNonNullableType() { + var result = createNode(256 /* JSDocNonNullableType */); nextToken(); + result.type = parseJSDocType(); + return finishNode(result); } - // Index signatures and computed properties are class members; we can parse. - if (token === 19 /* OpenBracketToken */) { - return true; + function parseJSDocTupleType() { + var result = createNode(254 /* JSDocTupleType */); + nextToken(); + result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType); + checkForTrailingComma(result.types); + parseExpected(20 /* CloseBracketToken */); + return finishNode(result); } - // If we were able to get any potential identifier... - if (idToken !== undefined) { - // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse. - if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) { - return true; - } - // If it *is* a keyword, but not an accessor, check a little farther along - // to see if it should actually be parsed as a class member. - switch (token) { - case 17 /* OpenParenToken */: // Method declaration - case 25 /* LessThanToken */: // Generic Method declaration - case 54 /* ColonToken */: // Type Annotation for declaration - case 56 /* EqualsToken */: // Initializer for declaration - case 53 /* QuestionToken */: - return true; - default: - // Covers - // - Semicolons (declaration termination) - // - Closing braces (end-of-class, must be declaration) - // - End-of-files (not valid, but permitted so that it gets caught later on) - // - Line-breaks (enabling *automatic semicolon insertion*) - return canParseSemicolon(); + function checkForTrailingComma(list) { + if (parseDiagnostics.length === 0 && list.hasTrailingComma) { + var start = list.end - ",".length; + parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); } } - return false; - } - function parseDecorators() { - var decorators; - while (true) { - var decoratorStart = getNodePos(); - if (!parseOptional(55 /* AtToken */)) { - break; - } - if (!decorators) { - decorators = []; - decorators.pos = scanner.getStartPos(); + function parseJSDocUnionType() { + var result = createNode(253 /* JSDocUnionType */); + nextToken(); + result.types = parseJSDocTypeList(parseJSDocType()); + parseExpected(18 /* CloseParenToken */); + return finishNode(result); + } + function parseJSDocTypeList(firstType) { + ts.Debug.assert(!!firstType); + var types = []; + types.pos = firstType.pos; + types.push(firstType); + while (parseOptional(47 /* BarToken */)) { + types.push(parseJSDocType()); } - var decorator = createNode(139 /* Decorator */, decoratorStart); - decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); - decorators.push(finishNode(decorator)); + types.end = scanner.getStartPos(); + return types; } - if (decorators) { - decorators.end = getNodeEnd(); + function parseJSDocAllType() { + var result = createNode(250 /* JSDocAllType */); + nextToken(); + return finishNode(result); } - return decorators; - } - function parseModifiers() { - var flags = 0; - var modifiers; - while (true) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - if (!parseAnyContextualModifier()) { - break; + function parseJSDocUnknownOrNullableType() { + var pos = scanner.getStartPos(); + // skip the ? + nextToken(); + // Need to lookahead to decide if this is a nullable or unknown type. + // Here are cases where we'll pick the unknown type: + // + // Foo(?, + // { a: ? } + // Foo(?) + // Foo + // Foo(?= + // (?| + if (token === 24 /* CommaToken */ || + token === 16 /* CloseBraceToken */ || + token === 18 /* CloseParenToken */ || + token === 27 /* GreaterThanToken */ || + token === 56 /* EqualsToken */ || + token === 47 /* BarToken */) { + var result = createNode(251 /* JSDocUnknownType */, pos); + return finishNode(result); } - if (!modifiers) { - modifiers = []; - modifiers.pos = modifierStart; + else { + var result = createNode(255 /* JSDocNullableType */, pos); + result.type = parseJSDocType(); + return finishNode(result); } - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); } - if (modifiers) { - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); + function parseIsolatedJSDocComment(content, start, length) { + initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined); + var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length); + var diagnostics = parseDiagnostics; + clearState(); + return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; } - return modifiers; - } - function parseModifiersForArrowFunction() { - var flags = 0; - var modifiers; - if (token === 118 /* AsyncKeyword */) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - nextToken(); - modifiers = []; - modifiers.pos = modifierStart; - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); + JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; + function parseJSDocComment(parent, start, length) { + var comment = parseJSDocCommentWorker(start, length); + if (comment) { + fixupParentReferences(comment); + comment.parent = parent; + } + return comment; } - return modifiers; - } - function parseClassElement() { - if (token === 23 /* SemicolonToken */) { - var result = createNode(191 /* SemicolonClassElement */); - nextToken(); - return finishNode(result); + JSDocParser.parseJSDocComment = parseJSDocComment; + function parseJSDocCommentWorker(start, length) { + var content = sourceText; + start = start || 0; + var end = length === undefined ? content.length : start + length; + length = end - start; + ts.Debug.assert(start >= 0); + ts.Debug.assert(start <= end); + ts.Debug.assert(end <= content.length); + var tags; + var pos; + // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I + // considered using an actual Scanner, but this would complicate things. The + // scanner would need to know it was in a Doc Comment. Otherwise, it would then + // produce comments *inside* the doc comment. In the end it was just easier to + // write a simple scanner rather than go that route. + if (length >= "/** */".length) { + if (content.charCodeAt(start) === 47 /* slash */ && + content.charCodeAt(start + 1) === 42 /* asterisk */ && + content.charCodeAt(start + 2) === 42 /* asterisk */ && + content.charCodeAt(start + 3) !== 42 /* asterisk */) { + // Initially we can parse out a tag. We also have seen a starting asterisk. + // This is so that /** * @type */ doesn't parse. + var canParseTag = true; + var seenAsterisk = true; + for (pos = start + "/**".length; pos < end;) { + var ch = content.charCodeAt(pos); + pos++; + if (ch === 64 /* at */ && canParseTag) { + parseTag(); + // Once we parse out a tag, we cannot keep parsing out tags on this line. + canParseTag = false; + continue; + } + if (ts.isLineBreak(ch)) { + // After a line break, we can parse a tag, and we haven't seen as asterisk + // on the next line yet. + canParseTag = true; + seenAsterisk = false; + continue; + } + if (ts.isWhiteSpace(ch)) { + // Whitespace doesn't affect any of our parsing. + continue; + } + // Ignore the first asterisk on a line. + if (ch === 42 /* asterisk */) { + if (seenAsterisk) { + // If we've already seen an asterisk, then we can no longer parse a tag + // on this line. + canParseTag = false; + } + seenAsterisk = true; + continue; + } + // Anything else is doc comment text. We can't do anything with it. Because it + // wasn't a tag, we can no longer parse a tag on this line until we hit the next + // line break. + canParseTag = false; + } + } + } + return createJSDocComment(); + function createJSDocComment() { + if (!tags) { + return undefined; + } + var result = createNode(265 /* JSDocComment */, start); + result.tags = tags; + return finishNode(result, end); + } + function skipWhitespace() { + while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { + pos++; + } + } + function parseTag() { + ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */); + var atToken = createNode(55 /* AtToken */, pos - 1); + atToken.end = pos; + var tagName = scanIdentifier(); + if (!tagName) { + return; + } + var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); + addTag(tag); + } + function handleTag(atToken, tagName) { + if (tagName) { + switch (tagName.text) { + case "param": + return handleParamTag(atToken, tagName); + case "return": + case "returns": + return handleReturnTag(atToken, tagName); + case "template": + return handleTemplateTag(atToken, tagName); + case "type": + return handleTypeTag(atToken, tagName); + } + } + return undefined; + } + function handleUnknownTag(atToken, tagName) { + var result = createNode(266 /* JSDocTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + return finishNode(result, pos); + } + function addTag(tag) { + if (tag) { + if (!tags) { + tags = []; + tags.pos = tag.pos; + } + tags.push(tag); + tags.end = tag.end; + } + } + function tryParseTypeExpression() { + skipWhitespace(); + if (content.charCodeAt(pos) !== 123 /* openBrace */) { + return undefined; + } + var typeExpression = parseJSDocTypeExpression(pos, end - pos); + pos = typeExpression.end; + return typeExpression; + } + function handleParamTag(atToken, tagName) { + var typeExpression = tryParseTypeExpression(); + skipWhitespace(); + var name; + var isBracketed; + if (content.charCodeAt(pos) === 91 /* openBracket */) { + pos++; + skipWhitespace(); + name = scanIdentifier(); + isBracketed = true; + } + else { + name = scanIdentifier(); + } + if (!name) { + parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); + } + var preName, postName; + if (typeExpression) { + postName = name; + } + else { + preName = name; + } + if (!typeExpression) { + typeExpression = tryParseTypeExpression(); + } + var result = createNode(267 /* JSDocParameterTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.preParameterName = preName; + result.typeExpression = typeExpression; + result.postParameterName = postName; + result.isBracketed = isBracketed; + return finishNode(result, pos); + } + function handleReturnTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 268 /* JSDocReturnTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(268 /* JSDocReturnTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); + } + function handleTypeTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 269 /* JSDocTypeTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(269 /* JSDocTypeTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); + } + function handleTemplateTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 270 /* JSDocTemplateTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var typeParameters = []; + typeParameters.pos = pos; + while (true) { + skipWhitespace(); + var startPos = pos; + var name_8 = scanIdentifier(); + if (!name_8) { + parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); + return undefined; + } + var typeParameter = createNode(137 /* TypeParameter */, name_8.pos); + typeParameter.name = name_8; + finishNode(typeParameter, pos); + typeParameters.push(typeParameter); + skipWhitespace(); + if (content.charCodeAt(pos) !== 44 /* comma */) { + break; + } + pos++; + } + typeParameters.end = pos; + var result = createNode(270 /* JSDocTemplateTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeParameters = typeParameters; + return finishNode(result, pos); + } + function scanIdentifier() { + var startPos = pos; + for (; pos < end; pos++) { + var ch = content.charCodeAt(pos); + if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) { + continue; + } + else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) { + continue; + } + break; + } + if (startPos === pos) { + return undefined; + } + var result = createNode(69 /* Identifier */, startPos); + result.text = content.substring(startPos, pos); + return finishNode(result, pos); + } } - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; + JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; + })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); + })(Parser || (Parser = {})); + var IncrementalParser; + (function (IncrementalParser) { + function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { + aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */); + checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); + if (ts.textChangeRangeIsUnchanged(textChangeRange)) { + // if the text didn't change, then we can just return our current source file as-is. + return sourceFile; } - if (token === 121 /* ConstructorKeyword */) { - return parseConstructorDeclaration(fullStart, decorators, modifiers); + if (sourceFile.statements.length === 0) { + // If we don't have any statements in the current source file, then there's no real + // way to incrementally parse. So just do a full parse instead. + return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true); + } + // Make sure we're not trying to incrementally update a source file more than once. Once + // we do an update the original source file is considered unusbale from that point onwards. + // + // This is because we do incremental parsing in-place. i.e. we take nodes from the old + // tree and give them new positions and parents. From that point on, trusting the old + // tree at all is not possible as far too much of it may violate invariants. + var incrementalSourceFile = sourceFile; + ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); + incrementalSourceFile.hasBeenIncrementallyParsed = true; + var oldText = sourceFile.text; + var syntaxCursor = createSyntaxCursor(sourceFile); + // Make the actual change larger so that we know to reparse anything whose lookahead + // might have intersected the change. + var changeRange = extendToAffectedRange(sourceFile, textChangeRange); + checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); + // Ensure that extending the affected range only moved the start of the change range + // earlier in the file. + ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); + ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); + ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); + // The is the amount the nodes after the edit range need to be adjusted. It can be + // positive (if the edit added characters), negative (if the edit deleted characters) + // or zero (if this was a pure overwrite with nothing added/removed). + var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; + // If we added or removed characters during the edit, then we need to go and adjust all + // the nodes after the edit. Those nodes may move forward (if we inserted chars) or they + // may move backward (if we deleted chars). + // + // Doing this helps us out in two ways. First, it means that any nodes/tokens we want + // to reuse are already at the appropriate position in the new text. That way when we + // reuse them, we don't have to figure out if they need to be adjusted. Second, it makes + // it very easy to determine if we can reuse a node. If the node's position is at where + // we are in the text, then we can reuse it. Otherwise we can't. If the node's position + // is ahead of us, then we'll need to rescan tokens. If the node's position is behind + // us, then we'll need to skip it or crumble it as appropriate + // + // We will also adjust the positions of nodes that intersect the change range as well. + // By doing this, we ensure that all the positions in the old tree are consistent, not + // just the positions of nodes entirely before/after the change range. By being + // consistent, we can then easily map from positions to nodes in the old tree easily. + // + // Also, mark any syntax elements that intersect the changed span. We know, up front, + // that we cannot reuse these elements. + updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); + // Now that we've set up our internal incremental state just proceed and parse the + // source file in the normal fashion. When possible the parser will retrieve and + // reuse nodes from the old tree. + // + // Note: passing in 'true' for setNodeParents is very important. When incrementally + // parsing, we will be reusing nodes from the old tree, and placing it into new + // parents. If we don't set the parents now, we'll end up with an observably + // inconsistent tree. Setting the parents on the new tree should be very fast. We + // will immediately bail out of walking any subtrees when we can see that their parents + // are already correct. + var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true); + return result; + } + IncrementalParser.updateSourceFile = updateSourceFile; + function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { + if (isArray) { + visitArray(element); } - if (isIndexSignature()) { - return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); + else { + visitNode(element); } - // It is very important that we check this *after* checking indexers because - // the [ token can start an index signature or a computed property name - if (ts.tokenIsIdentifierOrKeyword(token) || - token === 9 /* StringLiteral */ || - token === 8 /* NumericLiteral */ || - token === 37 /* AsteriskToken */ || - token === 19 /* OpenBracketToken */) { - return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); + return; + function visitNode(node) { + var text = ""; + if (aggressiveChecks && shouldCheckNode(node)) { + text = oldText.substring(node.pos, node.end); + } + // Ditch any existing LS children we may have created. This way we can avoid + // moving them forward. + if (node._children) { + node._children = undefined; + } + if (node.jsDocComment) { + node.jsDocComment = undefined; + } + node.pos += delta; + node.end += delta; + if (aggressiveChecks && shouldCheckNode(node)) { + ts.Debug.assert(text === newText.substring(node.pos, node.end)); + } + forEachChild(node, visitNode, visitArray); + checkNodePositions(node, aggressiveChecks); } - if (decorators || modifiers) { - // treat this as a property declaration with a missing name. - var name_7 = createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, /*questionToken*/ undefined); + function visitArray(array) { + array._children = undefined; + array.pos += delta; + array.end += delta; + for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { + var node = array_7[_i]; + visitNode(node); + } } - // 'isClassMemberStart' should have hinted not to attempt parsing. - ts.Debug.fail("Should not have attempted to parse class member declaration."); - } - function parseClassExpression() { - return parseClassDeclarationOrExpression( - /*fullStart*/ scanner.getStartPos(), - /*decorators*/ undefined, - /*modifiers*/ undefined, 186 /* ClassExpression */); } - function parseClassDeclaration(fullStart, decorators, modifiers) { - return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214 /* ClassDeclaration */); + function shouldCheckNode(node) { + switch (node.kind) { + case 9 /* StringLiteral */: + case 8 /* NumericLiteral */: + case 69 /* Identifier */: + return true; + } + return false; } - function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { - var node = createNode(kind, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(73 /* ClassKeyword */); - node.name = parseNameOfClassDeclarationOrExpression(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ true); - if (parseExpected(15 /* OpenBraceToken */)) { - // ClassTail[Yield,Await] : (Modified) See 14.5 - // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } - node.members = parseClassMembers(); - parseExpected(16 /* CloseBraceToken */); + function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { + ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); + ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); + ts.Debug.assert(element.pos <= element.end); + // We have an element that intersects the change range in some way. It may have its + // start, or its end (or both) in the changed range. We want to adjust any part + // that intersects such that the final tree is in a consistent state. i.e. all + // chlidren have spans within the span of their parent, and all siblings are ordered + // properly. + // We may need to update both the 'pos' and the 'end' of the element. + // If the 'pos' is before the start of the change, then we don't need to touch it. + // If it isn't, then the 'pos' must be inside the change. How we update it will + // depend if delta is positive or negative. If delta is positive then we have + // something like: + // + // -------------------AAA----------------- + // -------------------BBBCCCCCCC----------------- + // + // In this case, we consider any node that started in the change range to still be + // starting at the same position. + // + // however, if the delta is negative, then we instead have something like this: + // + // -------------------XXXYYYYYYY----------------- + // -------------------ZZZ----------------- + // + // In this case, any element that started in the 'X' range will keep its position. + // However any element htat started after that will have their pos adjusted to be + // at the end of the new range. i.e. any node that started in the 'Y' range will + // be adjusted to have their start at the end of the 'Z' range. + // + // The element will keep its position if possible. Or Move backward to the new-end + // if it's in the 'Y' range. + element.pos = Math.min(element.pos, changeRangeNewEnd); + // If the 'end' is after the change range, then we always adjust it by the delta + // amount. However, if the end is in the change range, then how we adjust it + // will depend on if delta is positive or negative. If delta is positive then we + // have something like: + // + // -------------------AAA----------------- + // -------------------BBBCCCCCCC----------------- + // + // In this case, we consider any node that ended inside the change range to keep its + // end position. + // + // however, if the delta is negative, then we instead have something like this: + // + // -------------------XXXYYYYYYY----------------- + // -------------------ZZZ----------------- + // + // In this case, any element that ended in the 'X' range will keep its position. + // However any element htat ended after that will have their pos adjusted to be + // at the end of the new range. i.e. any node that ended in the 'Y' range will + // be adjusted to have their end at the end of the 'Z' range. + if (element.end >= changeRangeOldEnd) { + // Element ends after the change range. Always adjust the end pos. + element.end += delta; } else { - node.members = createMissingList(); + // Element ends in the change range. The element will keep its position if + // possible. Or Move backward to the new-end if it's in the 'Y' range. + element.end = Math.min(element.end, changeRangeNewEnd); } - return finishNode(node); - } - function parseNameOfClassDeclarationOrExpression() { - // implements is a future reserved word so - // 'class implements' might mean either - // - class expression with omitted name, 'implements' starts heritage clause - // - class with name 'implements' - // 'isImplementsClause' helps to disambiguate between these two cases - return isIdentifier() && !isImplementsClause() - ? parseIdentifier() - : undefined; - } - function isImplementsClause() { - return token === 106 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); - } - function parseHeritageClauses(isClassHeritageClause) { - // ClassTail[Yield,Await] : (Modified) See 14.5 - // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } - if (isHeritageClause()) { - return parseList(20 /* HeritageClauses */, parseHeritageClause); + ts.Debug.assert(element.pos <= element.end); + if (element.parent) { + ts.Debug.assert(element.pos >= element.parent.pos); + ts.Debug.assert(element.end <= element.parent.end); } - return undefined; - } - function parseHeritageClausesWorker() { - return parseList(20 /* HeritageClauses */, parseHeritageClause); } - function parseHeritageClause() { - if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) { - var node = createNode(243 /* HeritageClause */); - node.token = token; - nextToken(); - node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); - return finishNode(node); + function checkNodePositions(node, aggressiveChecks) { + if (aggressiveChecks) { + var pos = node.pos; + forEachChild(node, function (child) { + ts.Debug.assert(child.pos >= pos); + pos = child.end; + }); + ts.Debug.assert(pos <= node.end); } - return undefined; } - function parseExpressionWithTypeArguments() { - var node = createNode(188 /* ExpressionWithTypeArguments */); - node.expression = parseLeftHandSideExpressionOrHigher(); - if (token === 25 /* LessThanToken */) { - node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */); + function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { + visitNode(sourceFile); + return; + function visitNode(child) { + ts.Debug.assert(child.pos <= child.end); + if (child.pos > changeRangeOldEnd) { + // Node is entirely past the change range. We need to move both its pos and + // end, forward or backward appropriately. + moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks); + return; + } + // Check if the element intersects the change range. If it does, then it is not + // reusable. Also, we'll need to recurse to see what constituent portions we may + // be able to use. + var fullEnd = child.end; + if (fullEnd >= changeStart) { + child.intersectsChange = true; + child._children = undefined; + // Adjust the pos or end (or both) of the intersecting element accordingly. + adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + forEachChild(child, visitNode, visitArray); + checkNodePositions(child, aggressiveChecks); + return; + } + // Otherwise, the node is entirely before the change range. No need to do anything with it. + ts.Debug.assert(fullEnd < changeStart); + } + function visitArray(array) { + ts.Debug.assert(array.pos <= array.end); + if (array.pos > changeRangeOldEnd) { + // Array is entirely after the change range. We need to move it, and move any of + // its children. + moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks); + return; + } + // Check if the element intersects the change range. If it does, then it is not + // reusable. Also, we'll need to recurse to see what constituent portions we may + // be able to use. + var fullEnd = array.end; + if (fullEnd >= changeStart) { + array.intersectsChange = true; + array._children = undefined; + // Adjust the pos or end (or both) of the intersecting array accordingly. + adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { + var node = array_8[_i]; + visitNode(node); + } + return; + } + // Otherwise, the array is entirely before the change range. No need to do anything with it. + ts.Debug.assert(fullEnd < changeStart); } - return finishNode(node); - } - function isHeritageClause() { - return token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */; - } - function parseClassMembers() { - return parseList(5 /* ClassMembers */, parseClassElement); - } - function parseInterfaceDeclaration(fullStart, decorators, modifiers) { - var node = createNode(215 /* InterfaceDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(107 /* InterfaceKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ false); - node.members = parseObjectTypeMembers(); - return finishNode(node); - } - function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { - var node = createNode(216 /* TypeAliasDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(132 /* TypeKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - parseExpected(56 /* EqualsToken */); - node.type = parseType(); - parseSemicolon(); - return finishNode(node); } - // In an ambient declaration, the grammar only allows integer literals as initializers. - // In a non-ambient declaration, the grammar allows uninitialized members only in a - // ConstantEnumMemberSection, which starts at the beginning of an enum declaration - // or any time an integer literal initializer is encountered. - function parseEnumMember() { - var node = createNode(247 /* EnumMember */, scanner.getStartPos()); - node.name = parsePropertyName(); - node.initializer = allowInAnd(parseNonParameterInitializer); - return finishNode(node); + function extendToAffectedRange(sourceFile, changeRange) { + // Consider the following code: + // void foo() { /; } + // + // If the text changes with an insertion of / just before the semicolon then we end up with: + // void foo() { //; } + // + // If we were to just use the changeRange a is, then we would not rescan the { token + // (as it does not intersect the actual original change range). Because an edit may + // change the token touching it, we actually need to look back *at least* one token so + // that the prior token sees that change. + var maxLookahead = 1; + var start = changeRange.span.start; + // the first iteration aligns us with the change start. subsequent iteration move us to + // the left by maxLookahead tokens. We only need to do this as long as we're not at the + // start of the tree. + for (var i = 0; start > 0 && i <= maxLookahead; i++) { + var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); + ts.Debug.assert(nearestNode.pos <= start); + var position = nearestNode.pos; + start = Math.max(0, position - 1); + } + var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); + var finalLength = changeRange.newLength + (changeRange.span.start - start); + return ts.createTextChangeRange(finalSpan, finalLength); } - function parseEnumDeclaration(fullStart, decorators, modifiers) { - var node = createNode(217 /* EnumDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(81 /* EnumKeyword */); - node.name = parseIdentifier(); - if (parseExpected(15 /* OpenBraceToken */)) { - node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember); - parseExpected(16 /* CloseBraceToken */); + function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { + var bestResult = sourceFile; + var lastNodeEntirelyBeforePosition; + forEachChild(sourceFile, visit); + if (lastNodeEntirelyBeforePosition) { + var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); + if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { + bestResult = lastChildOfLastEntireNodeBeforePosition; + } } - else { - node.members = createMissingList(); + return bestResult; + function getLastChild(node) { + while (true) { + var lastChild = getLastChildWorker(node); + if (lastChild) { + node = lastChild; + } + else { + return node; + } + } } - return finishNode(node); - } - function parseModuleBlock() { - var node = createNode(219 /* ModuleBlock */, scanner.getStartPos()); - if (parseExpected(15 /* OpenBraceToken */)) { - node.statements = parseList(1 /* BlockStatements */, parseStatement); - parseExpected(16 /* CloseBraceToken */); + function getLastChildWorker(node) { + var last = undefined; + forEachChild(node, function (child) { + if (ts.nodeIsPresent(child)) { + last = child; + } + }); + return last; } - else { - node.statements = createMissingList(); + function visit(child) { + if (ts.nodeIsMissing(child)) { + // Missing nodes are effectively invisible to us. We never even consider them + // When trying to find the nearest node before us. + return; + } + // If the child intersects this position, then this node is currently the nearest + // node that starts before the position. + if (child.pos <= position) { + if (child.pos >= bestResult.pos) { + // This node starts before the position, and is closer to the position than + // the previous best node we found. It is now the new best node. + bestResult = child; + } + // Now, the node may overlap the position, or it may end entirely before the + // position. If it overlaps with the position, then either it, or one of its + // children must be the nearest node before the position. So we can just + // recurse into this child to see if we can find something better. + if (position < child.end) { + // The nearest node is either this child, or one of the children inside + // of it. We've already marked this child as the best so far. Recurse + // in case one of the children is better. + forEachChild(child, visit); + // Once we look at the children of this node, then there's no need to + // continue any further. + return true; + } + else { + ts.Debug.assert(child.end <= position); + // The child ends entirely before this position. Say you have the following + // (where $ is the position) + // + // ? $ : <...> <...> + // + // We would want to find the nearest preceding node in "complex expr 2". + // To support that, we keep track of this node, and once we're done searching + // for a best node, we recurse down this node to see if we can find a good + // result in it. + // + // This approach allows us to quickly skip over nodes that are entirely + // before the position, while still allowing us to find any nodes in the + // last one that might be what we want. + lastNodeEntirelyBeforePosition = child; + } + } + else { + ts.Debug.assert(child.pos > position); + // We're now at a node that is entirely past the position we're searching for. + // This node (and all following nodes) could never contribute to the result, + // so just skip them by returning 'true' here. + return true; + } } - return finishNode(node); - } - function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { - var node = createNode(218 /* ModuleDeclaration */, fullStart); - // If we are parsing a dotted namespace name, we want to - // propagate the 'Namespace' flag across the names if set. - var namespaceFlag = flags & 65536 /* Namespace */; - node.decorators = decorators; - setModifiers(node, modifiers); - node.flags |= flags; - node.name = parseIdentifier(); - node.body = parseOptional(21 /* DotToken */) - ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag) - : parseModuleBlock(); - return finishNode(node); - } - function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { - var node = createNode(218 /* ModuleDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.name = parseLiteralNode(/*internName*/ true); - node.body = parseModuleBlock(); - return finishNode(node); } - function parseModuleDeclaration(fullStart, decorators, modifiers) { - var flags = modifiers ? modifiers.flags : 0; - if (parseOptional(126 /* NamespaceKeyword */)) { - flags |= 65536 /* Namespace */; + function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { + var oldText = sourceFile.text; + if (textChangeRange) { + ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); + if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) { + var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); + var newTextPrefix = newText.substr(0, textChangeRange.span.start); + ts.Debug.assert(oldTextPrefix === newTextPrefix); + var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); + var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); + ts.Debug.assert(oldTextSuffix === newTextSuffix); + } } - else { - parseExpected(125 /* ModuleKeyword */); - if (token === 9 /* StringLiteral */) { - return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); + } + function createSyntaxCursor(sourceFile) { + var currentArray = sourceFile.statements; + var currentArrayIndex = 0; + ts.Debug.assert(currentArrayIndex < currentArray.length); + var current = currentArray[currentArrayIndex]; + var lastQueriedPosition = -1 /* Value */; + return { + currentNode: function (position) { + // Only compute the current node if the position is different than the last time + // we were asked. The parser commonly asks for the node at the same position + // twice. Once to know if can read an appropriate list element at a certain point, + // and then to actually read and consume the node. + if (position !== lastQueriedPosition) { + // Much of the time the parser will need the very next node in the array that + // we just returned a node from.So just simply check for that case and move + // forward in the array instead of searching for the node again. + if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { + currentArrayIndex++; + current = currentArray[currentArrayIndex]; + } + // If we don't have a node, or the node we have isn't in the right position, + // then try to find a viable node at the position requested. + if (!current || current.pos !== position) { + findHighestListElementThatStartsAtPosition(position); + } + } + // Cache this query so that we don't do any extra work if the parser calls back + // into us. Note: this is very common as the parser will make pairs of calls like + // 'isListElement -> parseListElement'. If we were unable to find a node when + // called with 'isListElement', we don't want to redo the work when parseListElement + // is called immediately after. + lastQueriedPosition = position; + // Either we don'd have a node, or we have a node at the position being asked for. + ts.Debug.assert(!current || current.pos === position); + return current; + } + }; + // Finds the highest element in the tree we can find that starts at the provided position. + // The element must be a direct child of some node list in the tree. This way after we + // return it, we can easily return its next sibling in the list. + function findHighestListElementThatStartsAtPosition(position) { + // Clear out any cached state about the last node we found. + currentArray = undefined; + currentArrayIndex = -1 /* Value */; + current = undefined; + // Recurse into the source file to find the highest node at this position. + forEachChild(sourceFile, visitNode, visitArray); + return; + function visitNode(node) { + if (position >= node.pos && position < node.end) { + // Position was within this node. Keep searching deeper to find the node. + forEachChild(node, visitNode, visitArray); + // don't procede any futher in the search. + return true; + } + // position wasn't in this node, have to keep searching. + return false; + } + function visitArray(array) { + if (position >= array.pos && position < array.end) { + // position was in this array. Search through this array to see if we find a + // viable element. + for (var i = 0, n = array.length; i < n; i++) { + var child = array[i]; + if (child) { + if (child.pos === position) { + // Found the right node. We're done. + currentArray = array; + currentArrayIndex = i; + current = child; + return true; + } + else { + if (child.pos < position && position < child.end) { + // Position in somewhere within this child. Search in it and + // stop searching in this array. + forEachChild(child, visitNode, visitArray); + return true; + } + } + } + } + } + // position wasn't in this array, have to keep searching. + return false; } } - return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); - } - function isExternalModuleReference() { - return token === 127 /* RequireKeyword */ && - lookAhead(nextTokenIsOpenParen); } - function nextTokenIsOpenParen() { - return nextToken() === 17 /* OpenParenToken */; + var InvalidPosition; + (function (InvalidPosition) { + InvalidPosition[InvalidPosition["Value"] = -1] = "Value"; + })(InvalidPosition || (InvalidPosition = {})); + })(IncrementalParser || (IncrementalParser = {})); +})(ts || (ts = {})); +/// +/// +/* @internal */ +var ts; +(function (ts) { + ts.bindTime = 0; + (function (ModuleInstanceState) { + ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated"; + ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated"; + ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly"; + })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {})); + var ModuleInstanceState = ts.ModuleInstanceState; + var Reachability; + (function (Reachability) { + Reachability[Reachability["Unintialized"] = 1] = "Unintialized"; + Reachability[Reachability["Reachable"] = 2] = "Reachable"; + Reachability[Reachability["Unreachable"] = 4] = "Unreachable"; + Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable"; + })(Reachability || (Reachability = {})); + function or(state1, state2) { + return (state1 | state2) & 2 /* Reachable */ + ? 2 /* Reachable */ + : (state1 & state2) & 8 /* ReportedUnreachable */ + ? 8 /* ReportedUnreachable */ + : 4 /* Unreachable */; + } + function getModuleInstanceState(node) { + // A module is uninstantiated if it contains only + // 1. interface declarations, type alias declarations + if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) { + return 0 /* NonInstantiated */; } - function nextTokenIsSlash() { - return nextToken() === 39 /* SlashToken */; + else if (ts.isConstEnumDeclaration(node)) { + return 2 /* ConstEnumOnly */; } - function nextTokenIsCommaOrFromKeyword() { - nextToken(); - return token === 24 /* CommaToken */ || - token === 133 /* FromKeyword */; + else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) { + return 0 /* NonInstantiated */; } - function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { - parseExpected(89 /* ImportKeyword */); - var afterImportPos = scanner.getStartPos(); - var identifier; - if (isIdentifier()) { - identifier = parseIdentifier(); - if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) { - // ImportEquals declaration of type: - // import x = require("mod"); or - // import x = M.x; - var importEqualsDeclaration = createNode(221 /* ImportEqualsDeclaration */, fullStart); - importEqualsDeclaration.decorators = decorators; - setModifiers(importEqualsDeclaration, modifiers); - importEqualsDeclaration.name = identifier; - parseExpected(56 /* EqualsToken */); - importEqualsDeclaration.moduleReference = parseModuleReference(); - parseSemicolon(); - return finishNode(importEqualsDeclaration); + else if (node.kind === 219 /* ModuleBlock */) { + var state = 0 /* NonInstantiated */; + ts.forEachChild(node, function (n) { + switch (getModuleInstanceState(n)) { + case 0 /* NonInstantiated */: + // child is non-instantiated - continue searching + return false; + case 2 /* ConstEnumOnly */: + // child is const enum only - record state and continue searching + state = 2 /* ConstEnumOnly */; + return false; + case 1 /* Instantiated */: + // child is instantiated - record state and stop + state = 1 /* Instantiated */; + return true; } - } - // Import statement - var importDeclaration = createNode(222 /* ImportDeclaration */, fullStart); - importDeclaration.decorators = decorators; - setModifiers(importDeclaration, modifiers); - // ImportDeclaration: - // import ImportClause from ModuleSpecifier ; - // import ModuleSpecifier; - if (identifier || - token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */) { - importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(133 /* FromKeyword */); - } - importDeclaration.moduleSpecifier = parseModuleSpecifier(); - parseSemicolon(); - return finishNode(importDeclaration); - } - function parseImportClause(identifier, fullStart) { - // ImportClause: - // ImportedDefaultBinding - // NameSpaceImport - // NamedImports - // ImportedDefaultBinding, NameSpaceImport - // ImportedDefaultBinding, NamedImports - var importClause = createNode(223 /* ImportClause */, fullStart); - if (identifier) { - // ImportedDefaultBinding: - // ImportedBinding - importClause.name = identifier; - } - // If there was no default import or if there is comma token after default import - // parse namespace or named imports - if (!importClause.name || - parseOptional(24 /* CommaToken */)) { - importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(225 /* NamedImports */); - } - return finishNode(importClause); + }); + return state; } - function parseModuleReference() { - return isExternalModuleReference() - ? parseExternalModuleReference() - : parseEntityName(/*allowReservedWords*/ false); + else if (node.kind === 218 /* ModuleDeclaration */) { + return getModuleInstanceState(node.body); } - function parseExternalModuleReference() { - var node = createNode(232 /* ExternalModuleReference */); - parseExpected(127 /* RequireKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = parseModuleSpecifier(); - parseExpected(18 /* CloseParenToken */); - return finishNode(node); + else { + return 1 /* Instantiated */; } - function parseModuleSpecifier() { - // We allow arbitrary expressions here, even though the grammar only allows string - // literals. We check to ensure that it is only a string literal later in the grammar - // walker. - var result = parseExpression(); - // Ensure the string being required is in our 'identifier' table. This will ensure - // that features like 'find refs' will look inside this file when search for its name. - if (result.kind === 9 /* StringLiteral */) { - internIdentifier(result.text); + } + ts.getModuleInstanceState = getModuleInstanceState; + var ContainerFlags; + (function (ContainerFlags) { + // The current node is not a container, and no container manipulation should happen before + // recursing into it. + ContainerFlags[ContainerFlags["None"] = 0] = "None"; + // The current node is a container. It should be set as the current container (and block- + // container) before recursing into it. The current node does not have locals. Examples: + // + // Classes, ObjectLiterals, TypeLiterals, Interfaces... + ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer"; + // The current node is a block-scoped-container. It should be set as the current block- + // container before recursing into it. Examples: + // + // Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements... + ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer"; + ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals"; + // If the current node is a container that also container that also contains locals. Examples: + // + // Functions, Methods, Modules, Source-files. + ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals"; + })(ContainerFlags || (ContainerFlags = {})); + var binder = createBinder(); + function bindSourceFile(file, options) { + var start = new Date().getTime(); + binder(file, options); + ts.bindTime += new Date().getTime() - start; + } + ts.bindSourceFile = bindSourceFile; + function createBinder() { + var file; + var options; + var parent; + var container; + var blockScopeContainer; + var lastContainer; + var seenThisKeyword; + // state used by reachability checks + var hasExplicitReturn; + var currentReachabilityState; + var labelStack; + var labelIndexMap; + var implicitLabels; + // If this file is an external module, then it is automatically in strict-mode according to + // ES6. If it is not an external module, then we'll determine if it is in strict mode or + // not depending on if we see "use strict" in certain places (or if we hit a class/namespace). + var inStrictMode; + var symbolCount = 0; + var Symbol; + var classifiableNames; + function bindSourceFile(f, opts) { + file = f; + options = opts; + inStrictMode = !!file.externalModuleIndicator; + classifiableNames = {}; + Symbol = ts.objectAllocator.getSymbolConstructor(); + if (!file.locals) { + bind(file); + file.symbolCount = symbolCount; + file.classifiableNames = classifiableNames; } - return result; - } - function parseNamespaceImport() { - // NameSpaceImport: - // * as ImportedBinding - var namespaceImport = createNode(224 /* NamespaceImport */); - parseExpected(37 /* AsteriskToken */); - parseExpected(116 /* AsKeyword */); - namespaceImport.name = parseIdentifier(); - return finishNode(namespaceImport); - } - function parseNamedImportsOrExports(kind) { - var node = createNode(kind); - // NamedImports: - // { } - // { ImportsList } - // { ImportsList, } - // ImportsList: - // ImportSpecifier - // ImportsList, ImportSpecifier - node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 225 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */); - return finishNode(node); - } - function parseExportSpecifier() { - return parseImportOrExportSpecifier(230 /* ExportSpecifier */); - } - function parseImportSpecifier() { - return parseImportOrExportSpecifier(226 /* ImportSpecifier */); + parent = undefined; + container = undefined; + blockScopeContainer = undefined; + lastContainer = undefined; + seenThisKeyword = false; + hasExplicitReturn = false; + labelStack = undefined; + labelIndexMap = undefined; + implicitLabels = undefined; } - function parseImportOrExportSpecifier(kind) { - var node = createNode(kind); - // ImportSpecifier: - // BindingIdentifier - // IdentifierName as BindingIdentifier - // ExportSpecififer: - // IdentifierName - // IdentifierName as IdentifierName - var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - var checkIdentifierStart = scanner.getTokenPos(); - var checkIdentifierEnd = scanner.getTextPos(); - var identifierName = parseIdentifierName(); - if (token === 116 /* AsKeyword */) { - node.propertyName = identifierName; - parseExpected(116 /* AsKeyword */); - checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - checkIdentifierStart = scanner.getTokenPos(); - checkIdentifierEnd = scanner.getTextPos(); - node.name = parseIdentifierName(); - } - else { - node.name = identifierName; - } - if (kind === 226 /* ImportSpecifier */ && checkIdentifierIsKeyword) { - // Report error identifier expected - parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); - } - return finishNode(node); + return bindSourceFile; + function createSymbol(flags, name) { + symbolCount++; + return new Symbol(flags, name); } - function parseExportDeclaration(fullStart, decorators, modifiers) { - var node = createNode(228 /* ExportDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(37 /* AsteriskToken */)) { - parseExpected(133 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); + function addDeclarationToSymbol(symbol, node, symbolFlags) { + symbol.flags |= symbolFlags; + node.symbol = symbol; + if (!symbol.declarations) { + symbol.declarations = []; } - else { - node.exportClause = parseNamedImportsOrExports(229 /* NamedExports */); - // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios, - // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`) - // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect. - if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { - parseExpected(133 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); - } + symbol.declarations.push(node); + if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) { + symbol.exports = {}; } - parseSemicolon(); - return finishNode(node); - } - function parseExportAssignment(fullStart, decorators, modifiers) { - var node = createNode(227 /* ExportAssignment */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(56 /* EqualsToken */)) { - node.isExportEquals = true; + if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) { + symbol.members = {}; } - else { - parseExpected(77 /* DefaultKeyword */); + if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) { + symbol.valueDeclaration = node; } - node.expression = parseAssignmentExpressionOrHigher(); - parseSemicolon(); - return finishNode(node); } - function processReferenceComments(sourceFile) { - var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText); - var referencedFiles = []; - var amdDependencies = []; - var amdModuleName; - // Keep scanning all the leading trivia in the file until we get to something that - // isn't trivia. Any single line comment will be analyzed to see if it is a - // reference comment. - while (true) { - var kind = triviaScanner.scan(); - if (kind === 5 /* WhitespaceTrivia */ || kind === 4 /* NewLineTrivia */ || kind === 3 /* MultiLineCommentTrivia */) { - continue; - } - if (kind !== 2 /* SingleLineCommentTrivia */) { - break; - } - var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; - var comment = sourceText.substring(range.pos, range.end); - var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); - if (referencePathMatchResult) { - var fileReference = referencePathMatchResult.fileReference; - sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - var diagnosticMessage = referencePathMatchResult.diagnosticMessage; - if (fileReference) { - referencedFiles.push(fileReference); - } - if (diagnosticMessage) { - parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); - } + // Should not be called on a declaration with a computed property name, + // unless it is a well known Symbol. + function getDeclarationName(node) { + if (node.name) { + if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) { + return "\"" + node.name.text + "\""; } - else { - var amdModuleNameRegEx = /^\/\/\/\s*".length; - return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); - } + container = saveContainer; + parent = saveParent; + blockScopeContainer = savedBlockScopeContainer; + } + /** + * Returns true if node and its subnodes were successfully traversed. + * Returning false means that node was not examined and caller needs to dive into the node himself. + */ + function bindReachableStatement(node) { + if (checkUnreachable(node)) { + ts.forEachChild(node, bind); + return; } - function parseQualifiedName(left) { - var result = createNode(135 /* QualifiedName */, left.pos); - result.left = left; - result.right = parseIdentifierName(); - return finishNode(result); + switch (node.kind) { + case 198 /* WhileStatement */: + bindWhileStatement(node); + break; + case 197 /* DoStatement */: + bindDoStatement(node); + break; + case 199 /* ForStatement */: + bindForStatement(node); + break; + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + bindForInOrForOfStatement(node); + break; + case 196 /* IfStatement */: + bindIfStatement(node); + break; + case 204 /* ReturnStatement */: + case 208 /* ThrowStatement */: + bindReturnOrThrow(node); + break; + case 203 /* BreakStatement */: + case 202 /* ContinueStatement */: + bindBreakOrContinueStatement(node); + break; + case 209 /* TryStatement */: + bindTryStatement(node); + break; + case 206 /* SwitchStatement */: + bindSwitchStatement(node); + break; + case 220 /* CaseBlock */: + bindCaseBlock(node); + break; + case 207 /* LabeledStatement */: + bindLabeledStatement(node); + break; + default: + ts.forEachChild(node, bind); + break; } - function parseJSDocRecordType() { - var result = createNode(257 /* JSDocRecordType */); - nextToken(); - result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember); - checkForTrailingComma(result.members); - parseExpected(16 /* CloseBraceToken */); - return finishNode(result); + } + function bindWhileStatement(n) { + var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + // bind expressions (don't affect reachability) + bind(n.expression); + currentReachabilityState = preWhileState; + var postWhileLabel = pushImplicitLabel(); + bind(n.statement); + popImplicitLabel(postWhileLabel, postWhileState); + } + function bindDoStatement(n) { + var preDoState = currentReachabilityState; + var postDoLabel = pushImplicitLabel(); + bind(n.statement); + var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState; + popImplicitLabel(postDoLabel, postDoState); + // bind expressions (don't affect reachability) + bind(n.expression); + } + function bindForStatement(n) { + var preForState = currentReachabilityState; + var postForLabel = pushImplicitLabel(); + // bind expressions (don't affect reachability) + bind(n.initializer); + bind(n.condition); + bind(n.incrementor); + bind(n.statement); + // for statement is considered infinite when it condition is either omitted or is true keyword + // - for(..;;..) + // - for(..;true;..) + var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */); + var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState; + popImplicitLabel(postForLabel, postForState); + } + function bindForInOrForOfStatement(n) { + var preStatementState = currentReachabilityState; + var postStatementLabel = pushImplicitLabel(); + // bind expressions (don't affect reachability) + bind(n.initializer); + bind(n.expression); + bind(n.statement); + popImplicitLabel(postStatementLabel, preStatementState); + } + function bindIfStatement(n) { + // denotes reachability state when entering 'thenStatement' part of the if statement: + // i.e. if condition is false then thenStatement is unreachable + var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + // denotes reachability state when entering 'elseStatement': + // i.e. if condition is true then elseStatement is unreachable + var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + currentReachabilityState = ifTrueState; + // bind expression (don't affect reachability) + bind(n.expression); + bind(n.thenStatement); + if (n.elseStatement) { + var preElseState = currentReachabilityState; + currentReachabilityState = ifFalseState; + bind(n.elseStatement); + currentReachabilityState = or(currentReachabilityState, preElseState); } - function parseJSDocRecordMember() { - var result = createNode(258 /* JSDocRecordMember */); - result.name = parseSimplePropertyName(); - if (token === 54 /* ColonToken */) { - nextToken(); - result.type = parseJSDocType(); - } - return finishNode(result); + else { + currentReachabilityState = or(currentReachabilityState, ifFalseState); } - function parseJSDocNonNullableType() { - var result = createNode(256 /* JSDocNonNullableType */); - nextToken(); - result.type = parseJSDocType(); - return finishNode(result); + } + function bindReturnOrThrow(n) { + // bind expression (don't affect reachability) + bind(n.expression); + if (n.kind === 204 /* ReturnStatement */) { + hasExplicitReturn = true; } - function parseJSDocTupleType() { - var result = createNode(254 /* JSDocTupleType */); - nextToken(); - result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType); - checkForTrailingComma(result.types); - parseExpected(20 /* CloseBracketToken */); - return finishNode(result); + currentReachabilityState = 4 /* Unreachable */; + } + function bindBreakOrContinueStatement(n) { + // call bind on label (don't affect reachability) + bind(n.label); + // for continue case touch label so it will be marked a used + var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */); + if (isValidJump) { + currentReachabilityState = 4 /* Unreachable */; } - function checkForTrailingComma(list) { - if (parseDiagnostics.length === 0 && list.hasTrailingComma) { - var start = list.end - ",".length; - parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); + } + function bindTryStatement(n) { + // catch\finally blocks has the same reachability as try block + var preTryState = currentReachabilityState; + bind(n.tryBlock); + var postTryState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.catchClause); + var postCatchState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.finallyBlock); + // post catch/finally state is reachable if + // - post try state is reachable - control flow can fall out of try block + // - post catch state is reachable - control flow can fall out of catch block + currentReachabilityState = or(postTryState, postCatchState); + } + function bindSwitchStatement(n) { + var preSwitchState = currentReachabilityState; + var postSwitchLabel = pushImplicitLabel(); + // bind expression (don't affect reachability) + bind(n.expression); + bind(n.caseBlock); + var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; }); + // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case + var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState; + popImplicitLabel(postSwitchLabel, postSwitchState); + } + function bindCaseBlock(n) { + var startState = currentReachabilityState; + for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { + var clause = _a[_i]; + currentReachabilityState = startState; + bind(clause); + if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) { + errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); } } - function parseJSDocUnionType() { - var result = createNode(253 /* JSDocUnionType */); - nextToken(); - result.types = parseJSDocTypeList(parseJSDocType()); - parseExpected(18 /* CloseParenToken */); - return finishNode(result); + } + function bindLabeledStatement(n) { + // call bind on label (don't affect reachability) + bind(n.label); + var ok = pushNamedLabel(n.label); + bind(n.statement); + if (ok) { + popNamedLabel(n.label, currentReachabilityState); } - function parseJSDocTypeList(firstType) { - ts.Debug.assert(!!firstType); - var types = []; - types.pos = firstType.pos; - types.push(firstType); - while (parseOptional(47 /* BarToken */)) { - types.push(parseJSDocType()); - } - types.end = scanner.getStartPos(); - return types; + } + function getContainerFlags(node) { + switch (node.kind) { + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + case 215 /* InterfaceDeclaration */: + case 217 /* EnumDeclaration */: + case 155 /* TypeLiteral */: + case 165 /* ObjectLiteralExpression */: + return 1 /* IsContainer */; + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + case 213 /* FunctionDeclaration */: + case 144 /* Constructor */: + case 145 /* GetAccessor */: + case 146 /* SetAccessor */: + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + case 218 /* ModuleDeclaration */: + case 248 /* SourceFile */: + case 216 /* TypeAliasDeclaration */: + return 5 /* IsContainerWithLocals */; + case 244 /* CatchClause */: + case 199 /* ForStatement */: + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + case 220 /* CaseBlock */: + return 2 /* IsBlockScopedContainer */; + case 192 /* Block */: + // do not treat blocks directly inside a function as a block-scoped-container. + // Locals that reside in this block should go to the function locals. Othewise 'x' + // would not appear to be a redeclaration of a block scoped local in the following + // example: + // + // function foo() { + // var x; + // let x; + // } + // + // If we placed 'var x' into the function locals and 'let x' into the locals of + // the block, then there would be no collision. + // + // By not creating a new block-scoped-container here, we ensure that both 'var x' + // and 'let x' go into the Function-container's locals, and we do get a collision + // conflict. + return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */; } - function parseJSDocAllType() { - var result = createNode(250 /* JSDocAllType */); - nextToken(); - return finishNode(result); + return 0 /* None */; + } + function addToContainerChain(next) { + if (lastContainer) { + lastContainer.nextContainer = next; } - function parseJSDocUnknownOrNullableType() { - var pos = scanner.getStartPos(); - // skip the ? - nextToken(); - // Need to lookahead to decide if this is a nullable or unknown type. - // Here are cases where we'll pick the unknown type: - // - // Foo(?, - // { a: ? } - // Foo(?) - // Foo - // Foo(?= - // (?| - if (token === 24 /* CommaToken */ || - token === 16 /* CloseBraceToken */ || - token === 18 /* CloseParenToken */ || - token === 27 /* GreaterThanToken */ || - token === 56 /* EqualsToken */ || - token === 47 /* BarToken */) { - var result = createNode(251 /* JSDocUnknownType */, pos); - return finishNode(result); - } - else { - var result = createNode(255 /* JSDocNullableType */, pos); - result.type = parseJSDocType(); - return finishNode(result); + lastContainer = next; + } + function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { + // Just call this directly so that the return type of this function stays "void". + declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); + } + function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { + switch (container.kind) { + // Modules, source files, and classes need specialized handling for how their + // members are declared (for example, a member of a class will go into a specific + // symbol table depending on if it is static or not). We defer to specialized + // handlers to take care of declaring these child members. + case 218 /* ModuleDeclaration */: + return declareModuleMember(node, symbolFlags, symbolExcludes); + case 248 /* SourceFile */: + return declareSourceFileMember(node, symbolFlags, symbolExcludes); + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + return declareClassMember(node, symbolFlags, symbolExcludes); + case 217 /* EnumDeclaration */: + return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); + case 155 /* TypeLiteral */: + case 165 /* ObjectLiteralExpression */: + case 215 /* InterfaceDeclaration */: + // Interface/Object-types always have their children added to the 'members' of + // their container. They are only accessible through an instance of their + // container, and are never in scope otherwise (even inside the body of the + // object / type / interface declaring them). An exception is type parameters, + // which are in scope without qualification (similar to 'locals'). + return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + case 144 /* Constructor */: + case 145 /* GetAccessor */: + case 146 /* SetAccessor */: + case 213 /* FunctionDeclaration */: + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + case 216 /* TypeAliasDeclaration */: + // All the children of these container types are never visible through another + // symbol (i.e. through another symbol's 'exports' or 'members'). Instead, + // they're only accessed 'lexically' (i.e. from code that exists underneath + // their container in the tree. To accomplish this, we simply add their declared + // symbol to the 'locals' of the container. These symbols can then be found as + // the type checker walks up the containers, checking them for matching names. + return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function declareClassMember(node, symbolFlags, symbolExcludes) { + return node.flags & 64 /* Static */ + ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) + : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + } + function declareSourceFileMember(node, symbolFlags, symbolExcludes) { + return ts.isExternalModule(file) + ? declareModuleMember(node, symbolFlags, symbolExcludes) + : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); + } + function hasExportDeclarations(node) { + var body = node.kind === 248 /* SourceFile */ ? node : node.body; + if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) { + for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { + var stat = _a[_i]; + if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) { + return true; + } } } - function parseIsolatedJSDocComment(content, start, length) { - initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined); - var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length); - var diagnostics = parseDiagnostics; - clearState(); - return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; + return false; + } + function setExportContextFlag(node) { + // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular + // declarations with export modifiers) is an export context in which declarations are implicitly exported. + if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { + node.flags |= 131072 /* ExportContext */; } - JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; - function parseJSDocComment(parent, start, length) { - var comment = parseJSDocCommentWorker(start, length); - if (comment) { - fixupParentReferences(comment); - comment.parent = parent; - } - return comment; + else { + node.flags &= ~131072 /* ExportContext */; } - JSDocParser.parseJSDocComment = parseJSDocComment; - function parseJSDocCommentWorker(start, length) { - var content = sourceText; - start = start || 0; - var end = length === undefined ? content.length : start + length; - length = end - start; - ts.Debug.assert(start >= 0); - ts.Debug.assert(start <= end); - ts.Debug.assert(end <= content.length); - var tags; - var pos; - // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I - // considered using an actual Scanner, but this would complicate things. The - // scanner would need to know it was in a Doc Comment. Otherwise, it would then - // produce comments *inside* the doc comment. In the end it was just easier to - // write a simple scanner rather than go that route. - if (length >= "/** */".length) { - if (content.charCodeAt(start) === 47 /* slash */ && - content.charCodeAt(start + 1) === 42 /* asterisk */ && - content.charCodeAt(start + 2) === 42 /* asterisk */ && - content.charCodeAt(start + 3) !== 42 /* asterisk */) { - // Initially we can parse out a tag. We also have seen a starting asterisk. - // This is so that /** * @type */ doesn't parse. - var canParseTag = true; - var seenAsterisk = true; - for (pos = start + "/**".length; pos < end;) { - var ch = content.charCodeAt(pos); - pos++; - if (ch === 64 /* at */ && canParseTag) { - parseTag(); - // Once we parse out a tag, we cannot keep parsing out tags on this line. - canParseTag = false; - continue; - } - if (ts.isLineBreak(ch)) { - // After a line break, we can parse a tag, and we haven't seen as asterisk - // on the next line yet. - canParseTag = true; - seenAsterisk = false; - continue; - } - if (ts.isWhiteSpace(ch)) { - // Whitespace doesn't affect any of our parsing. - continue; - } - // Ignore the first asterisk on a line. - if (ch === 42 /* asterisk */) { - if (seenAsterisk) { - // If we've already seen an asterisk, then we can no longer parse a tag - // on this line. - canParseTag = false; - } - seenAsterisk = true; - continue; - } - // Anything else is doc comment text. We can't do anything with it. Because it - // wasn't a tag, we can no longer parse a tag on this line until we hit the next - // line break. - canParseTag = false; - } - } - } - return createJSDocComment(); - function createJSDocComment() { - if (!tags) { - return undefined; - } - var result = createNode(265 /* JSDocComment */, start); - result.tags = tags; - return finishNode(result, end); - } - function skipWhitespace() { - while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { - pos++; - } + } + function bindModuleDeclaration(node) { + setExportContextFlag(node); + if (node.name.kind === 9 /* StringLiteral */) { + declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); + } + else { + var state = getModuleInstanceState(node); + if (state === 0 /* NonInstantiated */) { + declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */); } - function parseTag() { - ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */); - var atToken = createNode(55 /* AtToken */, pos - 1); - atToken.end = pos; - var tagName = scanIdentifier(); - if (!tagName) { - return; + else { + declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); + if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) { + // if module was already merged with some function, class or non-const enum + // treat is a non-const-enum-only + node.symbol.constEnumOnlyModule = false; } - var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); - addTag(tag); - } - function handleTag(atToken, tagName) { - if (tagName) { - switch (tagName.text) { - case "param": - return handleParamTag(atToken, tagName); - case "return": - case "returns": - return handleReturnTag(atToken, tagName); - case "template": - return handleTemplateTag(atToken, tagName); - case "type": - return handleTypeTag(atToken, tagName); + else { + var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */; + if (node.symbol.constEnumOnlyModule === undefined) { + // non-merged case - use the current state + node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; } - } - return undefined; - } - function handleUnknownTag(atToken, tagName) { - var result = createNode(266 /* JSDocTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - return finishNode(result, pos); - } - function addTag(tag) { - if (tag) { - if (!tags) { - tags = []; - tags.pos = tag.pos; + else { + // merged case: module is const enum only if all its pieces are non-instantiated or const enum + node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; } - tags.push(tag); - tags.end = tag.end; - } - } - function tryParseTypeExpression() { - skipWhitespace(); - if (content.charCodeAt(pos) !== 123 /* openBrace */) { - return undefined; - } - var typeExpression = parseJSDocTypeExpression(pos, end - pos); - pos = typeExpression.end; - return typeExpression; - } - function handleParamTag(atToken, tagName) { - var typeExpression = tryParseTypeExpression(); - skipWhitespace(); - var name; - var isBracketed; - if (content.charCodeAt(pos) === 91 /* openBracket */) { - pos++; - skipWhitespace(); - name = scanIdentifier(); - isBracketed = true; - } - else { - name = scanIdentifier(); - } - if (!name) { - parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); - } - var preName, postName; - if (typeExpression) { - postName = name; - } - else { - preName = name; - } - if (!typeExpression) { - typeExpression = tryParseTypeExpression(); - } - var result = createNode(267 /* JSDocParameterTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.preParameterName = preName; - result.typeExpression = typeExpression; - result.postParameterName = postName; - result.isBracketed = isBracketed; - return finishNode(result, pos); - } - function handleReturnTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 268 /* JSDocReturnTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); } - var result = createNode(268 /* JSDocReturnTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); } - function handleTypeTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 269 /* JSDocTypeTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + } + function bindFunctionOrConstructorType(node) { + // For a given function symbol "<...>(...) => T" we want to generate a symbol identical + // to the one we would get for: { <...>(...): T } + // + // We do that by making an anonymous type literal symbol, and then setting the function + // symbol as its sole member. To the rest of the system, this symbol will be indistinguishable + // from an actual type literal symbol you would have gotten had you used the long form. + var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node)); + addDeclarationToSymbol(symbol, node, 131072 /* Signature */); + var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type"); + addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */); + typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); + var _a; + } + function bindObjectLiteralExpression(node) { + var ElementKind; + (function (ElementKind) { + ElementKind[ElementKind["Property"] = 1] = "Property"; + ElementKind[ElementKind["Accessor"] = 2] = "Accessor"; + })(ElementKind || (ElementKind = {})); + if (inStrictMode) { + var seen = {}; + for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { + var prop = _a[_i]; + if (prop.name.kind !== 69 /* Identifier */) { + continue; } - var result = createNode(269 /* JSDocTypeTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); - } - function handleTemplateTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 270 /* JSDocTemplateTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + var identifier = prop.name; + // ECMA-262 11.1.5 Object Initialiser + // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true + // a.This production is contained in strict code and IsDataDescriptor(previous) is true and + // IsDataDescriptor(propId.descriptor) is true. + // b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true. + // c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true. + // d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true + // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields + var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */ + ? 1 /* Property */ + : 2 /* Accessor */; + var existingKind = seen[identifier.text]; + if (!existingKind) { + seen[identifier.text] = currentKind; + continue; } - var typeParameters = []; - typeParameters.pos = pos; - while (true) { - skipWhitespace(); - var startPos = pos; - var name_8 = scanIdentifier(); - if (!name_8) { - parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); - return undefined; - } - var typeParameter = createNode(137 /* TypeParameter */, name_8.pos); - typeParameter.name = name_8; - finishNode(typeParameter, pos); - typeParameters.push(typeParameter); - skipWhitespace(); - if (content.charCodeAt(pos) !== 44 /* comma */) { - break; - } - pos++; + if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) { + var span = ts.getErrorSpanForNode(file, identifier); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); } - typeParameters.end = pos; - var result = createNode(270 /* JSDocTemplateTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeParameters = typeParameters; - return finishNode(result, pos); } - function scanIdentifier() { - var startPos = pos; - for (; pos < end; pos++) { - var ch = content.charCodeAt(pos); - if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) { - continue; - } - else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) { - continue; - } + } + return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object"); + } + function bindAnonymousDeclaration(node, symbolFlags, name) { + var symbol = createSymbol(symbolFlags, name); + addDeclarationToSymbol(symbol, node, symbolFlags); + } + function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { + switch (blockScopeContainer.kind) { + case 218 /* ModuleDeclaration */: + declareModuleMember(node, symbolFlags, symbolExcludes); + break; + case 248 /* SourceFile */: + if (ts.isExternalModule(container)) { + declareModuleMember(node, symbolFlags, symbolExcludes); break; } - if (startPos === pos) { - return undefined; - } - var result = createNode(69 /* Identifier */, startPos); - result.text = content.substring(startPos, pos); - return finishNode(result, pos); + // fall through. + default: + if (!blockScopeContainer.locals) { + blockScopeContainer.locals = {}; + addToContainerChain(blockScopeContainer); + } + declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function bindBlockScopedVariableDeclaration(node) { + bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */); + } + // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized + // check for reserved words used as identifiers in strict mode code. + function checkStrictModeIdentifier(node) { + if (inStrictMode && + node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ && + node.originalKeywordKind <= 114 /* LastFutureReservedWord */ && + !ts.isIdentifierName(node)) { + // Report error only if there are no parse errors in file + if (!file.parseDiagnostics.length) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); } } - JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; - })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); - })(Parser || (Parser = {})); - var IncrementalParser; - (function (IncrementalParser) { - function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { - aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */); - checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); - if (ts.textChangeRangeIsUnchanged(textChangeRange)) { - // if the text didn't change, then we can just return our current source file as-is. - return sourceFile; + } + function getStrictModeIdentifierMessage(node) { + // Provide specialized messages to help the user understand why we think they're in + // strict mode. + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; } - if (sourceFile.statements.length === 0) { - // If we don't have any statements in the current source file, then there's no real - // way to incrementally parse. So just do a full parse instead. - return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true); + if (file.externalModuleIndicator) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; } - // Make sure we're not trying to incrementally update a source file more than once. Once - // we do an update the original source file is considered unusbale from that point onwards. - // - // This is because we do incremental parsing in-place. i.e. we take nodes from the old - // tree and give them new positions and parents. From that point on, trusting the old - // tree at all is not possible as far too much of it may violate invariants. - var incrementalSourceFile = sourceFile; - ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); - incrementalSourceFile.hasBeenIncrementallyParsed = true; - var oldText = sourceFile.text; - var syntaxCursor = createSyntaxCursor(sourceFile); - // Make the actual change larger so that we know to reparse anything whose lookahead - // might have intersected the change. - var changeRange = extendToAffectedRange(sourceFile, textChangeRange); - checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); - // Ensure that extending the affected range only moved the start of the change range - // earlier in the file. - ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); - ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); - ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); - // The is the amount the nodes after the edit range need to be adjusted. It can be - // positive (if the edit added characters), negative (if the edit deleted characters) - // or zero (if this was a pure overwrite with nothing added/removed). - var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; - // If we added or removed characters during the edit, then we need to go and adjust all - // the nodes after the edit. Those nodes may move forward (if we inserted chars) or they - // may move backward (if we deleted chars). - // - // Doing this helps us out in two ways. First, it means that any nodes/tokens we want - // to reuse are already at the appropriate position in the new text. That way when we - // reuse them, we don't have to figure out if they need to be adjusted. Second, it makes - // it very easy to determine if we can reuse a node. If the node's position is at where - // we are in the text, then we can reuse it. Otherwise we can't. If the node's position - // is ahead of us, then we'll need to rescan tokens. If the node's position is behind - // us, then we'll need to skip it or crumble it as appropriate - // - // We will also adjust the positions of nodes that intersect the change range as well. - // By doing this, we ensure that all the positions in the old tree are consistent, not - // just the positions of nodes entirely before/after the change range. By being - // consistent, we can then easily map from positions to nodes in the old tree easily. - // - // Also, mark any syntax elements that intersect the changed span. We know, up front, - // that we cannot reuse these elements. - updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); - // Now that we've set up our internal incremental state just proceed and parse the - // source file in the normal fashion. When possible the parser will retrieve and - // reuse nodes from the old tree. - // - // Note: passing in 'true' for setNodeParents is very important. When incrementally - // parsing, we will be reusing nodes from the old tree, and placing it into new - // parents. If we don't set the parents now, we'll end up with an observably - // inconsistent tree. Setting the parents on the new tree should be very fast. We - // will immediately bail out of walking any subtrees when we can see that their parents - // are already correct. - var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true); - return result; + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; } - IncrementalParser.updateSourceFile = updateSourceFile; - function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { - if (isArray) { - visitArray(element); + function checkStrictModeBinaryExpression(node) { + if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { + // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an + // Assignment operator(11.13) or of a PostfixExpression(11.3) + checkStrictModeEvalOrArguments(node, node.left); } - else { - visitNode(element); + } + function checkStrictModeCatchClause(node) { + // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the + // Catch production is eval or arguments + if (inStrictMode && node.variableDeclaration) { + checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); } - return; - function visitNode(node) { - var text = ""; - if (aggressiveChecks && shouldCheckNode(node)) { - text = oldText.substring(node.pos, node.end); - } - // Ditch any existing LS children we may have created. This way we can avoid - // moving them forward. - if (node._children) { - node._children = undefined; - } - if (node.jsDocComment) { - node.jsDocComment = undefined; - } - node.pos += delta; - node.end += delta; - if (aggressiveChecks && shouldCheckNode(node)) { - ts.Debug.assert(text === newText.substring(node.pos, node.end)); - } - forEachChild(node, visitNode, visitArray); - checkNodePositions(node, aggressiveChecks); + } + function checkStrictModeDeleteExpression(node) { + // Grammar checking + if (inStrictMode && node.expression.kind === 69 /* Identifier */) { + // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its + // UnaryExpression is a direct reference to a variable, function argument, or function name + var span = ts.getErrorSpanForNode(file, node.expression); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); } - function visitArray(array) { - array._children = undefined; - array.pos += delta; - array.end += delta; - for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { - var node = array_7[_i]; - visitNode(node); + } + function isEvalOrArgumentsIdentifier(node) { + return node.kind === 69 /* Identifier */ && + (node.text === "eval" || node.text === "arguments"); + } + function checkStrictModeEvalOrArguments(contextNode, name) { + if (name && name.kind === 69 /* Identifier */) { + var identifier = name; + if (isEvalOrArgumentsIdentifier(identifier)) { + // We check first if the name is inside class declaration or class expression; if so give explicit message + // otherwise report generic error message. + var span = ts.getErrorSpanForNode(file, name); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); } } } - function shouldCheckNode(node) { - switch (node.kind) { - case 9 /* StringLiteral */: - case 8 /* NumericLiteral */: - case 69 /* Identifier */: - return true; + function getStrictModeEvalOrArgumentsMessage(node) { + // Provide specialized messages to help the user understand why we think they're in + // strict mode. + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; } - return false; + if (file.externalModuleIndicator) { + return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; + } + return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; } - function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { - ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); - ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); - ts.Debug.assert(element.pos <= element.end); - // We have an element that intersects the change range in some way. It may have its - // start, or its end (or both) in the changed range. We want to adjust any part - // that intersects such that the final tree is in a consistent state. i.e. all - // chlidren have spans within the span of their parent, and all siblings are ordered - // properly. - // We may need to update both the 'pos' and the 'end' of the element. - // If the 'pos' is before the start of the change, then we don't need to touch it. - // If it isn't, then the 'pos' must be inside the change. How we update it will - // depend if delta is positive or negative. If delta is positive then we have - // something like: - // - // -------------------AAA----------------- - // -------------------BBBCCCCCCC----------------- - // - // In this case, we consider any node that started in the change range to still be - // starting at the same position. - // - // however, if the delta is negative, then we instead have something like this: - // - // -------------------XXXYYYYYYY----------------- - // -------------------ZZZ----------------- - // - // In this case, any element that started in the 'X' range will keep its position. - // However any element htat started after that will have their pos adjusted to be - // at the end of the new range. i.e. any node that started in the 'Y' range will - // be adjusted to have their start at the end of the 'Z' range. - // - // The element will keep its position if possible. Or Move backward to the new-end - // if it's in the 'Y' range. - element.pos = Math.min(element.pos, changeRangeNewEnd); - // If the 'end' is after the change range, then we always adjust it by the delta - // amount. However, if the end is in the change range, then how we adjust it - // will depend on if delta is positive or negative. If delta is positive then we - // have something like: - // - // -------------------AAA----------------- - // -------------------BBBCCCCCCC----------------- - // - // In this case, we consider any node that ended inside the change range to keep its - // end position. - // - // however, if the delta is negative, then we instead have something like this: - // - // -------------------XXXYYYYYYY----------------- - // -------------------ZZZ----------------- - // - // In this case, any element that ended in the 'X' range will keep its position. - // However any element htat ended after that will have their pos adjusted to be - // at the end of the new range. i.e. any node that ended in the 'Y' range will - // be adjusted to have their end at the end of the 'Z' range. - if (element.end >= changeRangeOldEnd) { - // Element ends after the change range. Always adjust the end pos. - element.end += delta; + function checkStrictModeFunctionName(node) { + if (inStrictMode) { + // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1)) + checkStrictModeEvalOrArguments(node, node.name); } - else { - // Element ends in the change range. The element will keep its position if - // possible. Or Move backward to the new-end if it's in the 'Y' range. - element.end = Math.min(element.end, changeRangeNewEnd); + } + function checkStrictModeNumericLiteral(node) { + if (inStrictMode && node.flags & 32768 /* OctalLiteral */) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); } - ts.Debug.assert(element.pos <= element.end); - if (element.parent) { - ts.Debug.assert(element.pos >= element.parent.pos); - ts.Debug.assert(element.end <= element.parent.end); + } + function checkStrictModePostfixUnaryExpression(node) { + // Grammar checking + // The identifier eval or arguments may not appear as the LeftHandSideExpression of an + // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression + // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator. + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.operand); } } - function checkNodePositions(node, aggressiveChecks) { - if (aggressiveChecks) { - var pos = node.pos; - forEachChild(node, function (child) { - ts.Debug.assert(child.pos >= pos); - pos = child.end; - }); - ts.Debug.assert(pos <= node.end); + function checkStrictModePrefixUnaryExpression(node) { + // Grammar checking + if (inStrictMode) { + if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) { + checkStrictModeEvalOrArguments(node, node.operand); + } } } - function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { - visitNode(sourceFile); - return; - function visitNode(child) { - ts.Debug.assert(child.pos <= child.end); - if (child.pos > changeRangeOldEnd) { - // Node is entirely past the change range. We need to move both its pos and - // end, forward or backward appropriately. - moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks); + function checkStrictModeWithStatement(node) { + // Grammar checking for withStatement + if (inStrictMode) { + errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); + } + } + function errorOnFirstToken(node, message, arg0, arg1, arg2) { + var span = ts.getSpanOfTokenAtPosition(file, node.pos); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); + } + function getDestructuringParameterName(node) { + return "__" + ts.indexOf(node.parent.parameters, node); + } + function bind(node) { + if (!node) { + return; + } + node.parent = parent; + var savedInStrictMode = inStrictMode; + if (!savedInStrictMode) { + updateStrictMode(node); + } + // First we bind declaration nodes to a symbol if possible. We'll both create a symbol + // and then potentially add the symbol to an appropriate symbol table. Possible + // destination symbol tables are: + // + // 1) The 'exports' table of the current container's symbol. + // 2) The 'members' table of the current container's symbol. + // 3) The 'locals' table of the current container. + // + // However, not all symbols will end up in any of these tables. 'Anonymous' symbols + // (like TypeLiterals for example) will not be put in any table. + bindWorker(node); + // Then we recurse into the children of the node to bind them as well. For certain + // symbols we do specialized work when we recurse. For example, we'll keep track of + // the current 'container' node when it changes. This helps us know which symbol table + // a local should go into for example. + bindChildren(node); + inStrictMode = savedInStrictMode; + } + function updateStrictMode(node) { + switch (node.kind) { + case 248 /* SourceFile */: + case 219 /* ModuleBlock */: + updateStrictModeStatementList(node.statements); return; - } - // Check if the element intersects the change range. If it does, then it is not - // reusable. Also, we'll need to recurse to see what constituent portions we may - // be able to use. - var fullEnd = child.end; - if (fullEnd >= changeStart) { - child.intersectsChange = true; - child._children = undefined; - // Adjust the pos or end (or both) of the intersecting element accordingly. - adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - forEachChild(child, visitNode, visitArray); - checkNodePositions(child, aggressiveChecks); + case 192 /* Block */: + if (ts.isFunctionLike(node.parent)) { + updateStrictModeStatementList(node.statements); + } + return; + case 214 /* ClassDeclaration */: + case 186 /* ClassExpression */: + // All classes are automatically in strict mode in ES6. + inStrictMode = true; return; - } - // Otherwise, the node is entirely before the change range. No need to do anything with it. - ts.Debug.assert(fullEnd < changeStart); } - function visitArray(array) { - ts.Debug.assert(array.pos <= array.end); - if (array.pos > changeRangeOldEnd) { - // Array is entirely after the change range. We need to move it, and move any of - // its children. - moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks); + } + function updateStrictModeStatementList(statements) { + for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { + var statement = statements_1[_i]; + if (!ts.isPrologueDirective(statement)) { return; } - // Check if the element intersects the change range. If it does, then it is not - // reusable. Also, we'll need to recurse to see what constituent portions we may - // be able to use. - var fullEnd = array.end; - if (fullEnd >= changeStart) { - array.intersectsChange = true; - array._children = undefined; - // Adjust the pos or end (or both) of the intersecting array accordingly. - adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { - var node = array_8[_i]; - visitNode(node); - } + if (isUseStrictPrologueDirective(statement)) { + inStrictMode = true; return; } - // Otherwise, the array is entirely before the change range. No need to do anything with it. - ts.Debug.assert(fullEnd < changeStart); } } - function extendToAffectedRange(sourceFile, changeRange) { - // Consider the following code: - // void foo() { /; } - // - // If the text changes with an insertion of / just before the semicolon then we end up with: - // void foo() { //; } - // - // If we were to just use the changeRange a is, then we would not rescan the { token - // (as it does not intersect the actual original change range). Because an edit may - // change the token touching it, we actually need to look back *at least* one token so - // that the prior token sees that change. - var maxLookahead = 1; - var start = changeRange.span.start; - // the first iteration aligns us with the change start. subsequent iteration move us to - // the left by maxLookahead tokens. We only need to do this as long as we're not at the - // start of the tree. - for (var i = 0; start > 0 && i <= maxLookahead; i++) { - var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); - ts.Debug.assert(nearestNode.pos <= start); - var position = nearestNode.pos; - start = Math.max(0, position - 1); + /// Should be called only on prologue directives (isPrologueDirective(node) should be true) + function isUseStrictPrologueDirective(node) { + var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); + // Note: the node text must be exactly "use strict" or 'use strict'. It is not ok for the + // string to contain unicode escapes (as per ES5). + return nodeText === "\"use strict\"" || nodeText === "'use strict'"; + } + function bindWorker(node) { + switch (node.kind) { + /* Strict mode checks */ + case 69 /* Identifier */: + return checkStrictModeIdentifier(node); + case 181 /* BinaryExpression */: + if (ts.isInJavaScriptFile(node)) { + if (ts.isExportsPropertyAssignment(node)) { + bindExportsPropertyAssignment(node); + } + else if (ts.isModuleExportsAssignment(node)) { + bindModuleExportsAssignment(node); + } + } + return checkStrictModeBinaryExpression(node); + case 244 /* CatchClause */: + return checkStrictModeCatchClause(node); + case 175 /* DeleteExpression */: + return checkStrictModeDeleteExpression(node); + case 8 /* NumericLiteral */: + return checkStrictModeNumericLiteral(node); + case 180 /* PostfixUnaryExpression */: + return checkStrictModePostfixUnaryExpression(node); + case 179 /* PrefixUnaryExpression */: + return checkStrictModePrefixUnaryExpression(node); + case 205 /* WithStatement */: + return checkStrictModeWithStatement(node); + case 97 /* ThisKeyword */: + seenThisKeyword = true; + return; + case 137 /* TypeParameter */: + return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */); + case 138 /* Parameter */: + return bindParameter(node); + case 211 /* VariableDeclaration */: + case 163 /* BindingElement */: + return bindVariableDeclarationOrBindingElement(node); + case 141 /* PropertyDeclaration */: + case 140 /* PropertySignature */: + return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */); + case 245 /* PropertyAssignment */: + case 246 /* ShorthandPropertyAssignment */: + return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */); + case 247 /* EnumMember */: + return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */); + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */); + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + // If this is an ObjectLiteralExpression method, then it sits in the same space + // as other properties in the object literal. So we use SymbolFlags.PropertyExcludes + // so that it will conflict with any other object literal members with the same + // name. + return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */); + case 213 /* FunctionDeclaration */: + checkStrictModeFunctionName(node); + return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */); + case 144 /* Constructor */: + return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */); + case 145 /* GetAccessor */: + return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */); + case 146 /* SetAccessor */: + return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */); + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + return bindFunctionOrConstructorType(node); + case 155 /* TypeLiteral */: + return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type"); + case 165 /* ObjectLiteralExpression */: + return bindObjectLiteralExpression(node); + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + checkStrictModeFunctionName(node); + var bindingName = node.name ? node.name.text : "__function"; + return bindAnonymousDeclaration(node, 16 /* Function */, bindingName); + case 168 /* CallExpression */: + if (ts.isInJavaScriptFile(node)) { + bindCallExpression(node); + } + break; + // Members of classes, interfaces, and modules + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + return bindClassLikeDeclaration(node); + case 215 /* InterfaceDeclaration */: + return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */); + case 216 /* TypeAliasDeclaration */: + return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */); + case 217 /* EnumDeclaration */: + return bindEnumDeclaration(node); + case 218 /* ModuleDeclaration */: + return bindModuleDeclaration(node); + // Imports and exports + case 221 /* ImportEqualsDeclaration */: + case 224 /* NamespaceImport */: + case 226 /* ImportSpecifier */: + case 230 /* ExportSpecifier */: + return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); + case 223 /* ImportClause */: + return bindImportClause(node); + case 228 /* ExportDeclaration */: + return bindExportDeclaration(node); + case 227 /* ExportAssignment */: + return bindExportAssignment(node); + case 248 /* SourceFile */: + return bindSourceFileIfExternalModule(); + } + } + function bindSourceFileIfExternalModule() { + setExportContextFlag(file); + if (ts.isExternalModule(file)) { + bindSourceFileAsExternalModule(); + } + } + function bindSourceFileAsExternalModule() { + bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\""); + } + function bindExportAssignment(node) { + var boundExpression = node.kind === 227 /* ExportAssignment */ ? node.expression : node.right; + if (!container.symbol || !container.symbol.exports) { + // Export assignment in some sort of block construct + bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node)); + } + else if (boundExpression.kind === 69 /* Identifier */) { + // An export default clause with an identifier exports all meanings of that identifier + declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); + } + else { + // An export default clause with an expression exports a value + declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); + } + } + function bindExportDeclaration(node) { + if (!container.symbol || !container.symbol.exports) { + // Export * in some sort of block construct + bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node)); + } + else if (!node.exportClause) { + // All export * declarations are collected in an __export symbol + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */); } - var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); - var finalLength = changeRange.newLength + (changeRange.span.start - start); - return ts.createTextChangeRange(finalSpan, finalLength); } - function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { - var bestResult = sourceFile; - var lastNodeEntirelyBeforePosition; - forEachChild(sourceFile, visit); - if (lastNodeEntirelyBeforePosition) { - var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); - if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { - bestResult = lastChildOfLastEntireNodeBeforePosition; + function bindImportClause(node) { + if (node.name) { + declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); + } + } + function setCommonJsModuleIndicator(node) { + if (!file.commonJsModuleIndicator) { + file.commonJsModuleIndicator = node; + bindSourceFileAsExternalModule(); + } + } + function bindExportsPropertyAssignment(node) { + // When we create a property via 'exports.foo = bar', the 'exports.foo' property access + // expression is the declaration + setCommonJsModuleIndicator(node); + declareSymbol(file.symbol.exports, file.symbol, node.left, 4 /* Property */ | 7340032 /* Export */, 0 /* None */); + } + function bindModuleExportsAssignment(node) { + // 'module.exports = expr' assignment + setCommonJsModuleIndicator(node); + bindExportAssignment(node); + } + function bindCallExpression(node) { + // We're only inspecting call expressions to detect CommonJS modules, so we can skip + // this check if we've already seen the module indicator + if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) { + setCommonJsModuleIndicator(node); + } + } + function bindClassLikeDeclaration(node) { + if (node.kind === 214 /* ClassDeclaration */) { + bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */); + } + else { + var bindingName = node.name ? node.name.text : "__class"; + bindAnonymousDeclaration(node, 32 /* Class */, bindingName); + // Add name of class expression into the map for semantic classifier + if (node.name) { + classifiableNames[node.name.text] = node.name.text; } } - return bestResult; - function getLastChild(node) { - while (true) { - var lastChild = getLastChildWorker(node); - if (lastChild) { - node = lastChild; - } - else { - return node; - } + var symbol = node.symbol; + // TypeScript 1.0 spec (April 2014): 8.4 + // Every class automatically contains a static property member named 'prototype', the + // type of which is an instantiation of the class type with type Any supplied as a type + // argument for each type parameter. It is an error to explicitly declare a static + // property member with the name 'prototype'. + // + // Note: we check for this here because this class may be merging into a module. The + // module might have an exported variable called 'prototype'. We can't allow that as + // that would clash with the built-in 'prototype' for the class. + var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype"); + if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { + if (node.name) { + node.name.parent = node; } + file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); } - function getLastChildWorker(node) { - var last = undefined; - forEachChild(node, function (child) { - if (ts.nodeIsPresent(child)) { - last = child; - } - }); - return last; + symbol.exports[prototypeSymbol.name] = prototypeSymbol; + prototypeSymbol.parent = symbol; + } + function bindEnumDeclaration(node) { + return ts.isConst(node) + ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */) + : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */); + } + function bindVariableDeclarationOrBindingElement(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.name); } - function visit(child) { - if (ts.nodeIsMissing(child)) { - // Missing nodes are effectively invisible to us. We never even consider them - // When trying to find the nearest node before us. - return; + if (!ts.isBindingPattern(node.name)) { + if (ts.isBlockOrCatchScoped(node)) { + bindBlockScopedVariableDeclaration(node); } - // If the child intersects this position, then this node is currently the nearest - // node that starts before the position. - if (child.pos <= position) { - if (child.pos >= bestResult.pos) { - // This node starts before the position, and is closer to the position than - // the previous best node we found. It is now the new best node. - bestResult = child; - } - // Now, the node may overlap the position, or it may end entirely before the - // position. If it overlaps with the position, then either it, or one of its - // children must be the nearest node before the position. So we can just - // recurse into this child to see if we can find something better. - if (position < child.end) { - // The nearest node is either this child, or one of the children inside - // of it. We've already marked this child as the best so far. Recurse - // in case one of the children is better. - forEachChild(child, visit); - // Once we look at the children of this node, then there's no need to - // continue any further. - return true; - } - else { - ts.Debug.assert(child.end <= position); - // The child ends entirely before this position. Say you have the following - // (where $ is the position) - // - // ? $ : <...> <...> - // - // We would want to find the nearest preceding node in "complex expr 2". - // To support that, we keep track of this node, and once we're done searching - // for a best node, we recurse down this node to see if we can find a good - // result in it. - // - // This approach allows us to quickly skip over nodes that are entirely - // before the position, while still allowing us to find any nodes in the - // last one that might be what we want. - lastNodeEntirelyBeforePosition = child; - } + else if (ts.isParameterDeclaration(node)) { + // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration + // because its parent chain has already been set up, since parents are set before descending into children. + // + // If node is a binding element in parameter declaration, we need to use ParameterExcludes. + // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration + // For example: + // function foo([a,a]) {} // Duplicate Identifier error + // function bar(a,a) {} // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter + // // which correctly set excluded symbols + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); } else { - ts.Debug.assert(child.pos > position); - // We're now at a node that is entirely past the position we're searching for. - // This node (and all following nodes) could never contribute to the result, - // so just skip them by returning 'true' here. - return true; + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */); } } } - function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { - var oldText = sourceFile.text; - if (textChangeRange) { - ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); - if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) { - var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); - var newTextPrefix = newText.substr(0, textChangeRange.span.start); - ts.Debug.assert(oldTextPrefix === newTextPrefix); - var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); - var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); - ts.Debug.assert(oldTextSuffix === newTextSuffix); - } + function bindParameter(node) { + if (inStrictMode) { + // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a + // strict mode FunctionLikeDeclaration or FunctionExpression(13.1) + checkStrictModeEvalOrArguments(node, node.name); + } + if (ts.isBindingPattern(node.name)) { + bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node)); + } + else { + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); + } + // If this is a property-parameter, then also declare the property symbol into the + // containing class. + if (node.flags & 56 /* AccessibilityModifier */ && + node.parent.kind === 144 /* Constructor */ && + ts.isClassLike(node.parent.parent)) { + var classDeclaration = node.parent.parent; + declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */); } } - function createSyntaxCursor(sourceFile) { - var currentArray = sourceFile.statements; - var currentArrayIndex = 0; - ts.Debug.assert(currentArrayIndex < currentArray.length); - var current = currentArray[currentArrayIndex]; - var lastQueriedPosition = -1 /* Value */; - return { - currentNode: function (position) { - // Only compute the current node if the position is different than the last time - // we were asked. The parser commonly asks for the node at the same position - // twice. Once to know if can read an appropriate list element at a certain point, - // and then to actually read and consume the node. - if (position !== lastQueriedPosition) { - // Much of the time the parser will need the very next node in the array that - // we just returned a node from.So just simply check for that case and move - // forward in the array instead of searching for the node again. - if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { - currentArrayIndex++; - current = currentArray[currentArrayIndex]; - } - // If we don't have a node, or the node we have isn't in the right position, - // then try to find a viable node at the position requested. - if (!current || current.pos !== position) { - findHighestListElementThatStartsAtPosition(position); - } - } - // Cache this query so that we don't do any extra work if the parser calls back - // into us. Note: this is very common as the parser will make pairs of calls like - // 'isListElement -> parseListElement'. If we were unable to find a node when - // called with 'isListElement', we don't want to redo the work when parseListElement - // is called immediately after. - lastQueriedPosition = position; - // Either we don'd have a node, or we have a node at the position being asked for. - ts.Debug.assert(!current || current.pos === position); - return current; - } - }; - // Finds the highest element in the tree we can find that starts at the provided position. - // The element must be a direct child of some node list in the tree. This way after we - // return it, we can easily return its next sibling in the list. - function findHighestListElementThatStartsAtPosition(position) { - // Clear out any cached state about the last node we found. - currentArray = undefined; - currentArrayIndex = -1 /* Value */; - current = undefined; - // Recurse into the source file to find the highest node at this position. - forEachChild(sourceFile, visitNode, visitArray); - return; - function visitNode(node) { - if (position >= node.pos && position < node.end) { - // Position was within this node. Keep searching deeper to find the node. - forEachChild(node, visitNode, visitArray); - // don't procede any futher in the search. - return true; - } - // position wasn't in this node, have to keep searching. - return false; + function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { + return ts.hasDynamicName(node) + ? bindAnonymousDeclaration(node, symbolFlags, "__computed") + : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); + } + // reachability checks + function pushNamedLabel(name) { + initializeReachabilityStateIfNecessary(); + if (ts.hasProperty(labelIndexMap, name.text)) { + return false; + } + labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1; + return true; + } + function pushImplicitLabel() { + initializeReachabilityStateIfNecessary(); + var index = labelStack.push(1 /* Unintialized */) - 1; + implicitLabels.push(index); + return index; + } + function popNamedLabel(label, outerState) { + var index = labelIndexMap[label.text]; + ts.Debug.assert(index !== undefined); + ts.Debug.assert(labelStack.length == index + 1); + labelIndexMap[label.text] = undefined; + setCurrentStateAtLabel(labelStack.pop(), outerState, label); + } + function popImplicitLabel(implicitLabelIndex, outerState) { + if (labelStack.length !== implicitLabelIndex + 1) { + ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); + } + var i = implicitLabels.pop(); + if (implicitLabelIndex !== i) { + ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); + } + setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined); + } + function setCurrentStateAtLabel(innerMergedState, outerState, label) { + if (innerMergedState === 1 /* Unintialized */) { + if (label && !options.allowUnusedLabels) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); } - function visitArray(array) { - if (position >= array.pos && position < array.end) { - // position was in this array. Search through this array to see if we find a - // viable element. - for (var i = 0, n = array.length; i < n; i++) { - var child = array[i]; - if (child) { - if (child.pos === position) { - // Found the right node. We're done. - currentArray = array; - currentArrayIndex = i; - current = child; - return true; - } - else { - if (child.pos < position && position < child.end) { - // Position in somewhere within this child. Search in it and - // stop searching in this array. - forEachChild(child, visitNode, visitArray); - return true; - } - } - } + currentReachabilityState = outerState; + } + else { + currentReachabilityState = or(innerMergedState, outerState); + } + } + function jumpToLabel(label, outerState) { + initializeReachabilityStateIfNecessary(); + var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); + if (index === undefined) { + // reference to unknown label or + // break/continue used outside of loops + return false; + } + var stateAtLabel = labelStack[index]; + labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState); + return true; + } + function checkUnreachable(node) { + switch (currentReachabilityState) { + case 4 /* Unreachable */: + var reportError = + // report error on all statements except empty ones + (ts.isStatement(node) && node.kind !== 194 /* EmptyStatement */) || + // report error on class declarations + node.kind === 214 /* ClassDeclaration */ || + // report error on instantiated modules or const-enums only modules if preserveConstEnums is set + (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) || + // report error on regular enums and const enums if preserveConstEnums is set + (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); + if (reportError) { + currentReachabilityState = 8 /* ReportedUnreachable */; + // unreachable code is reported if + // - user has explicitly asked about it AND + // - statement is in not ambient context (statements in ambient context is already an error + // so we should not report extras) AND + // - node is not variable statement OR + // - node is block scoped variable statement OR + // - node is not block scoped variable statement and at least one variable declaration has initializer + // Rationale: we don't want to report errors on non-initialized var's since they are hoisted + // On the other side we do want to report errors on non-initialized 'lets' because of TDZ + var reportUnreachableCode = !options.allowUnreachableCode && + !ts.isInAmbientContext(node) && + (node.kind !== 193 /* VariableStatement */ || + ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ || + ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); + if (reportUnreachableCode) { + errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); } } - // position wasn't in this array, have to keep searching. + case 8 /* ReportedUnreachable */: + return true; + default: return false; - } + } + function shouldReportErrorOnModuleDeclaration(node) { + var instanceState = getModuleInstanceState(node); + return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums); } } - var InvalidPosition; - (function (InvalidPosition) { - InvalidPosition[InvalidPosition["Value"] = -1] = "Value"; - })(InvalidPosition || (InvalidPosition = {})); - })(IncrementalParser || (IncrementalParser = {})); + function initializeReachabilityStateIfNecessary() { + if (labelIndexMap) { + return; + } + currentReachabilityState = 2 /* Reachable */; + labelIndexMap = {}; + labelStack = []; + implicitLabels = []; + } + } })(ts || (ts = {})); /// /* @internal */ @@ -13755,7 +13918,7 @@ var ts; symbolToString: symbolToString, getAugmentedPropertiesOfType: getAugmentedPropertiesOfType, getRootSymbols: getRootSymbols, - getContextualType: getContextualType, + getContextualType: getApparentTypeOfContextualType, getFullyQualifiedName: getFullyQualifiedName, getResolvedSignature: getResolvedSignature, getConstantValue: getConstantValue, @@ -14025,7 +14188,7 @@ var ts; return ts.getAncestor(node, 248 /* SourceFile */); } function isGlobalSourceFile(node) { - return node.kind === 248 /* SourceFile */ && !ts.isExternalModule(node); + return node.kind === 248 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node); } function getSymbol(symbols, name, meaning) { if (meaning && ts.hasProperty(symbols, name)) { @@ -14127,15 +14290,24 @@ var ts; } switch (location.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location)) + if (!ts.isExternalOrCommonJsModule(location)) break; case 218 /* ModuleDeclaration */: var moduleExports = getSymbolOfNode(location).exports; if (location.kind === 248 /* SourceFile */ || (location.kind === 218 /* ModuleDeclaration */ && location.name.kind === 9 /* StringLiteral */)) { - // It's an external module. Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. Therefore, - // if the name we find is purely an export specifier, it is not actually considered in scope. + // It's an external module. First see if the module has an export default and if the local + // name of that export default matches. + if (result = moduleExports["default"]) { + var localSymbol = ts.getLocalSymbolForExportDefault(result); + if (localSymbol && (result.flags & meaning) && localSymbol.name === name) { + break loop; + } + result = undefined; + } + // Because of module/namespace merging, a module's exports are in scope, + // yet we never want to treat an export specifier as putting a member in scope. + // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol // on an export specifier is that it might find the export specifier itself, and try to @@ -14149,12 +14321,6 @@ var ts; ts.getDeclarationOfKind(moduleExports[name], 230 /* ExportSpecifier */)) { break; } - result = moduleExports["default"]; - var localSymbol = ts.getLocalSymbolForExportDefault(result); - if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) { - break loop; - } - result = undefined; } if (result = getSymbol(moduleExports, name, meaning & 8914931 /* ModuleMember */)) { break loop; @@ -14297,7 +14463,7 @@ var ts; // declare module foo { // interface bar {} // } - // let foo/*1*/: foo/*2*/.bar; + // const foo/*1*/: foo/*2*/.bar; // The foo at /*1*/ and /*2*/ will share same symbol with two meaning // block - scope variable and namespace module. However, only when we // try to resolve name in /*1*/ which is used in variable position, @@ -14601,6 +14767,9 @@ var ts; if (moduleName === undefined) { return; } + if (moduleName.indexOf("!") >= 0) { + moduleName = moduleName.substr(0, moduleName.indexOf("!")); + } var isRelative = ts.isExternalModuleNameRelative(moduleName); if (!isRelative) { var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */); @@ -14788,7 +14957,7 @@ var ts; } switch (location_1.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location_1)) { + if (!ts.isExternalOrCommonJsModule(location_1)) { break; } case 218 /* ModuleDeclaration */: @@ -14910,7 +15079,7 @@ var ts; // export class c { // } // } - // let x: typeof m.c + // const x: typeof m.c // In the above example when we start with checking if typeof m.c symbol is accessible, // we are going to see if c can be accessed in scope directly. // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible @@ -14949,7 +15118,7 @@ var ts; } function hasExternalModuleSymbol(declaration) { return (declaration.kind === 218 /* ModuleDeclaration */ && declaration.name.kind === 9 /* StringLiteral */) || - (declaration.kind === 248 /* SourceFile */ && ts.isExternalModule(declaration)); + (declaration.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); } function hasVisibleDeclarations(symbol) { var aliasesToMakeVisible; @@ -15100,7 +15269,7 @@ var ts; parentSymbol = symbol; appendSymbolNameOnly(symbol, writer); } - // Let the writer know we just wrote out a symbol. The declaration emitter writer uses + // const the writer know we just wrote out a symbol. The declaration emitter writer uses // this to determine if an import it has previously seen (and not written out) needs // to be written to the file once the walk of the tree is complete. // @@ -15181,7 +15350,7 @@ var ts; writeAnonymousType(type, flags); } else if (type.flags & 256 /* StringLiteral */) { - writer.writeStringLiteral(type.text); + writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\""); } else { // Should never get here @@ -15568,7 +15737,7 @@ var ts; } } else if (node.kind === 248 /* SourceFile */) { - return ts.isExternalModule(node) ? node : undefined; + return ts.isExternalOrCommonJsModule(node) ? node : undefined; } } ts.Debug.fail("getContainingModule cant reach here"); @@ -15650,7 +15819,7 @@ var ts; // Private/protected properties/methods are not visible return false; } - // Public properties/methods are visible if its parents are visible, so let it fall into next case statement + // Public properties/methods are visible if its parents are visible, so const it fall into next case statement case 144 /* Constructor */: case 148 /* ConstructSignature */: case 147 /* CallSignature */: @@ -15678,7 +15847,7 @@ var ts; // Source file is always visible case 248 /* SourceFile */: return true; - // Export assignements do not create name bindings outside the module + // Export assignments do not create name bindings outside the module case 227 /* ExportAssignment */: return false; default: @@ -15814,6 +15983,23 @@ var ts; var symbol = getSymbolOfNode(node); return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node); } + function getTextOfPropertyName(name) { + switch (name.kind) { + case 69 /* Identifier */: + return name.text; + case 9 /* StringLiteral */: + case 8 /* NumericLiteral */: + return name.text; + case 136 /* ComputedPropertyName */: + if (ts.isStringOrNumericLiteral(name.expression.kind)) { + return name.expression.text; + } + } + return undefined; + } + function isComputedNonLiteralName(name) { + return name.kind === 136 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind); + } // Return the inferred type for a binding element function getTypeForBindingElement(declaration) { var pattern = declaration.parent; @@ -15835,10 +16021,15 @@ var ts; if (pattern.kind === 161 /* ObjectBindingPattern */) { // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form) var name_10 = declaration.propertyName || declaration.name; + if (isComputedNonLiteralName(name_10)) { + // computed properties with non-literal names are treated as 'any' + return anyType; + } // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature, // or otherwise the type of the string index signature. - type = getTypeOfPropertyOfType(parentType, name_10.text) || - isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1 /* Number */) || + var text = getTextOfPropertyName(name_10); + type = getTypeOfPropertyOfType(parentType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) || getIndexTypeOfType(parentType, 0 /* String */); if (!type) { error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10)); @@ -15938,10 +16129,17 @@ var ts; // Return the type implied by an object binding pattern function getTypeFromObjectBindingPattern(pattern, includePatternInType) { var members = {}; + var hasComputedProperties = false; ts.forEach(pattern.elements, function (e) { - var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0); var name = e.propertyName || e.name; - var symbol = createSymbol(flags, name.text); + if (isComputedNonLiteralName(name)) { + // do not include computed properties in the implied type + hasComputedProperties = true; + return; + } + var text = getTextOfPropertyName(name); + var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0); + var symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType); symbol.bindingElement = e; members[symbol.name] = symbol; @@ -15950,6 +16148,9 @@ var ts; if (includePatternInType) { result.pattern = pattern; } + if (hasComputedProperties) { + result.flags |= 67108864 /* ObjectLiteralPatternWithComputedProperties */; + } return result; } // Return the type implied by an array binding pattern @@ -16026,6 +16227,14 @@ var ts; if (declaration.kind === 227 /* ExportAssignment */) { return links.type = checkExpression(declaration.expression); } + // Handle module.exports = expr + if (declaration.kind === 181 /* BinaryExpression */) { + return links.type = checkExpression(declaration.right); + } + // Handle exports.p = expr + if (declaration.kind === 166 /* PropertyAccessExpression */) { + return checkExpressionCached(declaration.parent.right); + } // Handle variable, parameter or property if (!pushTypeResolution(symbol, 0 /* Type */)) { return unknownType; @@ -16304,23 +16513,25 @@ var ts; } function resolveBaseTypesOfClass(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; - var baseContructorType = getBaseConstructorTypeOfClass(type); - if (!(baseContructorType.flags & 80896 /* ObjectType */)) { + var baseConstructorType = getBaseConstructorTypeOfClass(type); + if (!(baseConstructorType.flags & 80896 /* ObjectType */)) { return; } var baseTypeNode = getBaseTypeNodeOfClass(type); var baseType; - if (baseContructorType.symbol && baseContructorType.symbol.flags & 32 /* Class */) { - // When base constructor type is a class we know that the constructors all have the same type parameters as the + var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ && + areAllOuterTypeParametersApplied(originalBaseType)) { + // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the // class and all return the instance type of the class. There is no need for further checks and we can apply the // type arguments in the same manner as a type reference to get the same error reporting experience. - baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol); + baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol); } else { // The class derives from a "class-like" constructor function, check that we have at least one construct signature // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere // we check that all instantiated signatures return the same type. - var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments); + var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments); if (!constructors.length) { error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments); return; @@ -16345,6 +16556,17 @@ var ts; type.resolvedBaseTypes.push(baseType); } } + function areAllOuterTypeParametersApplied(type) { + // An unapplied type parameter has its symbol still the same as the matching argument symbol. + // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked. + var outerTypeParameters = type.outerTypeParameters; + if (outerTypeParameters) { + var last = outerTypeParameters.length - 1; + var typeArguments = type.typeArguments; + return outerTypeParameters[last].symbol !== typeArguments[last].symbol; + } + return true; + } function resolveBaseTypesOfInterface(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { @@ -16424,7 +16646,7 @@ var ts; type.typeArguments = type.typeParameters; type.thisType = createType(512 /* TypeParameter */ | 33554432 /* ThisType */); type.thisType.symbol = symbol; - type.thisType.constraint = getTypeWithThisArgument(type); + type.thisType.constraint = type; } } return links.declaredType; @@ -16939,6 +17161,20 @@ var ts; type = getApparentType(type); return type.flags & 49152 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type); } + /** + * The apparent type of a type parameter is the base constraint instantiated with the type parameter + * as the type argument for the 'this' type. + */ + function getApparentTypeOfTypeParameter(type) { + if (!type.resolvedApparentType) { + var constraintType = getConstraintOfTypeParameter(type); + while (constraintType && constraintType.flags & 512 /* TypeParameter */) { + constraintType = getConstraintOfTypeParameter(constraintType); + } + type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type); + } + return type.resolvedApparentType; + } /** * For a type parameter, return the base constraint of the type parameter. For the string, number, * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the @@ -16946,12 +17182,7 @@ var ts; */ function getApparentType(type) { if (type.flags & 512 /* TypeParameter */) { - do { - type = getConstraintOfTypeParameter(type); - } while (type && type.flags & 512 /* TypeParameter */); - if (!type) { - type = emptyObjectType; - } + type = getApparentTypeOfTypeParameter(type); } if (type.flags & 258 /* StringLike */) { type = globalStringType; @@ -17116,7 +17347,7 @@ var ts; if (node.initializer) { var signatureDeclaration = node.parent; var signature = getSignatureFromDeclaration(signatureDeclaration); - var parameterIndex = signatureDeclaration.parameters.indexOf(node); + var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node); ts.Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } @@ -17217,6 +17448,16 @@ var ts; } return result; } + function resolveExternalModuleTypeByLiteral(name) { + var moduleSym = resolveExternalModuleName(name, name); + if (moduleSym) { + var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym); + if (resolvedModuleSymbol) { + return getTypeOfSymbol(resolvedModuleSymbol); + } + } + return anyType; + } function getReturnTypeOfSignature(signature) { if (!signature.resolvedReturnType) { if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) { @@ -17740,11 +17981,12 @@ var ts; return links.resolvedType; } function getStringLiteralType(node) { - if (ts.hasProperty(stringLiteralTypes, node.text)) { - return stringLiteralTypes[node.text]; + var text = node.text; + if (ts.hasProperty(stringLiteralTypes, text)) { + return stringLiteralTypes[text]; } - var type = stringLiteralTypes[node.text] = createType(256 /* StringLiteral */); - type.text = ts.getTextOfNode(node); + var type = stringLiteralTypes[text] = createType(256 /* StringLiteral */); + type.text = text; return type; } function getTypeFromStringLiteral(node) { @@ -18265,7 +18507,7 @@ var ts; return false; } function hasExcessProperties(source, target, reportErrors) { - if (someConstituentTypeHasKind(target, 80896 /* ObjectType */)) { + if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) { for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) { var prop = _a[_i]; if (!isKnownProperty(target, prop.name)) { @@ -18358,9 +18600,6 @@ var ts; return result; } function typeParameterIdenticalTo(source, target) { - if (source.symbol.name !== target.symbol.name) { - return 0 /* False */; - } // covers case when both type parameters does not have constraint (both equal to noConstraintType) if (source.constraint === target.constraint) { return -1 /* True */; @@ -18852,18 +19091,29 @@ var ts; } return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp)); } + function isMatchingSignature(source, target, partialMatch) { + // A source signature matches a target signature if the two signatures have the same number of required, + // optional, and rest parameters. + if (source.parameters.length === target.parameters.length && + source.minArgumentCount === target.minArgumentCount && + source.hasRestParameter === target.hasRestParameter) { + return true; + } + // A source signature partially matches a target signature if the target signature has no fewer required + // parameters and no more overall parameters than the source signature (where a signature with a rest + // parameter is always considered to have more overall parameters than one without). + if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter || + source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) { + return true; + } + return false; + } function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) { if (source === target) { return -1 /* True */; } - if (source.parameters.length !== target.parameters.length || - source.minArgumentCount !== target.minArgumentCount || - source.hasRestParameter !== target.hasRestParameter) { - if (!partialMatch || - source.parameters.length < target.parameters.length && !source.hasRestParameter || - source.minArgumentCount > target.minArgumentCount) { - return 0 /* False */; - } + if (!(isMatchingSignature(source, target, partialMatch))) { + return 0 /* False */; } var result = -1 /* True */; if (source.typeParameters && target.typeParameters) { @@ -18957,6 +19207,9 @@ var ts; function isTupleLikeType(type) { return !!getPropertyOfType(type, "0"); } + function isStringLiteralType(type) { + return type.flags & 256 /* StringLiteral */; + } /** * Check if a Type was written as a tuple type literal. * Prefer using isTupleLikeType() unless the use of `elementTypes` is required. @@ -19629,7 +19882,7 @@ var ts; } function narrowTypeByInstanceof(type, expr, assumeTrue) { // Check that type is not any, assumed result is true, and we have variable symbol on the left - if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) { + if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) { return type; } // Check that right operand is a function type with a prototype property @@ -19660,6 +19913,12 @@ var ts; } } if (targetType) { + if (!assumeTrue) { + if (type.flags & 16384 /* Union */) { + return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); })); + } + return type; + } return getNarrowedType(type, targetType); } return type; @@ -20129,6 +20388,9 @@ var ts; function getIndexTypeOfContextualType(type, kind) { return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }); } + function contextualTypeIsStringLiteralType(type) { + return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type)); + } // Return true if the given contextual type is a tuple-like type function contextualTypeIsTupleLikeType(type) { return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type)); @@ -20150,7 +20412,7 @@ var ts; } function getContextualTypeForObjectLiteralElement(element) { var objectLiteral = element.parent; - var type = getContextualType(objectLiteral); + var type = getApparentTypeOfContextualType(objectLiteral); if (type) { if (!ts.hasDynamicName(element)) { // For a (non-symbol) computed property, there is no reason to look up the name @@ -20173,7 +20435,7 @@ var ts; // type of T. function getContextualTypeForElementExpression(node) { var arrayLiteral = node.parent; - var type = getContextualType(arrayLiteral); + var type = getApparentTypeOfContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); return getTypeOfPropertyOfContextualType(type, "" + index) @@ -20206,11 +20468,28 @@ var ts; } // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily // be "pushed" onto a node using the contextualType property. - function getContextualType(node) { - var type = getContextualTypeWorker(node); + function getApparentTypeOfContextualType(node) { + var type = getContextualType(node); return type && getApparentType(type); } - function getContextualTypeWorker(node) { + /** + * Woah! Do you really want to use this function? + * + * Unless you're trying to get the *non-apparent* type for a + * value-literal type or you're authoring relevant portions of this algorithm, + * you probably meant to use 'getApparentTypeOfContextualType'. + * Otherwise this may not be very useful. + * + * In cases where you *are* working on this function, you should understand + * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'. + * + * - Use 'getContextualType' when you are simply going to propagate the result to the expression. + * - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type. + * + * @param node the expression whose contextual type will be returned. + * @returns the contextual type of an expression. + */ + function getContextualType(node) { if (isInsideWithStatementBody(node)) { // We cannot answer semantic questions within a with block, do not proceed any further return undefined; @@ -20285,7 +20564,7 @@ var ts; ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) - : getContextualType(node); + : getApparentTypeOfContextualType(node); if (!type) { return undefined; } @@ -20411,7 +20690,7 @@ var ts; type.pattern = node; return type; } - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType && contextualTypeIsTupleLikeType(contextualType)) { var pattern = contextualType.pattern; // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting @@ -20494,10 +20773,11 @@ var ts; checkGrammarObjectLiteralExpression(node, inDestructuringPattern); var propertiesTable = {}; var propertiesArray = []; - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); var contextualTypeHasPattern = contextualType && contextualType.pattern && (contextualType.pattern.kind === 161 /* ObjectBindingPattern */ || contextualType.pattern.kind === 165 /* ObjectLiteralExpression */); var typeFlags = 0; + var patternWithComputedProperties = false; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var memberDecl = _a[_i]; var member = memberDecl.symbol; @@ -20525,8 +20805,11 @@ var ts; if (isOptional) { prop.flags |= 536870912 /* Optional */; } + if (ts.hasDynamicName(memberDecl)) { + patternWithComputedProperties = true; + } } - else if (contextualTypeHasPattern) { + else if (contextualTypeHasPattern && !(contextualType.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */)) { // If object literal is contextually typed by the implied type of a binding pattern, and if the // binding pattern specifies a default value for the property, make the property optional. var impliedProp = getPropertyOfType(contextualType, member.name); @@ -20578,7 +20861,7 @@ var ts; var numberIndexType = getIndexType(1 /* Number */); var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */; - result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */); + result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0); if (inDestructuringPattern) { result.pattern = node; } @@ -21289,7 +21572,7 @@ var ts; // so order how inherited signatures are processed is still preserved. // interface A { (x: string): void } // interface B extends A { (x: 'foo'): string } - // let b: B; + // const b: B; // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void] function reorderCandidates(signatures, result) { var lastParent; @@ -22247,6 +22530,10 @@ var ts; return anyType; } } + // In JavaScript files, calls to any identifier 'require' are treated as external module imports + if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) { + return resolveExternalModuleTypeByLiteral(node.arguments[0]); + } return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { @@ -22257,7 +22544,10 @@ var ts; var targetType = getTypeFromTypeNode(node.type); if (produceDiagnostics && targetType !== unknownType) { var widenedType = getWidenedType(exprType); - if (!(isTypeAssignableTo(targetType, widenedType))) { + // Permit 'number[] | "foo"' to be asserted to 'string'. + var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) && + someConstituentTypeHasKind(widenedType, 258 /* StringLike */); + if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); } } @@ -22801,19 +23091,26 @@ var ts; for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) { var p = properties_3[_i]; if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) { - // TODO(andersh): Computed property support var name_13 = p.name; + if (name_13.kind === 136 /* ComputedPropertyName */) { + checkComputedPropertyName(name_13); + } + if (isComputedNonLiteralName(name_13)) { + continue; + } + var text = getTextOfPropertyName(name_13); var type = isTypeAny(sourceType) ? sourceType - : getTypeOfPropertyOfType(sourceType, name_13.text) || - isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1 /* Number */) || + : getTypeOfPropertyOfType(sourceType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) || getIndexTypeOfType(sourceType, 0 /* String */); if (type) { if (p.kind === 246 /* ShorthandPropertyAssignment */) { checkDestructuringAssignment(p, type); } else { - checkDestructuringAssignment(p.initializer || name_13, type); + // non-shorthand property assignments should always have initializers + checkDestructuringAssignment(p.initializer, type); } } else { @@ -23014,6 +23311,10 @@ var ts; case 31 /* ExclamationEqualsToken */: case 32 /* EqualsEqualsEqualsToken */: case 33 /* ExclamationEqualsEqualsToken */: + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) { + return booleanType; + } if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) { reportOperatorError(); } @@ -23137,6 +23438,13 @@ var ts; var type2 = checkExpression(node.whenFalse, contextualMapper); return getUnionType([type1, type2]); } + function checkStringLiteralExpression(node) { + var contextualType = getContextualType(node); + if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { + return getStringLiteralType(node); + } + return stringType; + } function checkTemplateExpression(node) { // We just want to check each expressions, but we are unconcerned with // the type of each expression, as any value may be coerced into a string. @@ -23187,7 +23495,7 @@ var ts; if (isInferentialContext(contextualMapper)) { var signature = getSingleCallSignature(type); if (signature && signature.typeParameters) { - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType) { var contextualSignature = getSingleCallSignature(contextualType); if (contextualSignature && !contextualSignature.typeParameters) { @@ -23251,6 +23559,7 @@ var ts; case 183 /* TemplateExpression */: return checkTemplateExpression(node); case 9 /* StringLiteral */: + return checkStringLiteralExpression(node); case 11 /* NoSubstitutionTemplateLiteral */: return stringType; case 10 /* RegularExpressionLiteral */: @@ -24580,7 +24889,7 @@ var ts; } // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent var parent = getDeclarationContainer(node); - if (parent.kind === 248 /* SourceFile */ && ts.isExternalModule(parent)) { + if (parent.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) { // If the declaration happens to be in external module, report error that require and exports are reserved keywords error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); } @@ -24598,15 +24907,15 @@ var ts; // A non-initialized declaration is a no-op as the block declaration will resolve before the var // declaration. the problem is if the declaration has an initializer. this will act as a write to the // block declared value. this is fine for let, but not const. - // Only consider declarations with initializers, uninitialized let declarations will not + // Only consider declarations with initializers, uninitialized const declarations will not // step on a let/const variable. - // Do not consider let and const declarations, as duplicate block-scoped declarations + // Do not consider const and const declarations, as duplicate block-scoped declarations // are handled by the binder. - // We are only looking for let declarations that step on let\const declarations from a + // We are only looking for const declarations that step on let\const declarations from a // different scope. e.g.: // { // const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration - // let x = 0; // symbol for this declaration will be 'symbol' + // const x = 0; // symbol for this declaration will be 'symbol' // } // skip block-scoped variables and parameters if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) { @@ -24693,6 +25002,12 @@ var ts; checkExpressionCached(node.initializer); } } + if (node.kind === 163 /* BindingElement */) { + // check computed properties inside property names of binding elements + if (node.propertyName && node.propertyName.kind === 136 /* ComputedPropertyName */) { + checkComputedPropertyName(node.propertyName); + } + } // For a binding pattern, check contained binding elements if (ts.isBindingPattern(node.name)) { ts.forEach(node.name.elements, checkSourceElement); @@ -25176,6 +25491,7 @@ var ts; var firstDefaultClause; var hasDuplicateDefaultClause = false; var expressionType = checkExpression(node.expression); + var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */); ts.forEach(node.caseBlock.clauses, function (clause) { // Grammar check for duplicate default clauses, skip if we already report duplicate default clause if (clause.kind === 242 /* DefaultClause */ && !hasDuplicateDefaultClause) { @@ -25195,6 +25511,10 @@ var ts; // TypeScript 1.0 spec (April 2014):5.9 // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression. var caseType = checkExpression(caseClause.expression); + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) { + return; + } if (!isTypeAssignableTo(expressionType, caseType)) { // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined); @@ -25659,11 +25979,14 @@ var ts; var enumIsConst = ts.isConst(node); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.name.kind === 136 /* ComputedPropertyName */) { + if (isComputedNonLiteralName(member.name)) { error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums); } - else if (isNumericLiteralName(member.name.text)) { - error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + else { + var text = getTextOfPropertyName(member.name); + if (isNumericLiteralName(text)) { + error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + } } var previousEnumMemberIsNonConstant = autoValue === undefined; var initializer = member.initializer; @@ -26305,8 +26628,8 @@ var ts; } // Function and class expression bodies are checked after all statements in the enclosing body. This is // to ensure constructs like the following are permitted: - // let foo = function () { - // let s = foo(); + // const foo = function () { + // const s = foo(); // return "hello"; // } // Here, performing a full type check of the body of the function expression whilst in the process of @@ -26421,8 +26744,12 @@ var ts; if (!(links.flags & 1 /* TypeChecked */)) { // Check whether the file has declared it is the default lib, // and whether the user has specifically chosen to avoid checking it. - if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) { - return; + if (compilerOptions.skipDefaultLibCheck) { + // If the user specified '--noLib' and a file has a '/// ', + // then we should treat that file as a default lib. + if (node.hasNoDefaultLib) { + return; + } } // Grammar checking checkGrammarSourceFile(node); @@ -26432,7 +26759,7 @@ var ts; potentialThisCollisions.length = 0; ts.forEach(node.statements, checkSourceElement); checkFunctionAndClassExpressionBodies(node); - if (ts.isExternalModule(node)) { + if (ts.isExternalOrCommonJsModule(node)) { checkExternalModuleExports(node); } if (potentialThisCollisions.length) { @@ -26515,7 +26842,7 @@ var ts; } switch (location.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location)) { + if (!ts.isExternalOrCommonJsModule(location)) { break; } case 218 /* ModuleDeclaration */: @@ -27153,9 +27480,18 @@ var ts; getReferencedValueDeclaration: getReferencedValueDeclaration, getTypeReferenceSerializationKind: getTypeReferenceSerializationKind, isOptionalParameter: isOptionalParameter, - isArgumentsLocalBinding: isArgumentsLocalBinding + isArgumentsLocalBinding: isArgumentsLocalBinding, + getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration }; } + function getExternalModuleFileFromDeclaration(declaration) { + var specifier = ts.getExternalModuleName(declaration); + var moduleSymbol = getSymbolAtLocation(specifier); + if (!moduleSymbol) { + return undefined; + } + return ts.getDeclarationOfKind(moduleSymbol, 248 /* SourceFile */); + } function initializeTypeChecker() { // Bind all source files and propagate errors ts.forEach(host.getSourceFiles(), function (file) { @@ -27163,11 +27499,10 @@ var ts; }); // Initialize global symbol table ts.forEach(host.getSourceFiles(), function (file) { - if (!ts.isExternalModule(file)) { + if (!ts.isExternalOrCommonJsModule(file)) { mergeSymbolTable(globals, file.locals); } }); - // Initialize special symbols getSymbolLinks(undefinedSymbol).type = undefinedType; getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments"); getSymbolLinks(unknownSymbol).type = unknownType; @@ -27866,7 +28201,7 @@ var ts; } } function checkGrammarForNonSymbolComputedProperty(node, message) { - if (node.kind === 136 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(node.expression)) { + if (ts.isDynamicName(node)) { return grammarErrorOnNode(node, message); } } @@ -28225,11 +28560,15 @@ var ts; var writeTextOfNode; var writer = createAndSetNewTextWriterWithSymbolWriter(); var enclosingDeclaration; - var currentSourceFile; + var currentText; + var currentLineMap; + var currentIdentifiers; + var isCurrentFileExternalModule; var reportedDeclarationError = false; var errorNameNode; var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments; var emit = compilerOptions.stripInternal ? stripInternal : emitNode; + var noDeclare = !root; var moduleElementDeclarationEmitInfo = []; var asynchronousSubModuleDeclarationEmitInfo; // Contains the reference paths that needs to go in the declaration file. @@ -28272,23 +28611,56 @@ var ts; else { // Emit references corresponding to this file var emittedReferencedFiles = []; + var prevModuleElementDeclarationEmitInfo = []; ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + if (!ts.isDeclarationFile(sourceFile)) { // Check what references need to be added if (!compilerOptions.noResolve) { ts.forEach(sourceFile.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference); - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) && + // If the reference file is a declaration file, emit that reference + if (referencedFile && (ts.isDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) { writeReferencePath(referencedFile); emittedReferencedFiles.push(referencedFile); } }); } + } + if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + noDeclare = false; + emitSourceFile(sourceFile); + } + else if (ts.isExternalModule(sourceFile)) { + noDeclare = true; + write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {"); + writeLine(); + increaseIndent(); emitSourceFile(sourceFile); + decreaseIndent(); + write("}"); + writeLine(); + // create asynchronous output for the importDeclarations + if (moduleElementDeclarationEmitInfo.length) { + var oldWriter = writer; + ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) { + if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { + ts.Debug.assert(aliasEmitInfo.node.kind === 222 /* ImportDeclaration */); + createAndSetNewTextWriterWithSymbolWriter(); + ts.Debug.assert(aliasEmitInfo.indent === 1); + increaseIndent(); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + decreaseIndent(); + } + }); + setWriter(oldWriter); + } + prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); + moduleElementDeclarationEmitInfo = []; } }); + moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo); } return { reportedDeclarationError: reportedDeclarationError, @@ -28297,13 +28669,12 @@ var ts; referencePathsOutput: referencePathsOutput }; function hasInternalAnnotation(range) { - var text = currentSourceFile.text; - var comment = text.substring(range.pos, range.end); + var comment = currentText.substring(range.pos, range.end); return comment.indexOf("@internal") >= 0; } function stripInternal(node) { if (node) { - var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos); if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) { return; } @@ -28395,7 +28766,7 @@ var ts; var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); if (errorInfo) { if (errorInfo.typeName) { - diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); + diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); } else { diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); @@ -28461,10 +28832,10 @@ var ts; } function writeJsDocComments(declaration) { if (declaration) { - var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile); - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); + var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments); // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange); + ts.emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange); } } function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) { @@ -28481,7 +28852,7 @@ var ts; case 103 /* VoidKeyword */: case 97 /* ThisKeyword */: case 9 /* StringLiteral */: - return writeTextOfNode(currentSourceFile, type); + return writeTextOfNode(currentText, type); case 188 /* ExpressionWithTypeArguments */: return emitExpressionWithTypeArguments(type); case 151 /* TypeReference */: @@ -28512,14 +28883,14 @@ var ts; } function writeEntityName(entityName) { if (entityName.kind === 69 /* Identifier */) { - writeTextOfNode(currentSourceFile, entityName); + writeTextOfNode(currentText, entityName); } else { var left = entityName.kind === 135 /* QualifiedName */ ? entityName.left : entityName.expression; var right = entityName.kind === 135 /* QualifiedName */ ? entityName.right : entityName.name; writeEntityName(left); write("."); - writeTextOfNode(currentSourceFile, right); + writeTextOfNode(currentText, right); } } function emitEntityName(entityName) { @@ -28549,7 +28920,7 @@ var ts; } } function emitTypePredicate(type) { - writeTextOfNode(currentSourceFile, type.parameterName); + writeTextOfNode(currentText, type.parameterName); write(" is "); emitType(type.type); } @@ -28590,9 +28961,12 @@ var ts; } } function emitSourceFile(node) { - currentSourceFile = node; + currentText = node.text; + currentLineMap = ts.getLineStarts(node); + currentIdentifiers = node.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(node); enclosingDeclaration = node; - ts.emitDetachedComments(currentSourceFile, writer, ts.writeCommentRange, node, newLine, true /* remove comments */); + ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true /* remove comments */); emitLines(node.statements); } // Return a temp variable name to be used in `export default` statements. @@ -28601,13 +28975,13 @@ var ts; // do not need to keep track of created temp names. function getExportDefaultTempVariableName() { var baseName = "_default"; - if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) { + if (!ts.hasProperty(currentIdentifiers, baseName)) { return baseName; } var count = 0; while (true) { var name_18 = baseName + "_" + (++count); - if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) { + if (!ts.hasProperty(currentIdentifiers, name_18)) { return name_18; } } @@ -28615,7 +28989,7 @@ var ts; function emitExportAssignment(node) { if (node.expression.kind === 69 /* Identifier */) { write(node.isExportEquals ? "export = " : "export default "); - writeTextOfNode(currentSourceFile, node.expression); + writeTextOfNode(currentText, node.expression); } else { // Expression @@ -28653,7 +29027,7 @@ var ts; writeModuleElement(node); } else if (node.kind === 221 /* ImportEqualsDeclaration */ || - (node.parent.kind === 248 /* SourceFile */ && ts.isExternalModule(currentSourceFile))) { + (node.parent.kind === 248 /* SourceFile */ && isCurrentFileExternalModule)) { var isVisible; if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248 /* SourceFile */) { // Import declaration of another module that is visited async so lets put it in right spot @@ -28707,7 +29081,7 @@ var ts; } function emitModuleElementDeclarationFlags(node) { // If the node is parented in the current source file we need to emit export declare or just export - if (node.parent === currentSourceFile) { + if (node.parent.kind === 248 /* SourceFile */) { // If the node is exported if (node.flags & 2 /* Export */) { write("export "); @@ -28715,7 +29089,7 @@ var ts; if (node.flags & 512 /* Default */) { write("default "); } - else if (node.kind !== 215 /* InterfaceDeclaration */) { + else if (node.kind !== 215 /* InterfaceDeclaration */ && !noDeclare) { write("declare "); } } @@ -28742,7 +29116,7 @@ var ts; write("export "); } write("import "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" = "); if (ts.isInternalModuleImportEqualsDeclaration(node)) { emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError); @@ -28750,7 +29124,7 @@ var ts; } else { write("require("); - writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node)); + writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node)); write(");"); } writer.writeLine(); @@ -28785,7 +29159,7 @@ var ts; if (node.importClause) { var currentWriterPos = writer.getTextPos(); if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) { - writeTextOfNode(currentSourceFile, node.importClause.name); + writeTextOfNode(currentText, node.importClause.name); } if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) { if (currentWriterPos !== writer.getTextPos()) { @@ -28794,7 +29168,7 @@ var ts; } if (node.importClause.namedBindings.kind === 224 /* NamespaceImport */) { write("* as "); - writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name); + writeTextOfNode(currentText, node.importClause.namedBindings.name); } else { write("{ "); @@ -28804,16 +29178,28 @@ var ts; } write(" from "); } - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); write(";"); writer.writeLine(); } + function emitExternalModuleSpecifier(moduleSpecifier) { + if (moduleSpecifier.kind === 9 /* StringLiteral */ && (!root) && (compilerOptions.out || compilerOptions.outFile)) { + var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent); + if (moduleName) { + write("\""); + write(moduleName); + write("\""); + return; + } + } + writeTextOfNode(currentText, moduleSpecifier); + } function emitImportOrExportSpecifier(node) { if (node.propertyName) { - writeTextOfNode(currentSourceFile, node.propertyName); + writeTextOfNode(currentText, node.propertyName); write(" as "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } function emitExportSpecifier(node) { emitImportOrExportSpecifier(node); @@ -28835,7 +29221,7 @@ var ts; } if (node.moduleSpecifier) { write(" from "); - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); } write(";"); writer.writeLine(); @@ -28849,11 +29235,11 @@ var ts; else { write("module "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); while (node.body.kind !== 219 /* ModuleBlock */) { node = node.body; write("."); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; @@ -28872,7 +29258,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("type "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); emitTypeParameters(node.typeParameters); write(" = "); emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError); @@ -28894,7 +29280,7 @@ var ts; write("const "); } write("enum "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" {"); writeLine(); increaseIndent(); @@ -28905,7 +29291,7 @@ var ts; } function emitEnumMemberDeclaration(node) { emitJsDocComments(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var enumMemberValue = resolver.getConstantValue(node); if (enumMemberValue !== undefined) { write(" = "); @@ -28922,7 +29308,7 @@ var ts; increaseIndent(); emitJsDocComments(node); decreaseIndent(); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If there is constraint present and this is not a type parameter of the private method emit the constraint if (node.constraint && !isPrivateMethodTypeParameter(node)) { write(" extends "); @@ -29037,7 +29423,7 @@ var ts; write("abstract "); } write("class "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -29060,7 +29446,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("interface "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -29095,7 +29481,7 @@ var ts; // If this node is a computed name, it can only be a symbol, because we've already skipped // it if it's not a well known symbol. In that case, the text of the name will be exactly // what we want, namely the name expression enclosed in brackets. - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If optional property emit ? if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && ts.hasQuestionToken(node)) { write("?"); @@ -29177,7 +29563,7 @@ var ts; emitBindingPattern(bindingElement.name); } else { - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError); } } @@ -29221,7 +29607,7 @@ var ts; emitJsDocComments(accessors.getAccessor); emitJsDocComments(accessors.setAccessor); emitClassMemberDeclarationFlags(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (!(node.flags & 16 /* Private */)) { accessorWithTypeAnnotation = node; var type = getTypeAnnotationFromAccessor(node); @@ -29307,13 +29693,13 @@ var ts; } if (node.kind === 213 /* FunctionDeclaration */) { write("function "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } else if (node.kind === 144 /* Constructor */) { write("constructor"); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (ts.hasQuestionToken(node)) { write("?"); } @@ -29437,7 +29823,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } if (resolver.isOptionalParameter(node)) { write("?"); @@ -29552,7 +29938,7 @@ var ts; // Example: // original: function foo({y: [a,b,c]}) {} // emit : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void; - writeTextOfNode(currentSourceFile, bindingElement.propertyName); + writeTextOfNode(currentText, bindingElement.propertyName); write(": "); } if (bindingElement.name) { @@ -29575,7 +29961,7 @@ var ts; if (bindingElement.dotDotDotToken) { write("..."); } - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); } } } @@ -29667,6 +30053,18 @@ var ts; return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile); } ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile; + function getResolvedExternalModuleName(host, file) { + return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName); + } + ts.getResolvedExternalModuleName = getResolvedExternalModuleName; + function getExternalModuleNameFromDeclaration(host, resolver, declaration) { + var file = resolver.getExternalModuleFileFromDeclaration(declaration); + if (!file || ts.isDeclarationFile(file)) { + return undefined; + } + return getResolvedExternalModuleName(host, file); + } + ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration; var Jump; (function (Jump) { Jump[Jump["Break"] = 2] = "Break"; @@ -29954,15 +30352,19 @@ var ts; var newLine = host.getNewLine(); var jsxDesugaring = host.getCompilerOptions().jsx !== 1 /* Preserve */; var shouldEmitJsx = function (s) { return (s.languageVariant === 1 /* JSX */ && !jsxDesugaring); }; + var outFile = compilerOptions.outFile || compilerOptions.out; + var emitJavaScript = createFileEmitter(); if (targetSourceFile === undefined) { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { - var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, sourceFile); - } - }); - if (compilerOptions.outFile || compilerOptions.out) { - emitFile(compilerOptions.outFile || compilerOptions.out); + if (outFile) { + emitFile(outFile); + } + else { + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { + var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); + emitFile(jsFilePath, sourceFile); + } + }); } } else { @@ -29971,8 +30373,8 @@ var ts; var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); emitFile(jsFilePath, targetSourceFile); } - else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(compilerOptions.outFile || compilerOptions.out); + else if (!ts.isDeclarationFile(targetSourceFile) && outFile) { + emitFile(outFile); } } // Sort and make the unique list of diagnostics @@ -30024,10 +30426,16 @@ var ts; } } } - function emitJavaScript(jsFilePath, root) { + function createFileEmitter() { var writer = ts.createTextWriter(newLine); var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var currentText; + var currentLineMap; + var currentFileIdentifiers; + var renamedDependencies; + var isEs6Module; + var isCurrentFileExternalModule; // name of an exporter function if file is a System external module // System.register([...], function () {...}) // exporting in System modules looks like: @@ -30035,15 +30443,15 @@ var ts; // => // var x;... exporter("x", x = 1) var exportFunctionForFile; - var generatedNameSet = {}; - var nodeToGeneratedName = []; + var generatedNameSet; + var nodeToGeneratedName; var computedPropertyNamesToGeneratedNames; var convertedLoopState; - var extendsEmitted = false; - var decorateEmitted = false; - var paramEmitted = false; - var awaiterEmitted = false; - var tempFlags = 0; + var extendsEmitted; + var decorateEmitted; + var paramEmitted; + var awaiterEmitted; + var tempFlags; var tempVariables; var tempParameters; var externalImports; @@ -30075,6 +30483,8 @@ var ts; var scopeEmitEnd = function () { }; /** Sourcemap data that will get encoded */ var sourceMapData; + /** The root file passed to the emit function (if present) */ + var root; /** If removeComments is true, no leading-comments needed to be emitted **/ var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker; var moduleEmitDelegates = (_a = {}, @@ -30085,31 +30495,77 @@ var ts; _a[1 /* CommonJS */] = emitCommonJSModule, _a ); - if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { - initializeEmitterWithSourceMaps(); - } - if (root) { - // Do not call emit directly. It does not set the currentSourceFile. - emitSourceFile(root); - } - else { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - emitSourceFile(sourceFile); + var bundleEmitDelegates = (_b = {}, + _b[5 /* ES6 */] = function () { }, + _b[2 /* AMD */] = emitAMDModule, + _b[4 /* System */] = emitSystemModule, + _b[3 /* UMD */] = function () { }, + _b[1 /* CommonJS */] = function () { }, + _b + ); + return doEmit; + function doEmit(jsFilePath, rootFile) { + // reset the state + writer.reset(); + currentSourceFile = undefined; + currentText = undefined; + currentLineMap = undefined; + exportFunctionForFile = undefined; + generatedNameSet = {}; + nodeToGeneratedName = []; + computedPropertyNamesToGeneratedNames = undefined; + convertedLoopState = undefined; + extendsEmitted = false; + decorateEmitted = false; + paramEmitted = false; + awaiterEmitted = false; + tempFlags = 0; + tempVariables = undefined; + tempParameters = undefined; + externalImports = undefined; + exportSpecifiers = undefined; + exportEquals = undefined; + hasExportStars = undefined; + detachedCommentsInfo = undefined; + sourceMapData = undefined; + isEs6Module = false; + renamedDependencies = undefined; + isCurrentFileExternalModule = false; + root = rootFile; + if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { + initializeEmitterWithSourceMaps(jsFilePath, root); + } + if (root) { + // Do not call emit directly. It does not set the currentSourceFile. + emitSourceFile(root); + } + else { + if (modulekind) { + ts.forEach(host.getSourceFiles(), emitEmitHelpers); } - }); + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) { + emitSourceFile(sourceFile); + } + }); + } + writeLine(); + writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM); } - writeLine(); - writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM); - return; function emitSourceFile(sourceFile) { currentSourceFile = sourceFile; + currentText = sourceFile.text; + currentLineMap = ts.getLineStarts(sourceFile); exportFunctionForFile = undefined; + isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"]; + renamedDependencies = sourceFile.renamedDependencies; + currentFileIdentifiers = sourceFile.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(sourceFile); emit(sourceFile); } function isUniqueName(name) { return !resolver.hasGlobalName(name) && - !ts.hasProperty(currentSourceFile.identifiers, name) && + !ts.hasProperty(currentFileIdentifiers, name) && !ts.hasProperty(generatedNameSet, name); } // Return the next available name in the pattern _a ... _z, _0, _1, ... @@ -30192,7 +30648,7 @@ var ts; var id = ts.getNodeId(node); return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node))); } - function initializeEmitterWithSourceMaps() { + function initializeEmitterWithSourceMaps(jsFilePath, root) { var sourceMapDir; // The directory in which sourcemap will be // Current source map file and its index in the sources list var sourceMapSourceIndex = -1; @@ -30280,7 +30736,7 @@ var ts; } } function recordSourceMapSpan(pos) { - var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos); + var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos); // Convert the location to be one-based. sourceLinePos.line++; sourceLinePos.character++; @@ -30314,13 +30770,13 @@ var ts; } function recordEmitNodeStartSpan(node) { // Get the token pos after skipping to the token (ignoring the leading trivia) - recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos)); + recordSourceMapSpan(ts.skipTrivia(currentText, node.pos)); } function recordEmitNodeEndSpan(node) { recordSourceMapSpan(node.end); } function writeTextWithSpanRecord(tokenKind, startPos, emitFn) { - var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos); + var tokenStartPos = ts.skipTrivia(currentText, startPos); recordSourceMapSpan(tokenStartPos); var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn); recordSourceMapSpan(tokenEndPos); @@ -30402,9 +30858,9 @@ var ts; sourceMapNameIndices.pop(); } ; - function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) { + function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) { recordSourceMapSpan(comment.pos); - ts.writeCommentRange(currentSourceFile, writer, comment, newLine); + ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine); recordSourceMapSpan(comment.end); } function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) { @@ -30434,7 +30890,7 @@ var ts; return output; } } - function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) { encodeLastRecordedSourceMapSpan(); var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent); sourceMapDataList.push(sourceMapData); @@ -30450,7 +30906,7 @@ var ts; sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL; } // Write sourcemap url to the js file and write the js file - writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark); + writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark); } // Initialize source map data var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)); @@ -30522,7 +30978,7 @@ var ts; scopeEmitEnd = recordScopeNameEnd; writeComment = writeCommentRangeWithMap; } - function writeJavaScriptFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) { ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark); } // Create a temporary variable with a unique unused name. @@ -30702,7 +31158,7 @@ var ts; // If we don't need to downlevel and we can reach the original source text using // the node's parent reference, then simply get the text as it was originally written. if (node.parent) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + return ts.getTextOfNodeFromSourceText(currentText, node); } // If we can't reach the original source text, use the canonical form if it's a number, // or an escaped quoted form of the original text if it's string-like. @@ -30729,7 +31185,7 @@ var ts; // Find original source text, since we need to emit the raw strings of the tagged template. // The raw strings contain the (escaped) strings of what the user wrote. // Examples: `\n` is converted to "\\n", a template string with a newline to "\n". - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var text = ts.getTextOfNodeFromSourceText(currentText, node); // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"), // thus we need to remove those characters. // First template piece starts with "`", others with "}" @@ -31146,7 +31602,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } write("\""); } @@ -31246,7 +31702,7 @@ var ts; // Identifier references named import write(getGeneratedNameForNode(declaration.parent.parent.parent)); var name_23 = declaration.propertyName || declaration.name; - var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23); + var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23); if (languageVersion === 0 /* ES3 */ && identifier === "default") { write("[\"default\"]"); } @@ -31270,7 +31726,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function isNameOfNestedRedeclaration(node) { @@ -31308,7 +31764,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function emitThis(node) { @@ -31712,7 +32168,7 @@ var ts; function emitShorthandPropertyAssignment(node) { // The name property of a short-hand property assignment is considered an expression position, so here // we manually emit the identifier to avoid rewriting. - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier, // we emit a normal property assignment. For example: // module m { @@ -31722,7 +32178,7 @@ var ts; // let obj = { y }; // } // Here we need to emit obj = { y : m.y } regardless of the output target. - if (languageVersion < 2 /* ES6 */ || isNamespaceExportReference(node.name)) { + if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) { // Emit identifier as an identifier write(": "); emit(node.name); @@ -31779,11 +32235,11 @@ var ts; var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken); // 1 .toString is a valid property access, emit a space after the literal // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal - var shouldEmitSpace; + var shouldEmitSpace = false; if (!indentedBeforeDot) { if (node.expression.kind === 8 /* NumericLiteral */) { // check if numeric literal was originally written with a dot - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression); + var text = ts.getTextOfNodeFromSourceText(currentText, node.expression); shouldEmitSpace = text.indexOf(ts.tokenToString(21 /* DotToken */)) < 0; } else { @@ -32962,16 +33418,16 @@ var ts; emitToken(16 /* CloseBraceToken */, node.clauses.end); } function nodeStartPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function nodeEndPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, node2.end); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end); } function nodeEndIsOnSameLineAsNodeStart(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function emitCaseOrDefaultClause(node) { if (node.kind === 241 /* CaseClause */) { @@ -33077,7 +33533,7 @@ var ts; ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 227 /* ExportAssignment */); // only allow export default at a source file level if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) { - if (!currentSourceFile.symbol.exports["___esModule"]) { + if (!isEs6Module) { if (languageVersion === 1 /* ES5 */) { // default value of configurable, enumerable, writable are `false`. write("Object.defineProperty(exports, \"__esModule\", { value: true });"); @@ -33272,14 +33728,20 @@ var ts; return node; } function createPropertyAccessForDestructuringProperty(object, propName) { - // We create a synthetic copy of the identifier in order to avoid the rewriting that might - // otherwise occur when the identifier is emitted. - var syntheticName = ts.createSynthesizedNode(propName.kind); - syntheticName.text = propName.text; - if (syntheticName.kind !== 69 /* Identifier */) { - return createElementAccessExpression(object, syntheticName); + var index; + var nameIsComputed = propName.kind === 136 /* ComputedPropertyName */; + if (nameIsComputed) { + index = ensureIdentifier(propName.expression, /* reuseIdentifierExpression */ false); + } + else { + // We create a synthetic copy of the identifier in order to avoid the rewriting that might + // otherwise occur when the identifier is emitted. + index = ts.createSynthesizedNode(propName.kind); + index.text = propName.text; } - return createPropertyAccessExpression(object, syntheticName); + return !nameIsComputed && index.kind === 69 /* Identifier */ + ? createPropertyAccessExpression(object, index) + : createElementAccessExpression(object, index); } function createSliceCall(value, sliceIndex) { var call = ts.createSynthesizedNode(168 /* CallExpression */); @@ -33742,7 +34204,6 @@ var ts; var promiseConstructor = ts.getEntityNameFromTypeNode(node.type); var isArrowFunction = node.kind === 174 /* ArrowFunction */; var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0; - var args; // An async function is emit as an outer function that calls an inner // generator function. To preserve lexical bindings, we pass the current // `this` and `arguments` objects to `__awaiter`. The generator function @@ -35197,8 +35658,8 @@ var ts; * Here we check if alternative name was provided for a given moduleName and return it if possible. */ function tryRenameExternalModule(moduleName) { - if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) { - return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\""; + if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) { + return "\"" + renamedDependencies[moduleName.text] + "\""; } return undefined; } @@ -35351,7 +35812,7 @@ var ts; // - current file is not external module // - import declaration is top level and target is value imported by entity name if (resolver.isReferencedAliasDeclaration(node) || - (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { + (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); // variable declaration for import-equals declaration can be hoisted in system modules @@ -35579,7 +36040,7 @@ var ts; function getLocalNameForExternalImport(node) { var namespaceDeclaration = getNamespaceDeclarationNode(node); if (namespaceDeclaration && !isDefaultImport(node)) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name); + return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name); } if (node.kind === 222 /* ImportDeclaration */ && node.importClause) { return getGeneratedNameForNode(node); @@ -35884,7 +36345,7 @@ var ts; ts.getEnclosingBlockScopeContainer(node).kind === 248 /* SourceFile */; } function isCurrentFileSystemExternalModule() { - return modulekind === 4 /* System */ && ts.isExternalModule(currentSourceFile); + return modulekind === 4 /* System */ && isCurrentFileExternalModule; } function emitSystemModuleBody(node, dependencyGroups, startIndex) { // shape of the body in system modules: @@ -36054,7 +36515,13 @@ var ts; writeLine(); write("}"); // execute } - function emitSystemModule(node) { + function writeModuleName(node, emitRelativePathAsModuleName) { + var moduleName = node.moduleName; + if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) { + write("\"" + moduleName + "\", "); + } + } + function emitSystemModule(node, emitRelativePathAsModuleName) { collectExternalModuleInfo(node); // System modules has the following shape // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */}) @@ -36069,9 +36536,7 @@ var ts; exportFunctionForFile = makeUniqueName("exports"); writeLine(); write("System.register("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } + writeModuleName(node, emitRelativePathAsModuleName); write("["); var groupIndices = {}; var dependencyGroups = []; @@ -36090,6 +36555,12 @@ var ts; if (i !== 0) { write(", "); } + if (emitRelativePathAsModuleName) { + var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]); + if (name_29) { + text = "\"" + name_29 + "\""; + } + } write(text); } write("], function(" + exportFunctionForFile + ") {"); @@ -36103,7 +36574,7 @@ var ts; writeLine(); write("});"); } - function getAMDDependencyNames(node, includeNonAmdDependencies) { + function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { // names of modules with corresponding parameter in the factory function var aliasedModuleNames = []; // names of modules with no corresponding parameters in factory function @@ -36126,6 +36597,12 @@ var ts; var importNode = externalImports_4[_c]; // Find the name of the external module var externalModuleName = getExternalModuleNameText(importNode); + if (emitRelativePathAsModuleName) { + var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode); + if (name_30) { + externalModuleName = "\"" + name_30 + "\""; + } + } // Find the name of the module alias, if there is one var importAliasName = getLocalNameForExternalImport(importNode); if (includeNonAmdDependencies && importAliasName) { @@ -36138,7 +36615,7 @@ var ts; } return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames }; } - function emitAMDDependencies(node, includeNonAmdDependencies) { + function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { // An AMD define function has the following shape: // define(id?, dependencies?, factory); // @@ -36150,7 +36627,7 @@ var ts; // To ensure this is true in cases of modules with no aliases, e.g.: // `import "module"` or `` // we need to add modules without alias names to the end of the dependencies list - var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies); + var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName); emitAMDDependencyList(dependencyNames); write(", "); emitAMDFactoryHeader(dependencyNames); @@ -36177,15 +36654,13 @@ var ts; } write(") {"); } - function emitAMDModule(node) { + function emitAMDModule(node, emitRelativePathAsModuleName) { emitEmitHelpers(node); collectExternalModuleInfo(node); writeLine(); write("define("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } - emitAMDDependencies(node, /*includeNonAmdDependencies*/ true); + writeModuleName(node, emitRelativePathAsModuleName); + emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName); increaseIndent(); var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); emitExportStarHelper(); @@ -36404,8 +36879,13 @@ var ts; emitShebang(); emitDetachedCommentsAndUpdateCommentsInfo(node); if (ts.isExternalModule(node) || compilerOptions.isolatedModules) { - var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */]; - emitModule(node); + if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) { + var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */]; + emitModule(node); + } + else { + bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/ true); + } } else { // emit prologue directives prior to __extends @@ -36666,7 +37146,7 @@ var ts; } function getLeadingCommentsWithoutDetachedComments() { // get the leading comments from detachedPos - var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); + var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); if (detachedCommentsInfo.length - 1) { detachedCommentsInfo.pop(); } @@ -36683,10 +37163,10 @@ var ts; function isTripleSlashComment(comment) { // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text // so that we don't end up computing comment string and doing match for all // comments - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 /* slash */ && + if (currentText.charCodeAt(comment.pos + 1) === 47 /* slash */ && comment.pos + 2 < comment.end && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 /* slash */) { - var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end); + currentText.charCodeAt(comment.pos + 2) === 47 /* slash */) { + var textSubStr = currentText.substring(comment.pos, comment.end); return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) || textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ? true : false; @@ -36703,7 +37183,7 @@ var ts; } else { // get the leading comments from the node - return ts.getLeadingCommentRangesOfNode(node, currentSourceFile); + return ts.getLeadingCommentRangesOfNodeFromText(node, currentText); } } } @@ -36712,7 +37192,7 @@ var ts; // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments if (node.parent) { if (node.parent.kind === 248 /* SourceFile */ || node.end !== node.parent.end) { - return ts.getTrailingCommentRanges(currentSourceFile.text, node.end); + return ts.getTrailingCommentRanges(currentText, node.end); } } } @@ -36746,9 +37226,9 @@ var ts; leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment); } } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments); // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment); } function emitTrailingComments(node) { if (compilerOptions.removeComments) { @@ -36757,7 +37237,7 @@ var ts; // Emit the trailing comments only if the parent's end doesn't match var trailingComments = getTrailingCommentsToEmit(node); // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/ - ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment); } /** * Emit trailing comments at the position. The term trailing comment is used here to describe following comment: @@ -36768,9 +37248,9 @@ var ts; if (compilerOptions.removeComments) { return; } - var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos); + var trailingComments = ts.getTrailingCommentRanges(currentText, pos); // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/ - ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment); } function emitLeadingCommentsOfPositionWorker(pos) { if (compilerOptions.removeComments) { @@ -36783,14 +37263,14 @@ var ts; } else { // get the leading comments from the node - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos); + leadingComments = ts.getLeadingCommentRanges(currentText, pos); } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments); // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment); } function emitDetachedCommentsAndUpdateCommentsInfo(node) { - var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, compilerOptions.removeComments); + var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments); if (currentDetachedCommentInfo) { if (detachedCommentsInfo) { detachedCommentsInfo.push(currentDetachedCommentInfo); @@ -36801,12 +37281,12 @@ var ts; } } function emitShebang() { - var shebang = ts.getShebang(currentSourceFile.text); + var shebang = ts.getShebang(currentText); if (shebang) { write(shebang); } } - var _a; + var _a, _b; } function emitFile(jsFilePath, sourceFile) { emitJavaScript(jsFilePath, sourceFile); @@ -36866,11 +37346,11 @@ var ts; if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { var failedLookupLocations = []; var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName)); - var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host); return resolvedFileName ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations }; @@ -36880,8 +37360,8 @@ var ts; } } ts.nodeModuleNameResolver = nodeModuleNameResolver; - function loadNodeModuleFromFile(candidate, failedLookupLocation, host) { - return ts.forEach(ts.moduleFileExtensions, tryLoad); + function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) { + return ts.forEach(extensions, tryLoad); function tryLoad(ext) { var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (host.fileExists(fileName)) { @@ -36893,7 +37373,7 @@ var ts; } } } - function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) { + function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) { var packageJsonPath = ts.combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { var jsonContent; @@ -36906,7 +37386,7 @@ var ts; jsonContent = { typings: undefined }; } if (jsonContent.typings) { - var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); if (result) { return result; } @@ -36916,7 +37396,7 @@ var ts; // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host); + return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName, directory, host) { var failedLookupLocations = []; @@ -36926,11 +37406,11 @@ var ts; if (baseName !== "node_modules") { var nodeModulesFolder = ts.combinePaths(directory, "node_modules"); var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } - result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } @@ -36956,9 +37436,10 @@ var ts; var searchName; var failedLookupLocations = []; var referencedSourceFile; + var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions; while (true) { searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName)); - referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) { + referencedSourceFile = ts.forEach(extensions, function (extension) { if (extension === ".tsx" && !compilerOptions.jsx) { // resolve .tsx files only if jsx support is enabled // 'logical not' handles both undefined and None cases @@ -36989,10 +37470,8 @@ var ts; /* @internal */ ts.defaultInitCompilerOptions = { module: 1 /* CommonJS */, - target: 0 /* ES3 */, + target: 1 /* ES5 */, noImplicitAny: false, - outDir: "built", - rootDir: ".", sourceMap: false }; function createCompilerHost(options, setParentNodes) { @@ -37397,43 +37876,55 @@ var ts; if (file.imports) { return; } + var isJavaScriptFile = ts.isSourceFileJavaScript(file); var imports; for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { var node = _a[_i]; - collect(node, /* allowRelativeModuleNames */ true); + collect(node, /* allowRelativeModuleNames */ true, /* collectOnlyRequireCalls */ false); } file.imports = imports || emptyArray; - function collect(node, allowRelativeModuleNames) { - switch (node.kind) { - case 222 /* ImportDeclaration */: - case 221 /* ImportEqualsDeclaration */: - case 228 /* ExportDeclaration */: - var moduleNameExpr = ts.getExternalModuleName(node); - if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) { - break; - } - if (!moduleNameExpr.text) { + return; + function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) { + if (!collectOnlyRequireCalls) { + switch (node.kind) { + case 222 /* ImportDeclaration */: + case 221 /* ImportEqualsDeclaration */: + case 228 /* ExportDeclaration */: + var moduleNameExpr = ts.getExternalModuleName(node); + if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) { + break; + } + if (!moduleNameExpr.text) { + break; + } + if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { + (imports || (imports = [])).push(moduleNameExpr); + } break; - } - if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { - (imports || (imports = [])).push(moduleNameExpr); - } - break; - case 218 /* ModuleDeclaration */: - if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) { - // TypeScript 1.0 spec (April 2014): 12.1.6 - // An AmbientExternalModuleDeclaration declares an external module. - // This type of declaration is permitted only in the global module. - // The StringLiteral must specify a top - level external module name. - // Relative external module names are not permitted - ts.forEachChild(node.body, function (node) { + case 218 /* ModuleDeclaration */: + if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) { // TypeScript 1.0 spec (April 2014): 12.1.6 - // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules - // only through top - level external module names. Relative external module names are not permitted. - collect(node, /* allowRelativeModuleNames */ false); - }); - } - break; + // An AmbientExternalModuleDeclaration declares an external module. + // This type of declaration is permitted only in the global module. + // The StringLiteral must specify a top - level external module name. + // Relative external module names are not permitted + ts.forEachChild(node.body, function (node) { + // TypeScript 1.0 spec (April 2014): 12.1.6 + // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules + // only through top - level external module names. Relative external module names are not permitted. + collect(node, /* allowRelativeModuleNames */ false, collectOnlyRequireCalls); + }); + } + break; + } + } + if (isJavaScriptFile) { + if (ts.isRequireCall(node)) { + (imports || (imports = [])).push(node.arguments[0]); + } + else { + ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, /* collectOnlyRequireCalls */ true); }); + } } } } @@ -37526,7 +38017,6 @@ var ts; // always process imported modules to record module name resolutions processImportedModules(file, basePath); if (isDefaultLib) { - file.isDefaultLib = true; files.unshift(file); } else { @@ -37604,6 +38094,9 @@ var ts; commonPathComponents.length = sourcePathComponents.length; } }); + if (!commonPathComponents) { + return currentDirectory; + } return ts.getNormalizedPathFromPathComponents(commonPathComponents); } function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) { @@ -37689,12 +38182,15 @@ var ts; if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) { programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower)); } + // Cannot specify module gen that isn't amd or system with --out + if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) { + programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile")); + } // there has to be common source directory if user specified --outdir || --sourceRoot // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted if (options.outDir || options.sourceRoot || - (options.mapRoot && - (!outFile || firstExternalModuleSourceFile !== undefined))) { + options.mapRoot) { if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { // If a rootDir is specified and is valid use it as the commonSourceDirectory commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory); @@ -38212,20 +38708,20 @@ var ts; var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined; var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); for (var i = 0; i < sysFiles.length; i++) { - var name_29 = sysFiles[i]; - if (ts.fileExtensionIs(name_29, ".d.ts")) { - var baseName = name_29.substr(0, name_29.length - ".d.ts".length); + var name_31 = sysFiles[i]; + if (ts.fileExtensionIs(name_31, ".d.ts")) { + var baseName = name_31.substr(0, name_31.length - ".d.ts".length); if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) { - fileNames.push(name_29); + fileNames.push(name_31); } } - else if (ts.fileExtensionIs(name_29, ".ts")) { - if (!ts.contains(sysFiles, name_29 + "x")) { - fileNames.push(name_29); + else if (ts.fileExtensionIs(name_31, ".ts")) { + if (!ts.contains(sysFiles, name_31 + "x")) { + fileNames.push(name_31); } } else { - fileNames.push(name_29); + fileNames.push(name_31); } } } @@ -38453,12 +38949,12 @@ var ts; ts.forEach(program.getSourceFiles(), function (sourceFile) { cancellationToken.throwIfCancellationRequested(); var nameToDeclarations = sourceFile.getNamedDeclarations(); - for (var name_30 in nameToDeclarations) { - var declarations = ts.getProperty(nameToDeclarations, name_30); + for (var name_32 in nameToDeclarations) { + var declarations = ts.getProperty(nameToDeclarations, name_32); if (declarations) { // First do a quick check to see if the name of the declaration matches the // last portion of the (possibly) dotted name they're searching for. - var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_30); + var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32); if (!matches) { continue; } @@ -38471,14 +38967,14 @@ var ts; if (!containers) { return undefined; } - matches = patternMatcher.getMatches(containers, name_30); + matches = patternMatcher.getMatches(containers, name_32); if (!matches) { continue; } } var fileName = sourceFile.fileName; var matchKind = bestMatchKind(matches); - rawItems.push({ name: name_30, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); + rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); } } } @@ -38859,9 +39355,9 @@ var ts; case 211 /* VariableDeclaration */: case 163 /* BindingElement */: var variableDeclarationNode; - var name_31; + var name_33; if (node.kind === 163 /* BindingElement */) { - name_31 = node.name; + name_33 = node.name; variableDeclarationNode = node; // binding elements are added only for variable declarations // bubble up to the containing variable declaration @@ -38873,16 +39369,16 @@ var ts; else { ts.Debug.assert(!ts.isBindingPattern(node.name)); variableDeclarationNode = node; - name_31 = node.name; + name_33 = node.name; } if (ts.isConst(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.constElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement); } else if (ts.isLet(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.letElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement); } else { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.variableElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement); } case 144 /* Constructor */: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); @@ -39802,7 +40298,7 @@ var ts; if (!candidates.length) { // We didn't have any sig help items produced by the TS compiler. If this is a JS // file, then see if we can figure out anything better. - if (ts.isJavaScript(sourceFile.fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { return createJavaScriptSignatureHelpItems(argumentInfo); } return undefined; @@ -41662,9 +42158,9 @@ var ts; } Rules.prototype.getRuleName = function (rule) { var o = this; - for (var name_32 in o) { - if (o[name_32] === rule) { - return name_32; + for (var name_34 in o) { + if (o[name_34] === rule) { + return name_34; } } throw new Error("Unknown rule"); @@ -42096,7 +42592,7 @@ var ts; function TokenRangeAccess(from, to, except) { this.tokens = []; for (var token = from; token <= to; token++) { - if (except.indexOf(token) < 0) { + if (ts.indexOf(except, token) < 0) { this.tokens.push(token); } } @@ -43709,13 +44205,18 @@ var ts; ]; var jsDocCompletionEntries; function createNode(kind, pos, end, flags, parent) { - var node = new (ts.getNodeConstructor(kind))(pos, end); + var node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; } var NodeObject = (function () { - function NodeObject() { + function NodeObject(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0 /* None */; + this.parent = undefined; } NodeObject.prototype.getSourceFile = function () { return ts.getSourceFileOfNode(this); @@ -44198,8 +44699,8 @@ var ts; })(); var SourceFileObject = (function (_super) { __extends(SourceFileObject, _super); - function SourceFileObject() { - _super.apply(this, arguments); + function SourceFileObject(kind, pos, end) { + _super.call(this, kind, pos, end); } SourceFileObject.prototype.update = function (newText, textChangeRange) { return ts.updateSourceFile(this, newText, textChangeRange); @@ -44521,6 +45022,9 @@ var ts; ClassificationTypeNames.typeAliasName = "type alias name"; ClassificationTypeNames.parameterName = "parameter name"; ClassificationTypeNames.docCommentTagName = "doc comment tag name"; + ClassificationTypeNames.jsxOpenTagName = "jsx open tag name"; + ClassificationTypeNames.jsxCloseTagName = "jsx close tag name"; + ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name"; return ClassificationTypeNames; })(); ts.ClassificationTypeNames = ClassificationTypeNames; @@ -44543,6 +45047,9 @@ var ts; ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName"; ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName"; ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName"; + ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName"; + ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName"; + ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName"; })(ts.ClassificationType || (ts.ClassificationType = {})); var ClassificationType = ts.ClassificationType; function displayPartsToString(displayParts) { @@ -44922,8 +45429,9 @@ var ts; }; } ts.createDocumentRegistry = createDocumentRegistry; - function preProcessFile(sourceText, readImportFiles) { + function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) { if (readImportFiles === void 0) { readImportFiles = true; } + if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; } var referencedFiles = []; var importedFiles = []; var ambientExternalModules; @@ -44957,116 +45465,66 @@ var ts; end: pos + importPath.length }); } - function processImport() { - scanner.setText(sourceText); - var token = scanner.scan(); - // Look for: - // import "mod"; - // import d from "mod" - // import {a as A } from "mod"; - // import * as NS from "mod" - // import d, {a, b as B} from "mod" - // import i = require("mod"); - // - // export * from "mod" - // export {a as b} from "mod" - // export import i = require("mod") - while (token !== 1 /* EndOfFileToken */) { - if (token === 122 /* DeclareKeyword */) { - // declare module "mod" - token = scanner.scan(); - if (token === 125 /* ModuleKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - recordAmbientExternalModule(); - continue; - } - } - } - else if (token === 89 /* ImportKeyword */) { + /** + * Returns true if at least one token was consumed from the stream + */ + function tryConsumeDeclare() { + var token = scanner.getToken(); + if (token === 122 /* DeclareKeyword */) { + // declare module "mod" + token = scanner.scan(); + if (token === 125 /* ModuleKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // import "mod"; - recordModuleName(); - continue; + recordAmbientExternalModule(); } - else { - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + } + return true; + } + return false; + } + /** + * Returns true if at least one token was consumed from the stream + */ + function tryConsumeImport() { + var token = scanner.getToken(); + if (token === 89 /* ImportKeyword */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // import "mod"; + recordModuleName(); + return true; + } + else { + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import d from "mod"; - recordModuleName(); - continue; - } - } - else if (token === 56 /* EqualsToken */) { - token = scanner.scan(); - if (token === 127 /* RequireKeyword */) { - token = scanner.scan(); - if (token === 17 /* OpenParenToken */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import i = require("mod"); - recordModuleName(); - continue; - } - } - } - } - else if (token === 24 /* CommaToken */) { - // consume comma and keep going - token = scanner.scan(); - } - else { - // unknown syntax - continue; + if (token === 9 /* StringLiteral */) { + // import d from "mod"; + recordModuleName(); + return true; } } - if (token === 15 /* OpenBraceToken */) { - token = scanner.scan(); - // consume "{ a as B, c, d as D}" clauses - while (token !== 16 /* CloseBraceToken */) { - token = scanner.scan(); - } - if (token === 16 /* CloseBraceToken */) { - token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import {a as A} from "mod"; - // import d, {a, b as B} from "mod" - recordModuleName(); - } - } + else if (token === 56 /* EqualsToken */) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + return true; } } - else if (token === 37 /* AsteriskToken */) { + else if (token === 24 /* CommaToken */) { + // consume comma and keep going token = scanner.scan(); - if (token === 116 /* AsKeyword */) { - token = scanner.scan(); - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import * as NS from "mod" - // import d, * as NS from "mod" - recordModuleName(); - } - } - } - } + } + else { + // unknown syntax + return true; } } - } - else if (token === 82 /* ExportKeyword */) { - token = scanner.scan(); if (token === 15 /* OpenBraceToken */) { token = scanner.scan(); // consume "{ a as B, c, d as D}" clauses - while (token !== 16 /* CloseBraceToken */) { + // make sure that it stops on EOF + while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) { token = scanner.scan(); } if (token === 16 /* CloseBraceToken */) { @@ -45074,49 +45532,171 @@ var ts; if (token === 133 /* FromKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // export {a as A} from "mod"; - // export {a, b as B} from "mod" + // import {a as A} from "mod"; + // import d, {a, b as B} from "mod" recordModuleName(); } } } } else if (token === 37 /* AsteriskToken */) { + token = scanner.scan(); + if (token === 116 /* AsKeyword */) { + token = scanner.scan(); + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // import * as NS from "mod" + // import d, * as NS from "mod" + recordModuleName(); + } + } + } + } + } + } + return true; + } + return false; + } + function tryConsumeExport() { + var token = scanner.getToken(); + if (token === 82 /* ExportKeyword */) { + token = scanner.scan(); + if (token === 15 /* OpenBraceToken */) { + token = scanner.scan(); + // consume "{ a as B, c, d as D}" clauses + // make sure it stops on EOF + while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) { + token = scanner.scan(); + } + if (token === 16 /* CloseBraceToken */) { token = scanner.scan(); if (token === 133 /* FromKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // export * from "mod" + // export {a as A} from "mod"; + // export {a, b as B} from "mod" recordModuleName(); } } } - else if (token === 89 /* ImportKeyword */) { + } + else if (token === 37 /* AsteriskToken */) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { token = scanner.scan(); - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 56 /* EqualsToken */) { - token = scanner.scan(); - if (token === 127 /* RequireKeyword */) { - token = scanner.scan(); - if (token === 17 /* OpenParenToken */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // export import i = require("mod"); - recordModuleName(); - } - } - } + if (token === 9 /* StringLiteral */) { + // export * from "mod" + recordModuleName(); + } + } + } + else if (token === 89 /* ImportKeyword */) { + token = scanner.scan(); + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 56 /* EqualsToken */) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + return true; } } } } + return true; + } + return false; + } + function tryConsumeRequireCall(skipCurrentToken) { + var token = skipCurrentToken ? scanner.scan() : scanner.getToken(); + if (token === 127 /* RequireKeyword */) { + token = scanner.scan(); + if (token === 17 /* OpenParenToken */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // require("mod"); + recordModuleName(); + } + } + return true; + } + return false; + } + function tryConsumeDefine() { + var token = scanner.getToken(); + if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") { + token = scanner.scan(); + if (token !== 17 /* OpenParenToken */) { + return true; + } token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // looks like define ("modname", ... - skip string literal and comma + token = scanner.scan(); + if (token === 24 /* CommaToken */) { + token = scanner.scan(); + } + else { + // unexpected token + return true; + } + } + // should be start of dependency list + if (token !== 19 /* OpenBracketToken */) { + return true; + } + // skip open bracket + token = scanner.scan(); + var i = 0; + // scan until ']' or EOF + while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) { + // record string literals as module names + if (token === 9 /* StringLiteral */) { + recordModuleName(); + i++; + } + token = scanner.scan(); + } + return true; + } + return false; + } + function processImports() { + scanner.setText(sourceText); + scanner.scan(); + // Look for: + // import "mod"; + // import d from "mod" + // import {a as A } from "mod"; + // import * as NS from "mod" + // import d, {a, b as B} from "mod" + // import i = require("mod"); + // + // export * from "mod" + // export {a as b} from "mod" + // export import i = require("mod") + // (for JavaScript files) require("mod") + while (true) { + if (scanner.getToken() === 1 /* EndOfFileToken */) { + break; + } + // check if at least one of alternative have moved scanner forward + if (tryConsumeDeclare() || + tryConsumeImport() || + tryConsumeExport() || + (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { + continue; + } + else { + scanner.scan(); + } } scanner.setText(undefined); } if (readImportFiles) { - processImport(); + processImports(); } processTripleSlashDirectives(); return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules }; @@ -45547,7 +46127,7 @@ var ts; // For JavaScript files, we don't want to report the normal typescript semantic errors. // Instead, we just report errors for using TypeScript-only constructs from within a // JavaScript file. - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(targetSourceFile)) { return getJavaScriptSemanticDiagnostics(targetSourceFile); } // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. @@ -45759,7 +46339,7 @@ var ts; var typeChecker = program.getTypeChecker(); var syntacticStart = new Date().getTime(); var sourceFile = getValidSourceFile(fileName); - var isJavaScriptFile = ts.isJavaScript(fileName); + var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile); var isJsDocTagName = false; var start = new Date().getTime(); var currentToken = ts.getTokenAtPosition(sourceFile, position); @@ -46393,8 +46973,8 @@ var ts; if (element.getStart() <= position && position <= element.getEnd()) { continue; } - var name_33 = element.propertyName || element.name; - exisingImportsOrExports[name_33.text] = true; + var name_35 = element.propertyName || element.name; + exisingImportsOrExports[name_35.text] = true; } if (ts.isEmpty(exisingImportsOrExports)) { return exportsOfModule; @@ -46426,7 +47006,10 @@ var ts; } var existingName = void 0; if (m.kind === 163 /* BindingElement */ && m.propertyName) { - existingName = m.propertyName.text; + // include only identifiers in completion list + if (m.propertyName.kind === 69 /* Identifier */) { + existingName = m.propertyName.text; + } } else { // TODO(jfreeman): Account for computed property name @@ -46466,46 +47049,43 @@ var ts; return undefined; } var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName; - var entries; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - if (isRightOfDot && ts.isJavaScript(fileName)) { - entries = getCompletionEntriesFromSymbols(symbols); - ts.addRange(entries, getJavaScriptCompletionEntries()); + var sourceFile = getValidSourceFile(fileName); + var entries = []; + if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) { + var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); + ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames)); } else { if (!symbols || symbols.length === 0) { return undefined; } - entries = getCompletionEntriesFromSymbols(symbols); + getCompletionEntriesFromSymbols(symbols, entries); } // Add keywords if this is not a member completion list if (!isMemberCompletion && !isJsDocTagName) { ts.addRange(entries, keywordCompletions); } return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries }; - function getJavaScriptCompletionEntries() { + function getJavaScriptCompletionEntries(sourceFile, uniqueNames) { var entries = []; - var allNames = {}; var target = program.getCompilerOptions().target; - for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) { - var sourceFile = _a[_i]; - var nameTable = getNameTable(sourceFile); - for (var name_34 in nameTable) { - if (!allNames[name_34]) { - allNames[name_34] = name_34; - var displayName = getCompletionEntryDisplayName(name_34, target, /*performCharacterChecks:*/ true); - if (displayName) { - var entry = { - name: displayName, - kind: ScriptElementKind.warning, - kindModifiers: "", - sortText: "1" - }; - entries.push(entry); - } + var nameTable = getNameTable(sourceFile); + for (var name_36 in nameTable) { + if (!uniqueNames[name_36]) { + uniqueNames[name_36] = name_36; + var displayName = getCompletionEntryDisplayName(name_36, target, /*performCharacterChecks:*/ true); + if (displayName) { + var entry = { + name: displayName, + kind: ScriptElementKind.warning, + kindModifiers: "", + sortText: "1" + }; + entries.push(entry); } } } @@ -46543,25 +47123,24 @@ var ts; sortText: "0" }; } - function getCompletionEntriesFromSymbols(symbols) { + function getCompletionEntriesFromSymbols(symbols, entries) { var start = new Date().getTime(); - var entries = []; + var uniqueNames = {}; if (symbols) { - var nameToSymbol = {}; for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) { var symbol = symbols_3[_i]; var entry = createCompletionEntry(symbol, location); if (entry) { var id = ts.escapeIdentifier(entry.name); - if (!ts.lookUp(nameToSymbol, id)) { + if (!ts.lookUp(uniqueNames, id)) { entries.push(entry); - nameToSymbol[id] = symbol; + uniqueNames[id] = id; } } } } log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start)); - return entries; + return uniqueNames; } } function getCompletionEntryDetails(fileName, position, entryName) { @@ -46762,16 +47341,16 @@ var ts; case ScriptElementKind.parameterElement: case ScriptElementKind.localVariableElement: // If it is call or construct signature of lambda's write type name - displayParts.push(ts.punctuationPart(54 /* ColonToken */)); + displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken)); displayParts.push(ts.spacePart()); if (useConstructSignatures) { - displayParts.push(ts.keywordPart(92 /* NewKeyword */)); + displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword)); displayParts.push(ts.spacePart()); } - if (!(type.flags & 65536 /* Anonymous */)) { - ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */)); + if (!(type.flags & ts.TypeFlags.Anonymous)) { + ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments)); } - addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */); + addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature); break; default: // Just signature @@ -48396,19 +48975,19 @@ var ts; if (isNameOfPropertyAssignment(node)) { var objectLiteral = node.parent.parent; var contextualType = typeChecker.getContextualType(objectLiteral); - var name_35 = node.text; + var name_37 = node.text; if (contextualType) { if (contextualType.flags & 16384 /* Union */) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - var unionProperty = contextualType.getProperty(name_35); + var unionProperty = contextualType.getProperty(name_37); if (unionProperty) { return [unionProperty]; } else { var result_4 = []; ts.forEach(contextualType.types, function (t) { - var symbol = t.getProperty(name_35); + var symbol = t.getProperty(name_37); if (symbol) { result_4.push(symbol); } @@ -48417,7 +48996,7 @@ var ts; } } else { - var symbol_1 = contextualType.getProperty(name_35); + var symbol_1 = contextualType.getProperty(name_37); if (symbol_1) { return [symbol_1]; } @@ -48828,6 +49407,9 @@ var ts; case 16 /* typeAliasName */: return ClassificationTypeNames.typeAliasName; case 17 /* parameterName */: return ClassificationTypeNames.parameterName; case 18 /* docCommentTagName */: return ClassificationTypeNames.docCommentTagName; + case 19 /* jsxOpenTagName */: return ClassificationTypeNames.jsxOpenTagName; + case 20 /* jsxCloseTagName */: return ClassificationTypeNames.jsxCloseTagName; + case 21 /* jsxSelfClosingTagName */: return ClassificationTypeNames.jsxSelfClosingTagName; } } function convertClassifications(classifications) { @@ -49097,6 +49679,21 @@ var ts; return 17 /* parameterName */; } return; + case 235 /* JsxOpeningElement */: + if (token.parent.tagName === token) { + return 19 /* jsxOpenTagName */; + } + return; + case 237 /* JsxClosingElement */: + if (token.parent.tagName === token) { + return 20 /* jsxCloseTagName */; + } + return; + case 234 /* JsxSelfClosingElement */: + if (token.parent.tagName === token) { + return 21 /* jsxSelfClosingTagName */; + } + return; } } return 2 /* identifier */; @@ -50021,18 +50618,8 @@ var ts; ts.getDefaultLibFilePath = getDefaultLibFilePath; function initializeServices() { ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0 /* None */; - this.parent = undefined; - } - var proto = kind === 248 /* SourceFile */ ? new SourceFileObject() : new NodeObject(); - proto.kind = kind; - Node.prototype = proto; - return Node; - }, + getNodeConstructor: function () { return NodeObject; }, + getSourceFileConstructor: function () { return SourceFileObject; }, getSymbolConstructor: function () { return SymbolObject; }, getTypeConstructor: function () { return TypeObject; }, getSignatureConstructor: function () { return SignatureObject; } @@ -51102,7 +51689,8 @@ var ts; }; CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) { return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () { - var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength())); + // for now treat files as JavaScript + var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true); var convertResult = { referencedFiles: [], importedFiles: [], @@ -51166,7 +51754,7 @@ var ts; TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) { try { if (this.documentRegistry === undefined) { - this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames()); + this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); } var hostAdapter = new LanguageServiceShimHostAdapter(host); var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry); @@ -51199,7 +51787,7 @@ var ts; TypeScriptServicesFactory.prototype.close = function () { // Forget all the registered shims this._shims = []; - this.documentRegistry = ts.createDocumentRegistry(); + this.documentRegistry = undefined; }; TypeScriptServicesFactory.prototype.registerShim = function (shim) { this._shims.push(shim); diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts index d2758e6d5e9a7..af9a8bffe3574 100644 --- a/lib/typescriptServices.d.ts +++ b/lib/typescriptServices.d.ts @@ -387,6 +387,7 @@ declare namespace ts { right: Identifier; } type EntityName = Identifier | QualifiedName; + type PropertyName = Identifier | LiteralExpression | ComputedPropertyName; type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern; interface Declaration extends Node { _declarationBrand: any; @@ -425,7 +426,7 @@ declare namespace ts { initializer?: Expression; } interface BindingElement extends Declaration { - propertyName?: Identifier; + propertyName?: PropertyName; dotDotDotToken?: Node; name: Identifier | BindingPattern; initializer?: Expression; @@ -452,7 +453,7 @@ declare namespace ts { objectAssignmentInitializer?: Expression; } interface VariableLikeDeclaration extends Declaration { - propertyName?: Identifier; + propertyName?: PropertyName; dotDotDotToken?: Node; name: DeclarationName; questionToken?: Node; @@ -581,7 +582,7 @@ declare namespace ts { asteriskToken?: Node; expression?: Expression; } - interface BinaryExpression extends Expression { + interface BinaryExpression extends Expression, Declaration { left: Expression; operatorToken: Node; right: Expression; @@ -625,7 +626,7 @@ declare namespace ts { interface ObjectLiteralExpression extends PrimaryExpression, Declaration { properties: NodeArray; } - interface PropertyAccessExpression extends MemberExpression { + interface PropertyAccessExpression extends MemberExpression, Declaration { expression: LeftHandSideExpression; dotToken: Node; name: Identifier; @@ -1220,6 +1221,7 @@ declare namespace ts { ObjectLiteral = 524288, ESSymbol = 16777216, ThisType = 33554432, + ObjectLiteralPatternWithComputedProperties = 67108864, StringLike = 258, NumberLike = 132, ObjectType = 80896, @@ -1537,7 +1539,6 @@ declare namespace ts { function getTypeParameterOwner(d: Declaration): Declaration; } declare namespace ts { - function getNodeConstructor(kind: SyntaxKind): new (pos?: number, end?: number) => Node; function createNode(kind: SyntaxKind, pos?: number, end?: number): Node; function forEachChild(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T; function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile; @@ -2126,6 +2127,9 @@ declare namespace ts { static typeAliasName: string; static parameterName: string; static docCommentTagName: string; + static jsxOpenTagName: string; + static jsxCloseTagName: string; + static jsxSelfClosingTagName: string; } enum ClassificationType { comment = 1, @@ -2146,6 +2150,9 @@ declare namespace ts { typeAliasName = 16, parameterName = 17, docCommentTagName = 18, + jsxOpenTagName = 19, + jsxCloseTagName = 20, + jsxSelfClosingTagName = 21, } interface DisplayPartsSymbolWriter extends SymbolWriter { displayParts(): SymbolDisplayPart[]; @@ -2171,7 +2178,7 @@ declare namespace ts { function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile; function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string; function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry; - function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo; + function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo; function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService; function createClassifier(): Classifier; /** diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 8b0ef04f96e45..498ddc3786075 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -622,6 +622,7 @@ var ts; TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType"; TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol"; TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType"; + TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties"; /* @internal */ TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic"; /* @internal */ @@ -1530,12 +1531,7 @@ var ts; * List of supported extensions in order of file resolution precedence. */ ts.supportedExtensions = [".ts", ".tsx", ".d.ts"]; - /** - * List of extensions that will be used to look for external modules. - * This list is kept separate from supportedExtensions to for cases when we'll allow to include .js files in compilation, - * but still would like to load only TypeScript files as modules - */ - ts.moduleFileExtensions = ts.supportedExtensions; + ts.supportedJsExtensions = ts.supportedExtensions.concat(".js", ".jsx"); function isSupportedSourceFileName(fileName) { if (!fileName) { return false; @@ -1586,17 +1582,16 @@ var ts; } function Signature(checker) { } + function Node(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0 /* None */; + this.parent = undefined; + } ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0 /* None */; - this.parent = undefined; - } - Node.prototype = { kind: kind }; - return Node; - }, + getNodeConstructor: function () { return Node; }, + getSourceFileConstructor: function () { return Node; }, getSymbolConstructor: function () { return Symbol; }, getTypeConstructor: function () { return Type; }, getSignatureConstructor: function () { return Signature; } @@ -1913,7 +1908,16 @@ var ts; if (writeByteOrderMark) { data = "\uFEFF" + data; } - _fs.writeFileSync(fileName, data, "utf8"); + var fd; + try { + fd = _fs.openSync(fileName, "w"); + _fs.writeSync(fd, data, undefined, "utf8"); + } + finally { + if (fd !== undefined) { + _fs.closeSync(fd); + } + } } function getCanonicalPath(path) { return useCaseSensitiveFileNames ? path.toLowerCase() : path; @@ -2614,6 +2618,7 @@ var ts; Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." }, Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" }, Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." }, + Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." }, Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." }, Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." }, Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." }, @@ -3173,7 +3178,7 @@ var ts; function getCommentRanges(text, pos, trailing) { var result; var collecting = trailing || pos === 0; - while (true) { + while (pos < text.length) { var ch = text.charCodeAt(pos); switch (ch) { case 13 /* carriageReturn */: @@ -3242,6 +3247,7 @@ var ts; } return result; } + return result; } function getLeadingCommentRanges(text, pos) { return getCommentRanges(text, pos, /*trailing*/ false); @@ -3343,7 +3349,7 @@ var ts; error(ts.Diagnostics.Digit_expected); } } - return +(text.substring(start, end)); + return "" + +(text.substring(start, end)); } function scanOctalDigits() { var start = pos; @@ -3770,7 +3776,7 @@ var ts; return pos++, token = 36 /* MinusToken */; case 46 /* dot */: if (isDigit(text.charCodeAt(pos + 1))) { - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8 /* NumericLiteral */; } if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) { @@ -3873,7 +3879,7 @@ var ts; case 55 /* _7 */: case 56 /* _8 */: case 57 /* _9 */: - tokenValue = "" + scanNumber(); + tokenValue = scanNumber(); return token = 8 /* NumericLiteral */; case 58 /* colon */: return pos++, token = 54 /* ColonToken */; @@ -4177,1558 +4183,243 @@ var ts; } ts.createScanner = createScanner; })(ts || (ts = {})); -/// +/// /* @internal */ var ts; (function (ts) { - ts.bindTime = 0; - (function (ModuleInstanceState) { - ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated"; - ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated"; - ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly"; - })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {})); - var ModuleInstanceState = ts.ModuleInstanceState; - var Reachability; - (function (Reachability) { - Reachability[Reachability["Unintialized"] = 1] = "Unintialized"; - Reachability[Reachability["Reachable"] = 2] = "Reachable"; - Reachability[Reachability["Unreachable"] = 4] = "Unreachable"; - Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable"; - })(Reachability || (Reachability = {})); - function or(state1, state2) { - return (state1 | state2) & 2 /* Reachable */ - ? 2 /* Reachable */ - : (state1 & state2) & 8 /* ReportedUnreachable */ - ? 8 /* ReportedUnreachable */ - : 4 /* Unreachable */; - } - function getModuleInstanceState(node) { - // A module is uninstantiated if it contains only - // 1. interface declarations, type alias declarations - if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) { - return 0 /* NonInstantiated */; + function getDeclarationOfKind(symbol, kind) { + var declarations = symbol.declarations; + if (declarations) { + for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { + var declaration = declarations_1[_i]; + if (declaration.kind === kind) { + return declaration; + } + } } - else if (ts.isConstEnumDeclaration(node)) { - return 2 /* ConstEnumOnly */; + return undefined; + } + ts.getDeclarationOfKind = getDeclarationOfKind; + // Pool writers to avoid needing to allocate them for every symbol we write. + var stringWriters = []; + function getSingleLineStringWriter() { + if (stringWriters.length === 0) { + var str = ""; + var writeText = function (text) { return str += text; }; + return { + string: function () { return str; }, + writeKeyword: writeText, + writeOperator: writeText, + writePunctuation: writeText, + writeSpace: writeText, + writeStringLiteral: writeText, + writeParameter: writeText, + writeSymbol: writeText, + // Completely ignore indentation for string writers. And map newlines to + // a single space. + writeLine: function () { return str += " "; }, + increaseIndent: function () { }, + decreaseIndent: function () { }, + clear: function () { return str = ""; }, + trackSymbol: function () { }, + reportInaccessibleThisError: function () { } + }; } - else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) { - return 0 /* NonInstantiated */; + return stringWriters.pop(); + } + ts.getSingleLineStringWriter = getSingleLineStringWriter; + function releaseStringWriter(writer) { + writer.clear(); + stringWriters.push(writer); + } + ts.releaseStringWriter = releaseStringWriter; + function getFullWidth(node) { + return node.end - node.pos; + } + ts.getFullWidth = getFullWidth; + function arrayIsEqualTo(array1, array2, equaler) { + if (!array1 || !array2) { + return array1 === array2; } - else if (node.kind === 219 /* ModuleBlock */) { - var state = 0 /* NonInstantiated */; - ts.forEachChild(node, function (n) { - switch (getModuleInstanceState(n)) { - case 0 /* NonInstantiated */: - // child is non-instantiated - continue searching - return false; - case 2 /* ConstEnumOnly */: - // child is const enum only - record state and continue searching - state = 2 /* ConstEnumOnly */; - return false; - case 1 /* Instantiated */: - // child is instantiated - record state and stop - state = 1 /* Instantiated */; - return true; - } - }); - return state; + if (array1.length !== array2.length) { + return false; } - else if (node.kind === 218 /* ModuleDeclaration */) { - return getModuleInstanceState(node.body); + for (var i = 0; i < array1.length; ++i) { + var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; + if (!equals) { + return false; + } } - else { - return 1 /* Instantiated */; + return true; + } + ts.arrayIsEqualTo = arrayIsEqualTo; + function hasResolvedModule(sourceFile, moduleNameText) { + return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); + } + ts.hasResolvedModule = hasResolvedModule; + function getResolvedModule(sourceFile, moduleNameText) { + return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; + } + ts.getResolvedModule = getResolvedModule; + function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { + if (!sourceFile.resolvedModules) { + sourceFile.resolvedModules = {}; } + sourceFile.resolvedModules[moduleNameText] = resolvedModule; } - ts.getModuleInstanceState = getModuleInstanceState; - var ContainerFlags; - (function (ContainerFlags) { - // The current node is not a container, and no container manipulation should happen before - // recursing into it. - ContainerFlags[ContainerFlags["None"] = 0] = "None"; - // The current node is a container. It should be set as the current container (and block- - // container) before recursing into it. The current node does not have locals. Examples: - // - // Classes, ObjectLiterals, TypeLiterals, Interfaces... - ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer"; - // The current node is a block-scoped-container. It should be set as the current block- - // container before recursing into it. Examples: - // - // Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements... - ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer"; - ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals"; - // If the current node is a container that also container that also contains locals. Examples: - // - // Functions, Methods, Modules, Source-files. - ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals"; - })(ContainerFlags || (ContainerFlags = {})); - var binder = createBinder(); - function bindSourceFile(file, options) { - var start = new Date().getTime(); - binder(file, options); - ts.bindTime += new Date().getTime() - start; + ts.setResolvedModule = setResolvedModule; + // Returns true if this node contains a parse error anywhere underneath it. + function containsParseError(node) { + aggregateChildData(node); + return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0; } - ts.bindSourceFile = bindSourceFile; - function createBinder() { - var file; - var options; - var parent; - var container; - var blockScopeContainer; - var lastContainer; - var seenThisKeyword; - // state used by reachability checks - var hasExplicitReturn; - var currentReachabilityState; - var labelStack; - var labelIndexMap; - var implicitLabels; - // If this file is an external module, then it is automatically in strict-mode according to - // ES6. If it is not an external module, then we'll determine if it is in strict mode or - // not depending on if we see "use strict" in certain places (or if we hit a class/namespace). - var inStrictMode; - var symbolCount = 0; - var Symbol; - var classifiableNames; - function bindSourceFile(f, opts) { - file = f; - options = opts; - inStrictMode = !!file.externalModuleIndicator; - classifiableNames = {}; - Symbol = ts.objectAllocator.getSymbolConstructor(); - if (!file.locals) { - bind(file); - file.symbolCount = symbolCount; - file.classifiableNames = classifiableNames; + ts.containsParseError = containsParseError; + function aggregateChildData(node) { + if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) { + // A node is considered to contain a parse error if: + // a) the parser explicitly marked that it had an error + // b) any of it's children reported that it had an error. + var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) || + ts.forEachChild(node, containsParseError); + // If so, mark ourselves accordingly. + if (thisNodeOrAnySubNodesHasError) { + node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */; } - parent = undefined; - container = undefined; - blockScopeContainer = undefined; - lastContainer = undefined; - seenThisKeyword = false; - hasExplicitReturn = false; - labelStack = undefined; - labelIndexMap = undefined; - implicitLabels = undefined; + // Also mark that we've propogated the child information to this node. This way we can + // always consult the bit directly on this node without needing to check its children + // again. + node.parserContextFlags |= 128 /* HasAggregatedChildData */; } - return bindSourceFile; - function createSymbol(flags, name) { - symbolCount++; - return new Symbol(flags, name); + } + function getSourceFileOfNode(node) { + while (node && node.kind !== 248 /* SourceFile */) { + node = node.parent; } - function addDeclarationToSymbol(symbol, node, symbolFlags) { - symbol.flags |= symbolFlags; - node.symbol = symbol; - if (!symbol.declarations) { - symbol.declarations = []; - } - symbol.declarations.push(node); - if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) { - symbol.exports = {}; - } - if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) { - symbol.members = {}; - } - if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) { - symbol.valueDeclaration = node; - } + return node; + } + ts.getSourceFileOfNode = getSourceFileOfNode; + function getStartPositionOfLine(line, sourceFile) { + ts.Debug.assert(line >= 0); + return ts.getLineStarts(sourceFile)[line]; + } + ts.getStartPositionOfLine = getStartPositionOfLine; + // This is a useful function for debugging purposes. + function nodePosToString(node) { + var file = getSourceFileOfNode(node); + var loc = ts.getLineAndCharacterOfPosition(file, node.pos); + return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; + } + ts.nodePosToString = nodePosToString; + function getStartPosOfNode(node) { + return node.pos; + } + ts.getStartPosOfNode = getStartPosOfNode; + // Returns true if this node is missing from the actual source code. A 'missing' node is different + // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes + // in the tree), it is definitely missing. However, a node may be defined, but still be + // missing. This happens whenever the parser knows it needs to parse something, but can't + // get anything in the source code that it expects at that location. For example: + // + // let a: ; + // + // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source + // code). So the parser will attempt to parse out a type, and will create an actual node. + // However, this node will be 'missing' in the sense that no actual source-code/tokens are + // contained within it. + function nodeIsMissing(node) { + if (!node) { + return true; } - // Should not be called on a declaration with a computed property name, - // unless it is a well known Symbol. - function getDeclarationName(node) { - if (node.name) { - if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) { - return "\"" + node.name.text + "\""; - } - if (node.name.kind === 136 /* ComputedPropertyName */) { - var nameExpression = node.name.expression; - ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression)); - return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text); - } - return node.name.text; - } - switch (node.kind) { - case 144 /* Constructor */: - return "__constructor"; - case 152 /* FunctionType */: - case 147 /* CallSignature */: - return "__call"; - case 153 /* ConstructorType */: - case 148 /* ConstructSignature */: - return "__new"; - case 149 /* IndexSignature */: - return "__index"; - case 228 /* ExportDeclaration */: - return "__export"; - case 227 /* ExportAssignment */: - return node.isExportEquals ? "export=" : "default"; - case 213 /* FunctionDeclaration */: - case 214 /* ClassDeclaration */: - return node.flags & 512 /* Default */ ? "default" : undefined; - } + return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */; + } + ts.nodeIsMissing = nodeIsMissing; + function nodeIsPresent(node) { + return !nodeIsMissing(node); + } + ts.nodeIsPresent = nodeIsPresent; + function getTokenPosOfNode(node, sourceFile) { + // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't* + // want to skip trivia because this will launch us forward to the next token. + if (nodeIsMissing(node)) { + return node.pos; } - function getDisplayName(node) { - return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node); + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); + } + ts.getTokenPosOfNode = getTokenPosOfNode; + function getNonDecoratorTokenPosOfNode(node, sourceFile) { + if (nodeIsMissing(node) || !node.decorators) { + return getTokenPosOfNode(node, sourceFile); } - /** - * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names. - * @param symbolTable - The symbol table which node will be added to. - * @param parent - node's parent declaration. - * @param node - The declaration to be added to the symbol table - * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.) - * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations. - */ - function declareSymbol(symbolTable, parent, node, includes, excludes) { - ts.Debug.assert(!ts.hasDynamicName(node)); - var isDefaultExport = node.flags & 512 /* Default */; - // The exported symbol for an export default function/class node is always named "default" - var name = isDefaultExport && parent ? "default" : getDeclarationName(node); - var symbol; - if (name !== undefined) { - // Check and see if the symbol table already has a symbol with this name. If not, - // create a new symbol with this name and add it to the table. Note that we don't - // give the new symbol any flags *yet*. This ensures that it will not conflict - // with the 'excludes' flags we pass in. - // - // If we do get an existing symbol, see if it conflicts with the new symbol we're - // creating. For example, a 'var' symbol and a 'class' symbol will conflict within - // the same symbol table. If we have a conflict, report the issue on each - // declaration we have for this symbol, and then create a new symbol for this - // declaration. - // - // If we created a new symbol, either because we didn't have a symbol with this name - // in the symbol table, or we conflicted with an existing symbol, then just add this - // node as the sole declaration of the new symbol. - // - // Otherwise, we'll be merging into a compatible existing symbol (for example when - // you have multiple 'vars' with the same name in the same container). In this case - // just add this node into the declarations list of the symbol. - symbol = ts.hasProperty(symbolTable, name) - ? symbolTable[name] - : (symbolTable[name] = createSymbol(0 /* None */, name)); - if (name && (includes & 788448 /* Classifiable */)) { - classifiableNames[name] = name; - } - if (symbol.flags & excludes) { - if (node.name) { - node.name.parent = node; - } - // Report errors every position with duplicate declaration - // Report errors on previous encountered declarations - var message = symbol.flags & 2 /* BlockScopedVariable */ - ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 - : ts.Diagnostics.Duplicate_identifier_0; - ts.forEach(symbol.declarations, function (declaration) { - if (declaration.flags & 512 /* Default */) { - message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports; - } - }); - ts.forEach(symbol.declarations, function (declaration) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration))); - }); - file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node))); - symbol = createSymbol(0 /* None */, name); - } - } - else { - symbol = createSymbol(0 /* None */, "__missing"); - } - addDeclarationToSymbol(symbol, node, includes); - symbol.parent = parent; - return symbol; + return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); + } + ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; + function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + if (nodeIsMissing(node)) { + return ""; } - function declareModuleMember(node, symbolFlags, symbolExcludes) { - var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */; - if (symbolFlags & 8388608 /* Alias */) { - if (node.kind === 230 /* ExportSpecifier */ || (node.kind === 221 /* ImportEqualsDeclaration */ && hasExportModifier)) { - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } + var text = sourceFile.text; + return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); + } + ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; + function getTextOfNodeFromSourceText(sourceText, node) { + if (nodeIsMissing(node)) { + return ""; + } + return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); + } + ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; + function getTextOfNode(node, includeTrivia) { + if (includeTrivia === void 0) { includeTrivia = false; } + return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); + } + ts.getTextOfNode = getTextOfNode; + // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' + function escapeIdentifier(identifier) { + return identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier; + } + ts.escapeIdentifier = escapeIdentifier; + // Remove extra underscore from escaped identifier + function unescapeIdentifier(identifier) { + return identifier.length >= 3 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ && identifier.charCodeAt(2) === 95 /* _ */ ? identifier.substr(1) : identifier; + } + ts.unescapeIdentifier = unescapeIdentifier; + // Make an identifier from an external module name by extracting the string after the last "/" and replacing + // all non-alphanumeric characters with underscores + function makeIdentifierFromModuleName(moduleName) { + return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); + } + ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; + function isBlockOrCatchScoped(declaration) { + return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 || + isCatchClauseVariableDeclaration(declaration); + } + ts.isBlockOrCatchScoped = isBlockOrCatchScoped; + // Gets the nearest enclosing block scope container that has the provided node + // as a descendant, that is not the provided node. + function getEnclosingBlockScopeContainer(node) { + var current = node.parent; + while (current) { + if (isFunctionLike(current)) { + return current; } - else { - // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue, - // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set - // on it. There are 2 main reasons: - // - // 1. We treat locals and exports of the same name as mutually exclusive within a container. - // That means the binder will issue a Duplicate Identifier error if you mix locals and exports - // with the same name in the same container. - // TODO: Make this a more specific error and decouple it from the exclusion logic. - // 2. When we checkIdentifier in the checker, we set its resolved symbol to the local symbol, - // but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way - // when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope. - if (hasExportModifier || container.flags & 131072 /* ExportContext */) { - var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) | - (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) | - (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0); - var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes); - local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - node.localSymbol = local; - return local; - } - else { - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } + switch (current.kind) { + case 248 /* SourceFile */: + case 220 /* CaseBlock */: + case 244 /* CatchClause */: + case 218 /* ModuleDeclaration */: + case 199 /* ForStatement */: + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + return current; + case 192 /* Block */: + // function block is not considered block-scope container + // see comment in binder.ts: bind(...), case for SyntaxKind.Block + if (!isFunctionLike(current.parent)) { + return current; + } } - } - // All container nodes are kept on a linked list in declaration order. This list is used by - // the getLocalNameOfContainer function in the type checker to validate that the local name - // used for a container is unique. - function bindChildren(node) { - // Before we recurse into a node's chilren, we first save the existing parent, container - // and block-container. Then after we pop out of processing the children, we restore - // these saved values. - var saveParent = parent; - var saveContainer = container; - var savedBlockScopeContainer = blockScopeContainer; - // This node will now be set as the parent of all of its children as we recurse into them. - parent = node; - // Depending on what kind of node this is, we may have to adjust the current container - // and block-container. If the current node is a container, then it is automatically - // considered the current block-container as well. Also, for containers that we know - // may contain locals, we proactively initialize the .locals field. We do this because - // it's highly likely that the .locals will be needed to place some child in (for example, - // a parameter, or variable declaration). - // - // However, we do not proactively create the .locals for block-containers because it's - // totally normal and common for block-containers to never actually have a block-scoped - // variable in them. We don't want to end up allocating an object for every 'block' we - // run into when most of them won't be necessary. - // - // Finally, if this is a block-container, then we clear out any existing .locals object - // it may contain within it. This happens in incremental scenarios. Because we can be - // reusing a node from a previous compilation, that node may have had 'locals' created - // for it. We must clear this so we don't accidently move any stale data forward from - // a previous compilation. - var containerFlags = getContainerFlags(node); - if (containerFlags & 1 /* IsContainer */) { - container = blockScopeContainer = node; - if (containerFlags & 4 /* HasLocals */) { - container.locals = {}; - } - addToContainerChain(container); - } - else if (containerFlags & 2 /* IsBlockScopedContainer */) { - blockScopeContainer = node; - blockScopeContainer.locals = undefined; - } - var savedReachabilityState; - var savedLabelStack; - var savedLabels; - var savedImplicitLabels; - var savedHasExplicitReturn; - var kind = node.kind; - var flags = node.flags; - // reset all reachability check related flags on node (for incremental scenarios) - flags &= ~1572864 /* ReachabilityCheckFlags */; - if (kind === 215 /* InterfaceDeclaration */) { - seenThisKeyword = false; - } - var saveState = kind === 248 /* SourceFile */ || kind === 219 /* ModuleBlock */ || ts.isFunctionLikeKind(kind); - if (saveState) { - savedReachabilityState = currentReachabilityState; - savedLabelStack = labelStack; - savedLabels = labelIndexMap; - savedImplicitLabels = implicitLabels; - savedHasExplicitReturn = hasExplicitReturn; - currentReachabilityState = 2 /* Reachable */; - hasExplicitReturn = false; - labelStack = labelIndexMap = implicitLabels = undefined; - } - bindReachableStatement(node); - if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) { - flags |= 524288 /* HasImplicitReturn */; - if (hasExplicitReturn) { - flags |= 1048576 /* HasExplicitReturn */; - } - } - if (kind === 215 /* InterfaceDeclaration */) { - flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */; - } - node.flags = flags; - if (saveState) { - hasExplicitReturn = savedHasExplicitReturn; - currentReachabilityState = savedReachabilityState; - labelStack = savedLabelStack; - labelIndexMap = savedLabels; - implicitLabels = savedImplicitLabels; - } - container = saveContainer; - parent = saveParent; - blockScopeContainer = savedBlockScopeContainer; - } - /** - * Returns true if node and its subnodes were successfully traversed. - * Returning false means that node was not examined and caller needs to dive into the node himself. - */ - function bindReachableStatement(node) { - if (checkUnreachable(node)) { - ts.forEachChild(node, bind); - return; - } - switch (node.kind) { - case 198 /* WhileStatement */: - bindWhileStatement(node); - break; - case 197 /* DoStatement */: - bindDoStatement(node); - break; - case 199 /* ForStatement */: - bindForStatement(node); - break; - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - bindForInOrForOfStatement(node); - break; - case 196 /* IfStatement */: - bindIfStatement(node); - break; - case 204 /* ReturnStatement */: - case 208 /* ThrowStatement */: - bindReturnOrThrow(node); - break; - case 203 /* BreakStatement */: - case 202 /* ContinueStatement */: - bindBreakOrContinueStatement(node); - break; - case 209 /* TryStatement */: - bindTryStatement(node); - break; - case 206 /* SwitchStatement */: - bindSwitchStatement(node); - break; - case 220 /* CaseBlock */: - bindCaseBlock(node); - break; - case 207 /* LabeledStatement */: - bindLabeledStatement(node); - break; - default: - ts.forEachChild(node, bind); - break; - } - } - function bindWhileStatement(n) { - var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - // bind expressions (don't affect reachability) - bind(n.expression); - currentReachabilityState = preWhileState; - var postWhileLabel = pushImplicitLabel(); - bind(n.statement); - popImplicitLabel(postWhileLabel, postWhileState); - } - function bindDoStatement(n) { - var preDoState = currentReachabilityState; - var postDoLabel = pushImplicitLabel(); - bind(n.statement); - var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState; - popImplicitLabel(postDoLabel, postDoState); - // bind expressions (don't affect reachability) - bind(n.expression); - } - function bindForStatement(n) { - var preForState = currentReachabilityState; - var postForLabel = pushImplicitLabel(); - // bind expressions (don't affect reachability) - bind(n.initializer); - bind(n.condition); - bind(n.incrementor); - bind(n.statement); - // for statement is considered infinite when it condition is either omitted or is true keyword - // - for(..;;..) - // - for(..;true;..) - var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */); - var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState; - popImplicitLabel(postForLabel, postForState); - } - function bindForInOrForOfStatement(n) { - var preStatementState = currentReachabilityState; - var postStatementLabel = pushImplicitLabel(); - // bind expressions (don't affect reachability) - bind(n.initializer); - bind(n.expression); - bind(n.statement); - popImplicitLabel(postStatementLabel, preStatementState); - } - function bindIfStatement(n) { - // denotes reachability state when entering 'thenStatement' part of the if statement: - // i.e. if condition is false then thenStatement is unreachable - var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - // denotes reachability state when entering 'elseStatement': - // i.e. if condition is true then elseStatement is unreachable - var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; - currentReachabilityState = ifTrueState; - // bind expression (don't affect reachability) - bind(n.expression); - bind(n.thenStatement); - if (n.elseStatement) { - var preElseState = currentReachabilityState; - currentReachabilityState = ifFalseState; - bind(n.elseStatement); - currentReachabilityState = or(currentReachabilityState, preElseState); - } - else { - currentReachabilityState = or(currentReachabilityState, ifFalseState); - } - } - function bindReturnOrThrow(n) { - // bind expression (don't affect reachability) - bind(n.expression); - if (n.kind === 204 /* ReturnStatement */) { - hasExplicitReturn = true; - } - currentReachabilityState = 4 /* Unreachable */; - } - function bindBreakOrContinueStatement(n) { - // call bind on label (don't affect reachability) - bind(n.label); - // for continue case touch label so it will be marked a used - var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */); - if (isValidJump) { - currentReachabilityState = 4 /* Unreachable */; - } - } - function bindTryStatement(n) { - // catch\finally blocks has the same reachability as try block - var preTryState = currentReachabilityState; - bind(n.tryBlock); - var postTryState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.catchClause); - var postCatchState = currentReachabilityState; - currentReachabilityState = preTryState; - bind(n.finallyBlock); - // post catch/finally state is reachable if - // - post try state is reachable - control flow can fall out of try block - // - post catch state is reachable - control flow can fall out of catch block - currentReachabilityState = or(postTryState, postCatchState); - } - function bindSwitchStatement(n) { - var preSwitchState = currentReachabilityState; - var postSwitchLabel = pushImplicitLabel(); - // bind expression (don't affect reachability) - bind(n.expression); - bind(n.caseBlock); - var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; }); - // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case - var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState; - popImplicitLabel(postSwitchLabel, postSwitchState); - } - function bindCaseBlock(n) { - var startState = currentReachabilityState; - for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { - var clause = _a[_i]; - currentReachabilityState = startState; - bind(clause); - if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) { - errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); - } - } - } - function bindLabeledStatement(n) { - // call bind on label (don't affect reachability) - bind(n.label); - var ok = pushNamedLabel(n.label); - bind(n.statement); - if (ok) { - popNamedLabel(n.label, currentReachabilityState); - } - } - function getContainerFlags(node) { - switch (node.kind) { - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - case 215 /* InterfaceDeclaration */: - case 217 /* EnumDeclaration */: - case 155 /* TypeLiteral */: - case 165 /* ObjectLiteralExpression */: - return 1 /* IsContainer */; - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - case 213 /* FunctionDeclaration */: - case 144 /* Constructor */: - case 145 /* GetAccessor */: - case 146 /* SetAccessor */: - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - case 218 /* ModuleDeclaration */: - case 248 /* SourceFile */: - case 216 /* TypeAliasDeclaration */: - return 5 /* IsContainerWithLocals */; - case 244 /* CatchClause */: - case 199 /* ForStatement */: - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - case 220 /* CaseBlock */: - return 2 /* IsBlockScopedContainer */; - case 192 /* Block */: - // do not treat blocks directly inside a function as a block-scoped-container. - // Locals that reside in this block should go to the function locals. Othewise 'x' - // would not appear to be a redeclaration of a block scoped local in the following - // example: - // - // function foo() { - // var x; - // let x; - // } - // - // If we placed 'var x' into the function locals and 'let x' into the locals of - // the block, then there would be no collision. - // - // By not creating a new block-scoped-container here, we ensure that both 'var x' - // and 'let x' go into the Function-container's locals, and we do get a collision - // conflict. - return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */; - } - return 0 /* None */; - } - function addToContainerChain(next) { - if (lastContainer) { - lastContainer.nextContainer = next; - } - lastContainer = next; - } - function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { - // Just call this directly so that the return type of this function stays "void". - declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); - } - function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { - switch (container.kind) { - // Modules, source files, and classes need specialized handling for how their - // members are declared (for example, a member of a class will go into a specific - // symbol table depending on if it is static or not). We defer to specialized - // handlers to take care of declaring these child members. - case 218 /* ModuleDeclaration */: - return declareModuleMember(node, symbolFlags, symbolExcludes); - case 248 /* SourceFile */: - return declareSourceFileMember(node, symbolFlags, symbolExcludes); - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - return declareClassMember(node, symbolFlags, symbolExcludes); - case 217 /* EnumDeclaration */: - return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - case 155 /* TypeLiteral */: - case 165 /* ObjectLiteralExpression */: - case 215 /* InterfaceDeclaration */: - // Interface/Object-types always have their children added to the 'members' of - // their container. They are only accessible through an instance of their - // container, and are never in scope otherwise (even inside the body of the - // object / type / interface declaring them). An exception is type parameters, - // which are in scope without qualification (similar to 'locals'). - return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - case 144 /* Constructor */: - case 145 /* GetAccessor */: - case 146 /* SetAccessor */: - case 213 /* FunctionDeclaration */: - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - case 216 /* TypeAliasDeclaration */: - // All the children of these container types are never visible through another - // symbol (i.e. through another symbol's 'exports' or 'members'). Instead, - // they're only accessed 'lexically' (i.e. from code that exists underneath - // their container in the tree. To accomplish this, we simply add their declared - // symbol to the 'locals' of the container. These symbols can then be found as - // the type checker walks up the containers, checking them for matching names. - return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - function declareClassMember(node, symbolFlags, symbolExcludes) { - return node.flags & 64 /* Static */ - ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) - : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - } - function declareSourceFileMember(node, symbolFlags, symbolExcludes) { - return ts.isExternalModule(file) - ? declareModuleMember(node, symbolFlags, symbolExcludes) - : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); - } - function hasExportDeclarations(node) { - var body = node.kind === 248 /* SourceFile */ ? node : node.body; - if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) { - for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { - var stat = _a[_i]; - if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) { - return true; - } - } - } - return false; - } - function setExportContextFlag(node) { - // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular - // declarations with export modifiers) is an export context in which declarations are implicitly exported. - if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { - node.flags |= 131072 /* ExportContext */; - } - else { - node.flags &= ~131072 /* ExportContext */; - } - } - function bindModuleDeclaration(node) { - setExportContextFlag(node); - if (node.name.kind === 9 /* StringLiteral */) { - declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); - } - else { - var state = getModuleInstanceState(node); - if (state === 0 /* NonInstantiated */) { - declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */); - } - else { - declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); - if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) { - // if module was already merged with some function, class or non-const enum - // treat is a non-const-enum-only - node.symbol.constEnumOnlyModule = false; - } - else { - var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */; - if (node.symbol.constEnumOnlyModule === undefined) { - // non-merged case - use the current state - node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; - } - else { - // merged case: module is const enum only if all its pieces are non-instantiated or const enum - node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; - } - } - } - } - } - function bindFunctionOrConstructorType(node) { - // For a given function symbol "<...>(...) => T" we want to generate a symbol identical - // to the one we would get for: { <...>(...): T } - // - // We do that by making an anonymous type literal symbol, and then setting the function - // symbol as its sole member. To the rest of the system, this symbol will be indistinguishable - // from an actual type literal symbol you would have gotten had you used the long form. - var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node)); - addDeclarationToSymbol(symbol, node, 131072 /* Signature */); - var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type"); - addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */); - typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); - var _a; - } - function bindObjectLiteralExpression(node) { - var ElementKind; - (function (ElementKind) { - ElementKind[ElementKind["Property"] = 1] = "Property"; - ElementKind[ElementKind["Accessor"] = 2] = "Accessor"; - })(ElementKind || (ElementKind = {})); - if (inStrictMode) { - var seen = {}; - for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { - var prop = _a[_i]; - if (prop.name.kind !== 69 /* Identifier */) { - continue; - } - var identifier = prop.name; - // ECMA-262 11.1.5 Object Initialiser - // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true - // a.This production is contained in strict code and IsDataDescriptor(previous) is true and - // IsDataDescriptor(propId.descriptor) is true. - // b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true. - // c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true. - // d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true - // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields - var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */ - ? 1 /* Property */ - : 2 /* Accessor */; - var existingKind = seen[identifier.text]; - if (!existingKind) { - seen[identifier.text] = currentKind; - continue; - } - if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) { - var span = ts.getErrorSpanForNode(file, identifier); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); - } - } - } - return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object"); - } - function bindAnonymousDeclaration(node, symbolFlags, name) { - var symbol = createSymbol(symbolFlags, name); - addDeclarationToSymbol(symbol, node, symbolFlags); - } - function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { - switch (blockScopeContainer.kind) { - case 218 /* ModuleDeclaration */: - declareModuleMember(node, symbolFlags, symbolExcludes); - break; - case 248 /* SourceFile */: - if (ts.isExternalModule(container)) { - declareModuleMember(node, symbolFlags, symbolExcludes); - break; - } - // fall through. - default: - if (!blockScopeContainer.locals) { - blockScopeContainer.locals = {}; - addToContainerChain(blockScopeContainer); - } - declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); - } - } - function bindBlockScopedVariableDeclaration(node) { - bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */); - } - // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized - // check for reserved words used as identifiers in strict mode code. - function checkStrictModeIdentifier(node) { - if (inStrictMode && - node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ && - node.originalKeywordKind <= 114 /* LastFutureReservedWord */ && - !ts.isIdentifierName(node)) { - // Report error only if there are no parse errors in file - if (!file.parseDiagnostics.length) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); - } - } - } - function getStrictModeIdentifierMessage(node) { - // Provide specialized messages to help the user understand why we think they're in - // strict mode. - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; - } - return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; - } - function checkStrictModeBinaryExpression(node) { - if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { - // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an - // Assignment operator(11.13) or of a PostfixExpression(11.3) - checkStrictModeEvalOrArguments(node, node.left); - } - } - function checkStrictModeCatchClause(node) { - // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the - // Catch production is eval or arguments - if (inStrictMode && node.variableDeclaration) { - checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); - } - } - function checkStrictModeDeleteExpression(node) { - // Grammar checking - if (inStrictMode && node.expression.kind === 69 /* Identifier */) { - // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its - // UnaryExpression is a direct reference to a variable, function argument, or function name - var span = ts.getErrorSpanForNode(file, node.expression); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); - } - } - function isEvalOrArgumentsIdentifier(node) { - return node.kind === 69 /* Identifier */ && - (node.text === "eval" || node.text === "arguments"); - } - function checkStrictModeEvalOrArguments(contextNode, name) { - if (name && name.kind === 69 /* Identifier */) { - var identifier = name; - if (isEvalOrArgumentsIdentifier(identifier)) { - // We check first if the name is inside class declaration or class expression; if so give explicit message - // otherwise report generic error message. - var span = ts.getErrorSpanForNode(file, name); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); - } - } - } - function getStrictModeEvalOrArgumentsMessage(node) { - // Provide specialized messages to help the user understand why we think they're in - // strict mode. - if (ts.getContainingClass(node)) { - return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; - } - if (file.externalModuleIndicator) { - return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; - } - return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; - } - function checkStrictModeFunctionName(node) { - if (inStrictMode) { - // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1)) - checkStrictModeEvalOrArguments(node, node.name); - } - } - function checkStrictModeNumericLiteral(node) { - if (inStrictMode && node.flags & 32768 /* OctalLiteral */) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); - } - } - function checkStrictModePostfixUnaryExpression(node) { - // Grammar checking - // The identifier eval or arguments may not appear as the LeftHandSideExpression of an - // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression - // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator. - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.operand); - } - } - function checkStrictModePrefixUnaryExpression(node) { - // Grammar checking - if (inStrictMode) { - if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) { - checkStrictModeEvalOrArguments(node, node.operand); - } - } - } - function checkStrictModeWithStatement(node) { - // Grammar checking for withStatement - if (inStrictMode) { - errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); - } - } - function errorOnFirstToken(node, message, arg0, arg1, arg2) { - var span = ts.getSpanOfTokenAtPosition(file, node.pos); - file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); - } - function getDestructuringParameterName(node) { - return "__" + ts.indexOf(node.parent.parameters, node); - } - function bind(node) { - if (!node) { - return; - } - node.parent = parent; - var savedInStrictMode = inStrictMode; - if (!savedInStrictMode) { - updateStrictMode(node); - } - // First we bind declaration nodes to a symbol if possible. We'll both create a symbol - // and then potentially add the symbol to an appropriate symbol table. Possible - // destination symbol tables are: - // - // 1) The 'exports' table of the current container's symbol. - // 2) The 'members' table of the current container's symbol. - // 3) The 'locals' table of the current container. - // - // However, not all symbols will end up in any of these tables. 'Anonymous' symbols - // (like TypeLiterals for example) will not be put in any table. - bindWorker(node); - // Then we recurse into the children of the node to bind them as well. For certain - // symbols we do specialized work when we recurse. For example, we'll keep track of - // the current 'container' node when it changes. This helps us know which symbol table - // a local should go into for example. - bindChildren(node); - inStrictMode = savedInStrictMode; - } - function updateStrictMode(node) { - switch (node.kind) { - case 248 /* SourceFile */: - case 219 /* ModuleBlock */: - updateStrictModeStatementList(node.statements); - return; - case 192 /* Block */: - if (ts.isFunctionLike(node.parent)) { - updateStrictModeStatementList(node.statements); - } - return; - case 214 /* ClassDeclaration */: - case 186 /* ClassExpression */: - // All classes are automatically in strict mode in ES6. - inStrictMode = true; - return; - } - } - function updateStrictModeStatementList(statements) { - for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { - var statement = statements_1[_i]; - if (!ts.isPrologueDirective(statement)) { - return; - } - if (isUseStrictPrologueDirective(statement)) { - inStrictMode = true; - return; - } - } - } - /// Should be called only on prologue directives (isPrologueDirective(node) should be true) - function isUseStrictPrologueDirective(node) { - var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); - // Note: the node text must be exactly "use strict" or 'use strict'. It is not ok for the - // string to contain unicode escapes (as per ES5). - return nodeText === "\"use strict\"" || nodeText === "'use strict'"; - } - function bindWorker(node) { - switch (node.kind) { - case 69 /* Identifier */: - return checkStrictModeIdentifier(node); - case 181 /* BinaryExpression */: - return checkStrictModeBinaryExpression(node); - case 244 /* CatchClause */: - return checkStrictModeCatchClause(node); - case 175 /* DeleteExpression */: - return checkStrictModeDeleteExpression(node); - case 8 /* NumericLiteral */: - return checkStrictModeNumericLiteral(node); - case 180 /* PostfixUnaryExpression */: - return checkStrictModePostfixUnaryExpression(node); - case 179 /* PrefixUnaryExpression */: - return checkStrictModePrefixUnaryExpression(node); - case 205 /* WithStatement */: - return checkStrictModeWithStatement(node); - case 97 /* ThisKeyword */: - seenThisKeyword = true; - return; - case 137 /* TypeParameter */: - return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */); - case 138 /* Parameter */: - return bindParameter(node); - case 211 /* VariableDeclaration */: - case 163 /* BindingElement */: - return bindVariableDeclarationOrBindingElement(node); - case 141 /* PropertyDeclaration */: - case 140 /* PropertySignature */: - return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */); - case 245 /* PropertyAssignment */: - case 246 /* ShorthandPropertyAssignment */: - return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */); - case 247 /* EnumMember */: - return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */); - case 147 /* CallSignature */: - case 148 /* ConstructSignature */: - case 149 /* IndexSignature */: - return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */); - case 143 /* MethodDeclaration */: - case 142 /* MethodSignature */: - // If this is an ObjectLiteralExpression method, then it sits in the same space - // as other properties in the object literal. So we use SymbolFlags.PropertyExcludes - // so that it will conflict with any other object literal members with the same - // name. - return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */); - case 213 /* FunctionDeclaration */: - checkStrictModeFunctionName(node); - return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */); - case 144 /* Constructor */: - return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */); - case 145 /* GetAccessor */: - return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */); - case 146 /* SetAccessor */: - return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */); - case 152 /* FunctionType */: - case 153 /* ConstructorType */: - return bindFunctionOrConstructorType(node); - case 155 /* TypeLiteral */: - return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type"); - case 165 /* ObjectLiteralExpression */: - return bindObjectLiteralExpression(node); - case 173 /* FunctionExpression */: - case 174 /* ArrowFunction */: - checkStrictModeFunctionName(node); - var bindingName = node.name ? node.name.text : "__function"; - return bindAnonymousDeclaration(node, 16 /* Function */, bindingName); - case 186 /* ClassExpression */: - case 214 /* ClassDeclaration */: - return bindClassLikeDeclaration(node); - case 215 /* InterfaceDeclaration */: - return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */); - case 216 /* TypeAliasDeclaration */: - return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */); - case 217 /* EnumDeclaration */: - return bindEnumDeclaration(node); - case 218 /* ModuleDeclaration */: - return bindModuleDeclaration(node); - case 221 /* ImportEqualsDeclaration */: - case 224 /* NamespaceImport */: - case 226 /* ImportSpecifier */: - case 230 /* ExportSpecifier */: - return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); - case 223 /* ImportClause */: - return bindImportClause(node); - case 228 /* ExportDeclaration */: - return bindExportDeclaration(node); - case 227 /* ExportAssignment */: - return bindExportAssignment(node); - case 248 /* SourceFile */: - return bindSourceFileIfExternalModule(); - } - } - function bindSourceFileIfExternalModule() { - setExportContextFlag(file); - if (ts.isExternalModule(file)) { - bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\""); - } - } - function bindExportAssignment(node) { - if (!container.symbol || !container.symbol.exports) { - // Export assignment in some sort of block construct - bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node)); - } - else if (node.expression.kind === 69 /* Identifier */) { - // An export default clause with an identifier exports all meanings of that identifier - declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); - } - else { - // An export default clause with an expression exports a value - declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); - } - } - function bindExportDeclaration(node) { - if (!container.symbol || !container.symbol.exports) { - // Export * in some sort of block construct - bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node)); - } - else if (!node.exportClause) { - // All export * declarations are collected in an __export symbol - declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */); - } - } - function bindImportClause(node) { - if (node.name) { - declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); - } - } - function bindClassLikeDeclaration(node) { - if (node.kind === 214 /* ClassDeclaration */) { - bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */); - } - else { - var bindingName = node.name ? node.name.text : "__class"; - bindAnonymousDeclaration(node, 32 /* Class */, bindingName); - // Add name of class expression into the map for semantic classifier - if (node.name) { - classifiableNames[node.name.text] = node.name.text; - } - } - var symbol = node.symbol; - // TypeScript 1.0 spec (April 2014): 8.4 - // Every class automatically contains a static property member named 'prototype', the - // type of which is an instantiation of the class type with type Any supplied as a type - // argument for each type parameter. It is an error to explicitly declare a static - // property member with the name 'prototype'. - // - // Note: we check for this here because this class may be merging into a module. The - // module might have an exported variable called 'prototype'. We can't allow that as - // that would clash with the built-in 'prototype' for the class. - var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype"); - if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { - if (node.name) { - node.name.parent = node; - } - file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); - } - symbol.exports[prototypeSymbol.name] = prototypeSymbol; - prototypeSymbol.parent = symbol; - } - function bindEnumDeclaration(node) { - return ts.isConst(node) - ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */) - : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */); - } - function bindVariableDeclarationOrBindingElement(node) { - if (inStrictMode) { - checkStrictModeEvalOrArguments(node, node.name); - } - if (!ts.isBindingPattern(node.name)) { - if (ts.isBlockOrCatchScoped(node)) { - bindBlockScopedVariableDeclaration(node); - } - else if (ts.isParameterDeclaration(node)) { - // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration - // because its parent chain has already been set up, since parents are set before descending into children. - // - // If node is a binding element in parameter declaration, we need to use ParameterExcludes. - // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration - // For example: - // function foo([a,a]) {} // Duplicate Identifier error - // function bar(a,a) {} // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter - // // which correctly set excluded symbols - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); - } - else { - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */); - } - } - } - function bindParameter(node) { - if (inStrictMode) { - // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a - // strict mode FunctionLikeDeclaration or FunctionExpression(13.1) - checkStrictModeEvalOrArguments(node, node.name); - } - if (ts.isBindingPattern(node.name)) { - bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node)); - } - else { - declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); - } - // If this is a property-parameter, then also declare the property symbol into the - // containing class. - if (node.flags & 56 /* AccessibilityModifier */ && - node.parent.kind === 144 /* Constructor */ && - ts.isClassLike(node.parent.parent)) { - var classDeclaration = node.parent.parent; - declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */); - } - } - function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { - return ts.hasDynamicName(node) - ? bindAnonymousDeclaration(node, symbolFlags, "__computed") - : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); - } - // reachability checks - function pushNamedLabel(name) { - initializeReachabilityStateIfNecessary(); - if (ts.hasProperty(labelIndexMap, name.text)) { - return false; - } - labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1; - return true; - } - function pushImplicitLabel() { - initializeReachabilityStateIfNecessary(); - var index = labelStack.push(1 /* Unintialized */) - 1; - implicitLabels.push(index); - return index; - } - function popNamedLabel(label, outerState) { - var index = labelIndexMap[label.text]; - ts.Debug.assert(index !== undefined); - ts.Debug.assert(labelStack.length == index + 1); - labelIndexMap[label.text] = undefined; - setCurrentStateAtLabel(labelStack.pop(), outerState, label); - } - function popImplicitLabel(implicitLabelIndex, outerState) { - if (labelStack.length !== implicitLabelIndex + 1) { - ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); - } - var i = implicitLabels.pop(); - if (implicitLabelIndex !== i) { - ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); - } - setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined); - } - function setCurrentStateAtLabel(innerMergedState, outerState, label) { - if (innerMergedState === 1 /* Unintialized */) { - if (label && !options.allowUnusedLabels) { - file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); - } - currentReachabilityState = outerState; - } - else { - currentReachabilityState = or(innerMergedState, outerState); - } - } - function jumpToLabel(label, outerState) { - initializeReachabilityStateIfNecessary(); - var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); - if (index === undefined) { - // reference to unknown label or - // break/continue used outside of loops - return false; - } - var stateAtLabel = labelStack[index]; - labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState); - return true; - } - function checkUnreachable(node) { - switch (currentReachabilityState) { - case 4 /* Unreachable */: - var reportError = - // report error on all statements - ts.isStatement(node) || - // report error on class declarations - node.kind === 214 /* ClassDeclaration */ || - // report error on instantiated modules or const-enums only modules if preserveConstEnums is set - (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) || - // report error on regular enums and const enums if preserveConstEnums is set - (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); - if (reportError) { - currentReachabilityState = 8 /* ReportedUnreachable */; - // unreachable code is reported if - // - user has explicitly asked about it AND - // - statement is in not ambient context (statements in ambient context is already an error - // so we should not report extras) AND - // - node is not variable statement OR - // - node is block scoped variable statement OR - // - node is not block scoped variable statement and at least one variable declaration has initializer - // Rationale: we don't want to report errors on non-initialized var's since they are hoisted - // On the other side we do want to report errors on non-initialized 'lets' because of TDZ - var reportUnreachableCode = !options.allowUnreachableCode && - !ts.isInAmbientContext(node) && - (node.kind !== 193 /* VariableStatement */ || - ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ || - ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); - if (reportUnreachableCode) { - errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); - } - } - case 8 /* ReportedUnreachable */: - return true; - default: - return false; - } - function shouldReportErrorOnModuleDeclaration(node) { - var instanceState = getModuleInstanceState(node); - return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums); - } - } - function initializeReachabilityStateIfNecessary() { - if (labelIndexMap) { - return; - } - currentReachabilityState = 2 /* Reachable */; - labelIndexMap = {}; - labelStack = []; - implicitLabels = []; - } - } -})(ts || (ts = {})); -/// -/// -/* @internal */ -var ts; -(function (ts) { - function getDeclarationOfKind(symbol, kind) { - var declarations = symbol.declarations; - if (declarations) { - for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) { - var declaration = declarations_1[_i]; - if (declaration.kind === kind) { - return declaration; - } - } - } - return undefined; - } - ts.getDeclarationOfKind = getDeclarationOfKind; - // Pool writers to avoid needing to allocate them for every symbol we write. - var stringWriters = []; - function getSingleLineStringWriter() { - if (stringWriters.length === 0) { - var str = ""; - var writeText = function (text) { return str += text; }; - return { - string: function () { return str; }, - writeKeyword: writeText, - writeOperator: writeText, - writePunctuation: writeText, - writeSpace: writeText, - writeStringLiteral: writeText, - writeParameter: writeText, - writeSymbol: writeText, - // Completely ignore indentation for string writers. And map newlines to - // a single space. - writeLine: function () { return str += " "; }, - increaseIndent: function () { }, - decreaseIndent: function () { }, - clear: function () { return str = ""; }, - trackSymbol: function () { }, - reportInaccessibleThisError: function () { } - }; - } - return stringWriters.pop(); - } - ts.getSingleLineStringWriter = getSingleLineStringWriter; - function releaseStringWriter(writer) { - writer.clear(); - stringWriters.push(writer); - } - ts.releaseStringWriter = releaseStringWriter; - function getFullWidth(node) { - return node.end - node.pos; - } - ts.getFullWidth = getFullWidth; - function arrayIsEqualTo(array1, array2, equaler) { - if (!array1 || !array2) { - return array1 === array2; - } - if (array1.length !== array2.length) { - return false; - } - for (var i = 0; i < array1.length; ++i) { - var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i]; - if (!equals) { - return false; - } - } - return true; - } - ts.arrayIsEqualTo = arrayIsEqualTo; - function hasResolvedModule(sourceFile, moduleNameText) { - return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText); - } - ts.hasResolvedModule = hasResolvedModule; - function getResolvedModule(sourceFile, moduleNameText) { - return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined; - } - ts.getResolvedModule = getResolvedModule; - function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { - if (!sourceFile.resolvedModules) { - sourceFile.resolvedModules = {}; - } - sourceFile.resolvedModules[moduleNameText] = resolvedModule; - } - ts.setResolvedModule = setResolvedModule; - // Returns true if this node contains a parse error anywhere underneath it. - function containsParseError(node) { - aggregateChildData(node); - return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0; - } - ts.containsParseError = containsParseError; - function aggregateChildData(node) { - if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) { - // A node is considered to contain a parse error if: - // a) the parser explicitly marked that it had an error - // b) any of it's children reported that it had an error. - var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) || - ts.forEachChild(node, containsParseError); - // If so, mark ourselves accordingly. - if (thisNodeOrAnySubNodesHasError) { - node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */; - } - // Also mark that we've propogated the child information to this node. This way we can - // always consult the bit directly on this node without needing to check its children - // again. - node.parserContextFlags |= 128 /* HasAggregatedChildData */; - } - } - function getSourceFileOfNode(node) { - while (node && node.kind !== 248 /* SourceFile */) { - node = node.parent; - } - return node; - } - ts.getSourceFileOfNode = getSourceFileOfNode; - function getStartPositionOfLine(line, sourceFile) { - ts.Debug.assert(line >= 0); - return ts.getLineStarts(sourceFile)[line]; - } - ts.getStartPositionOfLine = getStartPositionOfLine; - // This is a useful function for debugging purposes. - function nodePosToString(node) { - var file = getSourceFileOfNode(node); - var loc = ts.getLineAndCharacterOfPosition(file, node.pos); - return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")"; - } - ts.nodePosToString = nodePosToString; - function getStartPosOfNode(node) { - return node.pos; - } - ts.getStartPosOfNode = getStartPosOfNode; - // Returns true if this node is missing from the actual source code. A 'missing' node is different - // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes - // in the tree), it is definitely missing. However, a node may be defined, but still be - // missing. This happens whenever the parser knows it needs to parse something, but can't - // get anything in the source code that it expects at that location. For example: - // - // let a: ; - // - // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source - // code). So the parser will attempt to parse out a type, and will create an actual node. - // However, this node will be 'missing' in the sense that no actual source-code/tokens are - // contained within it. - function nodeIsMissing(node) { - if (!node) { - return true; - } - return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */; - } - ts.nodeIsMissing = nodeIsMissing; - function nodeIsPresent(node) { - return !nodeIsMissing(node); - } - ts.nodeIsPresent = nodeIsPresent; - function getTokenPosOfNode(node, sourceFile) { - // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't* - // want to skip trivia because this will launch us forward to the next token. - if (nodeIsMissing(node)) { - return node.pos; - } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); - } - ts.getTokenPosOfNode = getTokenPosOfNode; - function getNonDecoratorTokenPosOfNode(node, sourceFile) { - if (nodeIsMissing(node) || !node.decorators) { - return getTokenPosOfNode(node, sourceFile); - } - return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end); - } - ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode; - function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - if (nodeIsMissing(node)) { - return ""; - } - var text = sourceFile.text; - return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end); - } - ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile; - function getTextOfNodeFromSourceText(sourceText, node) { - if (nodeIsMissing(node)) { - return ""; - } - return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end); - } - ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText; - function getTextOfNode(node, includeTrivia) { - if (includeTrivia === void 0) { includeTrivia = false; } - return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); - } - ts.getTextOfNode = getTextOfNode; - // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' - function escapeIdentifier(identifier) { - return identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier; - } - ts.escapeIdentifier = escapeIdentifier; - // Remove extra underscore from escaped identifier - function unescapeIdentifier(identifier) { - return identifier.length >= 3 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ && identifier.charCodeAt(2) === 95 /* _ */ ? identifier.substr(1) : identifier; - } - ts.unescapeIdentifier = unescapeIdentifier; - // Make an identifier from an external module name by extracting the string after the last "/" and replacing - // all non-alphanumeric characters with underscores - function makeIdentifierFromModuleName(moduleName) { - return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_"); - } - ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName; - function isBlockOrCatchScoped(declaration) { - return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 || - isCatchClauseVariableDeclaration(declaration); - } - ts.isBlockOrCatchScoped = isBlockOrCatchScoped; - // Gets the nearest enclosing block scope container that has the provided node - // as a descendant, that is not the provided node. - function getEnclosingBlockScopeContainer(node) { - var current = node.parent; - while (current) { - if (isFunctionLike(current)) { - return current; - } - switch (current.kind) { - case 248 /* SourceFile */: - case 220 /* CaseBlock */: - case 244 /* CatchClause */: - case 218 /* ModuleDeclaration */: - case 199 /* ForStatement */: - case 200 /* ForInStatement */: - case 201 /* ForOfStatement */: - return current; - case 192 /* Block */: - // function block is not considered block-scope container - // see comment in binder.ts: bind(...), case for SyntaxKind.Block - if (!isFunctionLike(current.parent)) { - return current; - } - } - current = current.parent; + current = current.parent; } } ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer; @@ -5812,6 +4503,10 @@ var ts; return file.externalModuleIndicator !== undefined; } ts.isExternalModule = isExternalModule; + function isExternalOrCommonJsModule(file) { + return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined; + } + ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule; function isDeclarationFile(file) { return (file.flags & 4096 /* DeclarationFile */) !== 0; } @@ -5865,19 +4560,27 @@ var ts; return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos); } ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; + function getLeadingCommentRangesOfNodeFromText(node, text) { + return ts.getLeadingCommentRanges(text, node.pos); + } + ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText; function getJsDocComments(node, sourceFileOfNode) { + return getJsDocCommentsFromText(node, sourceFileOfNode.text); + } + ts.getJsDocComments = getJsDocComments; + function getJsDocCommentsFromText(node, text) { var commentRanges = (node.kind === 138 /* Parameter */ || node.kind === 137 /* TypeParameter */) ? - ts.concatenate(ts.getTrailingCommentRanges(sourceFileOfNode.text, node.pos), ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos)) : - getLeadingCommentRangesOfNode(node, sourceFileOfNode); + ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) : + getLeadingCommentRangesOfNodeFromText(node, text); return ts.filter(commentRanges, isJsDocComment); function isJsDocComment(comment) { // True if the comment starts with '/**' but not if it is '/**/' - return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && - sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && - sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47 /* slash */; + return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 3) !== 47 /* slash */; } } - ts.getJsDocComments = getJsDocComments; + ts.getJsDocCommentsFromText = getJsDocCommentsFromText; ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*/; ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; function isTypeNode(node) { @@ -6464,6 +5167,57 @@ var ts; return node.kind === 221 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 232 /* ExternalModuleReference */; } ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; + function isSourceFileJavaScript(file) { + return isInJavaScriptFile(file); + } + ts.isSourceFileJavaScript = isSourceFileJavaScript; + function isInJavaScriptFile(node) { + return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */); + } + ts.isInJavaScriptFile = isInJavaScriptFile; + /** + * Returns true if the node is a CallExpression to the identifier 'require' with + * exactly one string literal argument. + * This function does not test if the node is in a JavaScript file or not. + */ + function isRequireCall(expression) { + // of the form 'require("name")' + return expression.kind === 168 /* CallExpression */ && + expression.expression.kind === 69 /* Identifier */ && + expression.expression.text === "require" && + expression.arguments.length === 1 && + expression.arguments[0].kind === 9 /* StringLiteral */; + } + ts.isRequireCall = isRequireCall; + /** + * Returns true if the node is an assignment to a property on the identifier 'exports'. + * This function does not test if the node is in a JavaScript file or not. + */ + function isExportsPropertyAssignment(expression) { + // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary + return isInJavaScriptFile(expression) && + (expression.kind === 181 /* BinaryExpression */) && + (expression.operatorToken.kind === 56 /* EqualsToken */) && + (expression.left.kind === 166 /* PropertyAccessExpression */) && + (expression.left.expression.kind === 69 /* Identifier */) && + ((expression.left.expression).text === "exports"); + } + ts.isExportsPropertyAssignment = isExportsPropertyAssignment; + /** + * Returns true if the node is an assignment to the property access expression 'module.exports'. + * This function does not test if the node is in a JavaScript file or not. + */ + function isModuleExportsAssignment(expression) { + // of the form 'module.exports = expr' where 'expr' is arbitrary + return isInJavaScriptFile(expression) && + (expression.kind === 181 /* BinaryExpression */) && + (expression.operatorToken.kind === 56 /* EqualsToken */) && + (expression.left.kind === 166 /* PropertyAccessExpression */) && + (expression.left.expression.kind === 69 /* Identifier */) && + ((expression.left.expression).text === "module") && + (expression.left.name.text === "exports"); + } + ts.isModuleExportsAssignment = isModuleExportsAssignment; function getExternalModuleName(node) { if (node.kind === 222 /* ImportDeclaration */) { return node.moduleSpecifier; @@ -6791,8 +5545,8 @@ var ts; function getFileReferenceFromReferencePath(comment, commentRange) { var simpleReferenceRegEx = /^\/\/\/\s*/gim; - if (simpleReferenceRegEx.exec(comment)) { - if (isNoDefaultLibRegEx.exec(comment)) { + if (simpleReferenceRegEx.test(comment)) { + if (isNoDefaultLibRegEx.test(comment)) { return { isNoDefaultLib: true }; @@ -6834,6 +5588,10 @@ var ts; return isFunctionLike(node) && (node.flags & 256 /* Async */) !== 0 && !isAccessor(node); } ts.isAsyncFunctionLike = isAsyncFunctionLike; + function isStringOrNumericLiteral(kind) { + return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */; + } + ts.isStringOrNumericLiteral = isStringOrNumericLiteral; /** * A declaration has a dynamic name if both of the following are true: * 1. The declaration has a computed property name @@ -6842,11 +5600,15 @@ var ts; * Symbol. */ function hasDynamicName(declaration) { - return declaration.name && - declaration.name.kind === 136 /* ComputedPropertyName */ && - !isWellKnownSymbolSyntactically(declaration.name.expression); + return declaration.name && isDynamicName(declaration.name); } ts.hasDynamicName = hasDynamicName; + function isDynamicName(name) { + return name.kind === 136 /* ComputedPropertyName */ && + !isStringOrNumericLiteral(name.expression.kind) && + !isWellKnownSymbolSyntactically(name.expression); + } + ts.isDynamicName = isDynamicName; /** * Checks if the expression is of the form: * Symbol.name @@ -7087,11 +5849,11 @@ var ts; } ts.getIndentSize = getIndentSize; function createTextWriter(newLine) { - var output = ""; - var indent = 0; - var lineStart = true; - var lineCount = 0; - var linePos = 0; + var output; + var indent; + var lineStart; + var lineCount; + var linePos; function write(s) { if (s && s.length) { if (lineStart) { @@ -7101,6 +5863,13 @@ var ts; output += s; } } + function reset() { + output = ""; + indent = 0; + lineStart = true; + lineCount = 0; + linePos = 0; + } function rawWrite(s) { if (s !== undefined) { if (lineStart) { @@ -7127,9 +5896,10 @@ var ts; lineStart = true; } } - function writeTextOfNode(sourceFile, node) { - write(getSourceTextOfNodeFromSourceFile(sourceFile, node)); + function writeTextOfNode(text, node) { + write(getTextOfNodeFromSourceText(text, node)); } + reset(); return { write: write, rawWrite: rawWrite, @@ -7142,10 +5912,20 @@ var ts; getTextPos: function () { return output.length; }, getLine: function () { return lineCount + 1; }, getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; }, - getText: function () { return output; } + getText: function () { return output; }, + reset: reset }; } ts.createTextWriter = createTextWriter; + /** + * Resolves a local path to a path which is absolute to the base of the emit + */ + function getExternalModuleNameFromPath(host, fileName) { + var dir = host.getCurrentDirectory(); + var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, fileName, dir, function (f) { return host.getCanonicalFileName(f); }, /*isAbsolutePathAnUrl*/ false); + return ts.removeFileExtension(relativePath); + } + ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath; function getOwnEmitOutputFilePath(sourceFile, host, extension) { var compilerOptions = host.getCompilerOptions(); var emitOutputFilePathWithoutExtension; @@ -7174,6 +5954,10 @@ var ts; return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line; } ts.getLineOfLocalPosition = getLineOfLocalPosition; + function getLineOfLocalPositionFromLineMap(lineMap, pos) { + return ts.computeLineAndCharacterOfPosition(lineMap, pos).line; + } + ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap; function getFirstConstructorWithBody(node) { return ts.forEach(node.members, function (member) { if (member.kind === 144 /* Constructor */ && nodeIsPresent(member.body)) { @@ -7246,22 +6030,22 @@ var ts; }; } ts.getAllAccessorDeclarations = getAllAccessorDeclarations; - function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) { + function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) { // If the leading comments start on different line than the start of node, write new line if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && - getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) { + getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) { writer.writeLine(); } } ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments; - function emitComments(currentSourceFile, writer, comments, trailingSeparator, newLine, writeComment) { + function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) { var emitLeadingSpace = !trailingSeparator; ts.forEach(comments, function (comment) { if (emitLeadingSpace) { writer.write(" "); emitLeadingSpace = false; } - writeComment(currentSourceFile, writer, comment, newLine); + writeComment(text, lineMap, writer, comment, newLine); if (comment.hasTrailingNewLine) { writer.writeLine(); } @@ -7279,7 +6063,7 @@ var ts; * Detached comment is a comment at the top of file or function body that is separated from * the next statement by space. */ - function emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, removeComments) { + function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) { var leadingComments; var currentDetachedCommentInfo; if (removeComments) { @@ -7289,12 +6073,12 @@ var ts; // // var x = 10; if (node.pos === 0) { - leadingComments = ts.filter(ts.getLeadingCommentRanges(currentSourceFile.text, node.pos), isPinnedComment); + leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment); } } else { // removeComments is false, just get detached as normal and bypass the process to filter comment - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + leadingComments = ts.getLeadingCommentRanges(text, node.pos); } if (leadingComments) { var detachedComments = []; @@ -7302,8 +6086,8 @@ var ts; for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) { var comment = leadingComments_1[_i]; if (lastComment) { - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end); - var commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end); + var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos); if (commentLine >= lastCommentLine + 2) { // There was a blank line between the last comment and this comment. This // comment is not part of the copyright comments. Return what we have so @@ -7318,36 +6102,36 @@ var ts; // All comments look like they could have been part of the copyright header. Make // sure there is at least one blank line between it and the node. If not, it's not // a copyright header. - var lastCommentLine = getLineOfLocalPosition(currentSourceFile, ts.lastOrUndefined(detachedComments).end); - var nodeLine = getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node.pos)); + var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end); + var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos)); if (nodeLine >= lastCommentLine + 2) { // Valid detachedComments - emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); - emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment); + emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments); + emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment); currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end }; } } } return currentDetachedCommentInfo; function isPinnedComment(comment) { - return currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 33 /* exclamation */; + return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && + text.charCodeAt(comment.pos + 2) === 33 /* exclamation */; } } ts.emitDetachedComments = emitDetachedComments; - function writeCommentRange(currentSourceFile, writer, comment, newLine) { - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) { - var firstCommentLineAndCharacter = ts.getLineAndCharacterOfPosition(currentSourceFile, comment.pos); - var lineCount = ts.getLineStarts(currentSourceFile).length; + function writeCommentRange(text, lineMap, writer, comment, newLine) { + if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) { + var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos); + var lineCount = lineMap.length; var firstCommentLineIndent; for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) { var nextLineStart = (currentLine + 1) === lineCount - ? currentSourceFile.text.length + 1 - : getStartPositionOfLine(currentLine + 1, currentSourceFile); + ? text.length + 1 + : lineMap[currentLine + 1]; if (pos !== comment.pos) { // If we are not emitting first line, we need to write the spaces to adjust the alignment if (firstCommentLineIndent === undefined) { - firstCommentLineIndent = calculateIndent(getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos); + firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos); } // These are number of spaces writer is going to write at current indent var currentWriterIndentSpacing = writer.getIndent() * getIndentSize(); @@ -7365,7 +6149,7 @@ var ts; // More right indented comment */ --4 = 8 - 4 + 11 // class c { } // } - var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart); + var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart); if (spacesToEmit > 0) { var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize(); var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize()); @@ -7383,45 +6167,45 @@ var ts; } } // Write the comment line text - writeTrimmedCurrentLine(pos, nextLineStart); + writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart); pos = nextLineStart; } } else { // Single line comment of style //.... - writer.write(currentSourceFile.text.substring(comment.pos, comment.end)); - } - function writeTrimmedCurrentLine(pos, nextLineStart) { - var end = Math.min(comment.end, nextLineStart - 1); - var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, ""); - if (currentLineText) { - // trimmed forward and ending spaces text - writer.write(currentLineText); - if (end !== comment.end) { - writer.writeLine(); - } - } - else { - // Empty string - make sure we write empty line - writer.writeLiteral(newLine); + writer.write(text.substring(comment.pos, comment.end)); + } + } + ts.writeCommentRange = writeCommentRange; + function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) { + var end = Math.min(comment.end, nextLineStart - 1); + var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, ""); + if (currentLineText) { + // trimmed forward and ending spaces text + writer.write(currentLineText); + if (end !== comment.end) { + writer.writeLine(); } } - function calculateIndent(pos, end) { - var currentLineIndent = 0; - for (; pos < end && ts.isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) { - if (currentSourceFile.text.charCodeAt(pos) === 9 /* tab */) { - // Tabs = TabSize = indent size and go to next tabStop - currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); - } - else { - // Single space - currentLineIndent++; - } + else { + // Empty string - make sure we write empty line + writer.writeLiteral(newLine); + } + } + function calculateIndent(text, pos, end) { + var currentLineIndent = 0; + for (; pos < end && ts.isWhiteSpace(text.charCodeAt(pos)); pos++) { + if (text.charCodeAt(pos) === 9 /* tab */) { + // Tabs = TabSize = indent size and go to next tabStop + currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize()); + } + else { + // Single space + currentLineIndent++; } - return currentLineIndent; } + return currentLineIndent; } - ts.writeCommentRange = writeCommentRange; function modifierToFlag(token) { switch (token) { case 113 /* StaticKeyword */: return 64 /* Static */; @@ -7517,14 +6301,14 @@ var ts; return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined; } ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; - function isJavaScript(fileName) { - return ts.fileExtensionIs(fileName, ".js"); + function hasJavaScriptFileExtension(fileName) { + return ts.fileExtensionIs(fileName, ".js") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isJavaScript = isJavaScript; - function isTsx(fileName) { - return ts.fileExtensionIs(fileName, ".tsx"); + ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension; + function allowsJsxExpressions(fileName) { + return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx"); } - ts.isTsx = isTsx; + ts.allowsJsxExpressions = allowsJsxExpressions; /** * Replace each instance of non-ascii characters by one, two, three, or four escape sequences * representing the UTF-8 encoding of the character, and return the expanded char code list. @@ -7835,18 +6619,20 @@ var ts; } ts.getTypeParameterOwner = getTypeParameterOwner; })(ts || (ts = {})); -/// /// +/// var ts; (function (ts) { - var nodeConstructors = new Array(272 /* Count */); /* @internal */ ts.parseTime = 0; - function getNodeConstructor(kind) { - return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)); - } - ts.getNodeConstructor = getNodeConstructor; + var NodeConstructor; + var SourceFileConstructor; function createNode(kind, pos, end) { - return new (getNodeConstructor(kind))(pos, end); + if (kind === 248 /* SourceFile */) { + return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end); + } + else { + return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end); + } } ts.createNode = createNode; function visitNode(cbNode, node) { @@ -8269,6 +7055,9 @@ var ts; // up by avoiding the cost of creating/compiling scanners over and over again. var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true); var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */; + // capture constructors in 'initializeState' to avoid null checks + var NodeConstructor; + var SourceFileConstructor; var sourceFile; var parseDiagnostics; var syntaxCursor; @@ -8354,13 +7143,16 @@ var ts; // attached to the EOF token. var parseErrorBeforeNextFinishedNode = false; function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) { - initializeState(fileName, _sourceText, languageVersion, _syntaxCursor); + var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0; + initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor); var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes); clearState(); return result; } Parser.parseSourceFile = parseSourceFile; - function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor) { + function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) { + NodeConstructor = ts.objectAllocator.getNodeConstructor(); + SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor(); sourceText = _sourceText; syntaxCursor = _syntaxCursor; parseDiagnostics = []; @@ -8368,13 +7160,13 @@ var ts; identifiers = {}; identifierCount = 0; nodeCount = 0; - contextFlags = ts.isJavaScript(fileName) ? 32 /* JavaScriptFile */ : 0 /* None */; + contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */; parseErrorBeforeNextFinishedNode = false; // Initialize and prime the scanner before parsing the source elements. scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(ts.isTsx(fileName) ? 1 /* JSX */ : 0 /* Standard */); + scanner.setLanguageVariant(ts.allowsJsxExpressions(fileName) ? 1 /* JSX */ : 0 /* Standard */); } function clearState() { // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily. @@ -8389,6 +7181,9 @@ var ts; } function parseSourceFileWorker(fileName, languageVersion, setParentNodes) { sourceFile = createSourceFile(fileName, languageVersion); + if (contextFlags & 32 /* JavaScriptFile */) { + sourceFile.parserContextFlags = 32 /* JavaScriptFile */; + } // Prime the scanner. token = nextToken(); processReferenceComments(sourceFile); @@ -8406,7 +7201,7 @@ var ts; // If this is a javascript file, proactively see if we can get JSDoc comments for // relevant nodes in the file. We'll use these to provide typing informaion if they're // available. - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { addJSDocComments(); } return sourceFile; @@ -8461,15 +7256,16 @@ var ts; } Parser.fixupParentReferences = fixupParentReferences; function createSourceFile(fileName, languageVersion) { - var sourceFile = createNode(248 /* SourceFile */, /*pos*/ 0); - sourceFile.pos = 0; - sourceFile.end = sourceText.length; + // code from createNode is inlined here so createNode won't have to deal with special case of creating source files + // this is quite rare comparing to other nodes and createNode should be as fast as possible + var sourceFile = new SourceFileConstructor(248 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length); + nodeCount++; sourceFile.text = sourceText; sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = ts.normalizePath(fileName); sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0; - sourceFile.languageVariant = ts.isTsx(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */; + sourceFile.languageVariant = ts.allowsJsxExpressions(sourceFile.fileName) ? 1 /* JSX */ : 0 /* Standard */; return sourceFile; } function setContextFlag(val, flag) { @@ -8734,12 +7530,13 @@ var ts; return parseExpected(23 /* SemicolonToken */); } } + // note: this function creates only node function createNode(kind, pos) { nodeCount++; if (!(pos >= 0)) { pos = scanner.getStartPos(); } - return new (nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind)))(pos, pos); + return new NodeConstructor(kind, pos, pos); } function finishNode(node, end) { node.end = end === undefined ? scanner.getStartPos() : end; @@ -8904,7 +7701,7 @@ var ts; case 12 /* ObjectLiteralMembers */: return token === 19 /* OpenBracketToken */ || token === 37 /* AsteriskToken */ || isLiteralPropertyName(); case 9 /* ObjectBindingElements */: - return isLiteralPropertyName(); + return token === 19 /* OpenBracketToken */ || isLiteralPropertyName(); case 7 /* HeritageClauseElement */: // If we see { } then only consume it as an expression if it is followed by , or { // That way we won't consume the body of a class in its heritage clause. @@ -9584,9 +8381,7 @@ var ts; } function parseParameterType() { if (parseOptional(54 /* ColonToken */)) { - return token === 9 /* StringLiteral */ - ? parseLiteralNode(/*internName*/ true) - : parseType(); + return parseType(); } return undefined; } @@ -9917,6 +8712,8 @@ var ts; // If these are followed by a dot, then parse these out as a dotted type reference instead. var node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); + case 9 /* StringLiteral */: + return parseLiteralNode(/*internName*/ true); case 103 /* VoidKeyword */: case 97 /* ThisKeyword */: return parseTokenNode(); @@ -9946,6 +8743,7 @@ var ts; case 19 /* OpenBracketToken */: case 25 /* LessThanToken */: case 92 /* NewKeyword */: + case 9 /* StringLiteral */: return true; case 17 /* OpenParenToken */: // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier, @@ -10362,7 +9160,7 @@ var ts; return 1 /* True */; } // This *could* be a parenthesized arrow function. - // Return Unknown to let the caller know. + // Return Unknown to const the caller know. return 2 /* Unknown */; } else { @@ -10448,7 +9246,7 @@ var ts; // user meant to supply a block. For example, if the user wrote: // // a => - // let v = 0; + // const v = 0; // } // // they may be missing an open brace. Check to see if that's the case so we can @@ -10485,3202 +9283,4567 @@ var ts; function isInOrOfKeyword(t) { return t === 90 /* InKeyword */ || t === 134 /* OfKeyword */; } - function parseBinaryExpressionRest(precedence, leftOperand) { + function parseBinaryExpressionRest(precedence, leftOperand) { + while (true) { + // We either have a binary operator here, or we're finished. We call + // reScanGreaterToken so that we merge token sequences like > and = into >= + reScanGreaterToken(); + var newPrecedence = getBinaryOperatorPrecedence(); + // Check the precedence to see if we should "take" this operator + // - For left associative operator (all operator but **), consume the operator, + // recursively call the function below, and parse binaryExpression as a rightOperand + // of the caller if the new precendence of the operator is greater then or equal to the current precendence. + // For example: + // a - b - c; + // ^token; leftOperand = b. Return b to the caller as a rightOperand + // a * b - c + // ^token; leftOperand = b. Return b to the caller as a rightOperand + // a - b * c; + // ^token; leftOperand = b. Return b * c to the caller as a rightOperand + // - For right associative operator (**), consume the operator, recursively call the function + // and parse binaryExpression as a rightOperand of the caller if the new precendence of + // the operator is strictly grater than the current precendence + // For example: + // a ** b ** c; + // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand + // a - b ** c; + // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand + // a ** b - c + // ^token; leftOperand = b. Return b to the caller as a rightOperand + var consumeCurrentOperator = token === 38 /* AsteriskAsteriskToken */ ? + newPrecedence >= precedence : + newPrecedence > precedence; + if (!consumeCurrentOperator) { + break; + } + if (token === 90 /* InKeyword */ && inDisallowInContext()) { + break; + } + if (token === 116 /* AsKeyword */) { + // Make sure we *do* perform ASI for constructs like this: + // var x = foo + // as (Bar) + // This should be parsed as an initialized variable, followed + // by a function call to 'as' with the argument 'Bar' + if (scanner.hasPrecedingLineBreak()) { + break; + } + else { + nextToken(); + leftOperand = makeAsExpression(leftOperand, parseType()); + } + } + else { + leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + } + } + return leftOperand; + } + function isBinaryOperator() { + if (inDisallowInContext() && token === 90 /* InKeyword */) { + return false; + } + return getBinaryOperatorPrecedence() > 0; + } + function getBinaryOperatorPrecedence() { + switch (token) { + case 52 /* BarBarToken */: + return 1; + case 51 /* AmpersandAmpersandToken */: + return 2; + case 47 /* BarToken */: + return 3; + case 48 /* CaretToken */: + return 4; + case 46 /* AmpersandToken */: + return 5; + case 30 /* EqualsEqualsToken */: + case 31 /* ExclamationEqualsToken */: + case 32 /* EqualsEqualsEqualsToken */: + case 33 /* ExclamationEqualsEqualsToken */: + return 6; + case 25 /* LessThanToken */: + case 27 /* GreaterThanToken */: + case 28 /* LessThanEqualsToken */: + case 29 /* GreaterThanEqualsToken */: + case 91 /* InstanceOfKeyword */: + case 90 /* InKeyword */: + case 116 /* AsKeyword */: + return 7; + case 43 /* LessThanLessThanToken */: + case 44 /* GreaterThanGreaterThanToken */: + case 45 /* GreaterThanGreaterThanGreaterThanToken */: + return 8; + case 35 /* PlusToken */: + case 36 /* MinusToken */: + return 9; + case 37 /* AsteriskToken */: + case 39 /* SlashToken */: + case 40 /* PercentToken */: + return 10; + case 38 /* AsteriskAsteriskToken */: + return 11; + } + // -1 is lower than all other precedences. Returning it will cause binary expression + // parsing to stop. + return -1; + } + function makeBinaryExpression(left, operatorToken, right) { + var node = createNode(181 /* BinaryExpression */, left.pos); + node.left = left; + node.operatorToken = operatorToken; + node.right = right; + return finishNode(node); + } + function makeAsExpression(left, right) { + var node = createNode(189 /* AsExpression */, left.pos); + node.expression = left; + node.type = right; + return finishNode(node); + } + function parsePrefixUnaryExpression() { + var node = createNode(179 /* PrefixUnaryExpression */); + node.operator = token; + nextToken(); + node.operand = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseDeleteExpression() { + var node = createNode(175 /* DeleteExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseTypeOfExpression() { + var node = createNode(176 /* TypeOfExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function parseVoidExpression() { + var node = createNode(177 /* VoidExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + function isAwaitExpression() { + if (token === 119 /* AwaitKeyword */) { + if (inAwaitContext()) { + return true; + } + // here we are using similar heuristics as 'isYieldExpression' + return lookAhead(nextTokenIsIdentifierOnSameLine); + } + return false; + } + function parseAwaitExpression() { + var node = createNode(178 /* AwaitExpression */); + nextToken(); + node.expression = parseSimpleUnaryExpression(); + return finishNode(node); + } + /** + * Parse ES7 unary expression and await expression + * + * ES7 UnaryExpression: + * 1) SimpleUnaryExpression[?yield] + * 2) IncrementExpression[?yield] ** UnaryExpression[?yield] + */ + function parseUnaryExpressionOrHigher() { + if (isAwaitExpression()) { + return parseAwaitExpression(); + } + if (isIncrementExpression()) { + var incrementExpression = parseIncrementExpression(); + return token === 38 /* AsteriskAsteriskToken */ ? + parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : + incrementExpression; + } + var unaryOperator = token; + var simpleUnaryExpression = parseSimpleUnaryExpression(); + if (token === 38 /* AsteriskAsteriskToken */) { + var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); + if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); + } + else { + parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); + } + } + return simpleUnaryExpression; + } + /** + * Parse ES7 simple-unary expression or higher: + * + * ES7 SimpleUnaryExpression: + * 1) IncrementExpression[?yield] + * 2) delete UnaryExpression[?yield] + * 3) void UnaryExpression[?yield] + * 4) typeof UnaryExpression[?yield] + * 5) + UnaryExpression[?yield] + * 6) - UnaryExpression[?yield] + * 7) ~ UnaryExpression[?yield] + * 8) ! UnaryExpression[?yield] + */ + function parseSimpleUnaryExpression() { + switch (token) { + case 35 /* PlusToken */: + case 36 /* MinusToken */: + case 50 /* TildeToken */: + case 49 /* ExclamationToken */: + return parsePrefixUnaryExpression(); + case 78 /* DeleteKeyword */: + return parseDeleteExpression(); + case 101 /* TypeOfKeyword */: + return parseTypeOfExpression(); + case 103 /* VoidKeyword */: + return parseVoidExpression(); + case 25 /* LessThanToken */: + // This is modified UnaryExpression grammar in TypeScript + // UnaryExpression (modified): + // < type > UnaryExpression + return parseTypeAssertion(); + default: + return parseIncrementExpression(); + } + } + /** + * Check if the current token can possibly be an ES7 increment expression. + * + * ES7 IncrementExpression: + * LeftHandSideExpression[?Yield] + * LeftHandSideExpression[?Yield][no LineTerminator here]++ + * LeftHandSideExpression[?Yield][no LineTerminator here]-- + * ++LeftHandSideExpression[?Yield] + * --LeftHandSideExpression[?Yield] + */ + function isIncrementExpression() { + // This function is called inside parseUnaryExpression to decide + // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly + switch (token) { + case 35 /* PlusToken */: + case 36 /* MinusToken */: + case 50 /* TildeToken */: + case 49 /* ExclamationToken */: + case 78 /* DeleteKeyword */: + case 101 /* TypeOfKeyword */: + case 103 /* VoidKeyword */: + return false; + case 25 /* LessThanToken */: + // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression + if (sourceFile.languageVariant !== 1 /* JSX */) { + return false; + } + // We are in JSX context and the token is part of JSXElement. + // Fall through + default: + return true; + } + } + /** + * Parse ES7 IncrementExpression. IncrementExpression is used instead of ES6's PostFixExpression. + * + * ES7 IncrementExpression[yield]: + * 1) LeftHandSideExpression[?yield] + * 2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++ + * 3) LeftHandSideExpression[?yield] [[no LineTerminator here]]-- + * 4) ++LeftHandSideExpression[?yield] + * 5) --LeftHandSideExpression[?yield] + * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression + */ + function parseIncrementExpression() { + if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) { + var node = createNode(179 /* PrefixUnaryExpression */); + node.operator = token; + nextToken(); + node.operand = parseLeftHandSideExpressionOrHigher(); + return finishNode(node); + } + else if (sourceFile.languageVariant === 1 /* JSX */ && token === 25 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeyword)) { + // JSXElement is part of primaryExpression + return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); + } + var expression = parseLeftHandSideExpressionOrHigher(); + ts.Debug.assert(ts.isLeftHandSideExpression(expression)); + if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) { + var node = createNode(180 /* PostfixUnaryExpression */, expression.pos); + node.operand = expression; + node.operator = token; + nextToken(); + return finishNode(node); + } + return expression; + } + function parseLeftHandSideExpressionOrHigher() { + // Original Ecma: + // LeftHandSideExpression: See 11.2 + // NewExpression + // CallExpression + // + // Our simplification: + // + // LeftHandSideExpression: See 11.2 + // MemberExpression + // CallExpression + // + // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with + // MemberExpression to make our lives easier. + // + // to best understand the below code, it's important to see how CallExpression expands + // out into its own productions: + // + // CallExpression: + // MemberExpression Arguments + // CallExpression Arguments + // CallExpression[Expression] + // CallExpression.IdentifierName + // super ( ArgumentListopt ) + // super.IdentifierName + // + // Because of the recursion in these calls, we need to bottom out first. There are two + // bottom out states we can run into. Either we see 'super' which must start either of + // the last two CallExpression productions. Or we have a MemberExpression which either + // completes the LeftHandSideExpression, or starts the beginning of the first four + // CallExpression productions. + var expression = token === 95 /* SuperKeyword */ + ? parseSuperExpression() + : parseMemberExpressionOrHigher(); + // Now, we *may* be complete. However, we might have consumed the start of a + // CallExpression. As such, we need to consume the rest of it here to be complete. + return parseCallExpressionRest(expression); + } + function parseMemberExpressionOrHigher() { + // Note: to make our lives simpler, we decompose the the NewExpression productions and + // place ObjectCreationExpression and FunctionExpression into PrimaryExpression. + // like so: + // + // PrimaryExpression : See 11.1 + // this + // Identifier + // Literal + // ArrayLiteral + // ObjectLiteral + // (Expression) + // FunctionExpression + // new MemberExpression Arguments? + // + // MemberExpression : See 11.2 + // PrimaryExpression + // MemberExpression[Expression] + // MemberExpression.IdentifierName + // + // CallExpression : See 11.2 + // MemberExpression + // CallExpression Arguments + // CallExpression[Expression] + // CallExpression.IdentifierName + // + // Technically this is ambiguous. i.e. CallExpression defines: + // + // CallExpression: + // CallExpression Arguments + // + // If you see: "new Foo()" + // + // Then that could be treated as a single ObjectCreationExpression, or it could be + // treated as the invocation of "new Foo". We disambiguate that in code (to match + // the original grammar) by making sure that if we see an ObjectCreationExpression + // we always consume arguments if they are there. So we treat "new Foo()" as an + // object creation only, and not at all as an invocation) Another way to think + // about this is that for every "new" that we see, we will consume an argument list if + // it is there as part of the *associated* object creation node. Any additional + // argument lists we see, will become invocation expressions. + // + // Because there are no other places in the grammar now that refer to FunctionExpression + // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression + // production. + // + // Because CallExpression and MemberExpression are left recursive, we need to bottom out + // of the recursion immediately. So we parse out a primary expression to start with. + var expression = parsePrimaryExpression(); + return parseMemberExpressionRest(expression); + } + function parseSuperExpression() { + var expression = parseTokenNode(); + if (token === 17 /* OpenParenToken */ || token === 21 /* DotToken */ || token === 19 /* OpenBracketToken */) { + return expression; + } + // If we have seen "super" it must be followed by '(' or '.'. + // If it wasn't then just try to parse out a '.' and report an error. + var node = createNode(166 /* PropertyAccessExpression */, expression.pos); + node.expression = expression; + node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); + node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); + return finishNode(node); + } + function parseJsxElementOrSelfClosingElement(inExpressionContext) { + var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); + var result; + if (opening.kind === 235 /* JsxOpeningElement */) { + var node = createNode(233 /* JsxElement */, opening.pos); + node.openingElement = opening; + node.children = parseJsxChildren(node.openingElement.tagName); + node.closingElement = parseJsxClosingElement(inExpressionContext); + result = finishNode(node); + } + else { + ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */); + // Nothing else to do for self-closing elements + result = opening; + } + // If the user writes the invalid code '
' in an expression context (i.e. not wrapped in + // an enclosing tag), we'll naively try to parse ^ this as a 'less than' operator and the remainder of the tag + // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX + // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter + // does less damage and we can report a better error. + // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios + // of one sort or another. + if (inExpressionContext && token === 25 /* LessThanToken */) { + var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); }); + if (invalidElement) { + parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); + var badNode = createNode(181 /* BinaryExpression */, result.pos); + badNode.end = invalidElement.end; + badNode.left = result; + badNode.right = invalidElement; + badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); + badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; + return badNode; + } + } + return result; + } + function parseJsxText() { + var node = createNode(236 /* JsxText */, scanner.getStartPos()); + token = scanner.scanJsxToken(); + return finishNode(node); + } + function parseJsxChild() { + switch (token) { + case 236 /* JsxText */: + return parseJsxText(); + case 15 /* OpenBraceToken */: + return parseJsxExpression(/*inExpressionContext*/ false); + case 25 /* LessThanToken */: + return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ false); + } + ts.Debug.fail("Unknown JSX child kind " + token); + } + function parseJsxChildren(openingTagName) { + var result = []; + result.pos = scanner.getStartPos(); + var saveParsingContext = parsingContext; + parsingContext |= 1 << 14 /* JsxChildren */; while (true) { - // We either have a binary operator here, or we're finished. We call - // reScanGreaterToken so that we merge token sequences like > and = into >= - reScanGreaterToken(); - var newPrecedence = getBinaryOperatorPrecedence(); - // Check the precedence to see if we should "take" this operator - // - For left associative operator (all operator but **), consume the operator, - // recursively call the function below, and parse binaryExpression as a rightOperand - // of the caller if the new precendence of the operator is greater then or equal to the current precendence. - // For example: - // a - b - c; - // ^token; leftOperand = b. Return b to the caller as a rightOperand - // a * b - c - // ^token; leftOperand = b. Return b to the caller as a rightOperand - // a - b * c; - // ^token; leftOperand = b. Return b * c to the caller as a rightOperand - // - For right associative operator (**), consume the operator, recursively call the function - // and parse binaryExpression as a rightOperand of the caller if the new precendence of - // the operator is strictly grater than the current precendence - // For example: - // a ** b ** c; - // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand - // a - b ** c; - // ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand - // a ** b - c - // ^token; leftOperand = b. Return b to the caller as a rightOperand - var consumeCurrentOperator = token === 38 /* AsteriskAsteriskToken */ ? - newPrecedence >= precedence : - newPrecedence > precedence; - if (!consumeCurrentOperator) { + token = scanner.reScanJsxToken(); + if (token === 26 /* LessThanSlashToken */) { break; } - if (token === 90 /* InKeyword */ && inDisallowInContext()) { + else if (token === 1 /* EndOfFileToken */) { + parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); break; } - if (token === 116 /* AsKeyword */) { - // Make sure we *do* perform ASI for constructs like this: - // var x = foo - // as (Bar) - // This should be parsed as an initialized variable, followed - // by a function call to 'as' with the argument 'Bar' - if (scanner.hasPrecedingLineBreak()) { - break; - } - else { - nextToken(); - leftOperand = makeAsExpression(leftOperand, parseType()); - } + result.push(parseJsxChild()); + } + result.end = scanner.getTokenPos(); + parsingContext = saveParsingContext; + return result; + } + function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { + var fullStart = scanner.getStartPos(); + parseExpected(25 /* LessThanToken */); + var tagName = parseJsxElementName(); + var attributes = parseList(13 /* JsxAttributes */, parseJsxAttribute); + var node; + if (token === 27 /* GreaterThanToken */) { + // Closing tag, so scan the immediately-following text with the JSX scanning instead + // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate + // scanning errors + node = createNode(235 /* JsxOpeningElement */, fullStart); + scanJsxText(); + } + else { + parseExpected(39 /* SlashToken */); + if (inExpressionContext) { + parseExpected(27 /* GreaterThanToken */); } else { - leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); + scanJsxText(); } + node = createNode(234 /* JsxSelfClosingElement */, fullStart); } - return leftOperand; + node.tagName = tagName; + node.attributes = attributes; + return finishNode(node); } - function isBinaryOperator() { - if (inDisallowInContext() && token === 90 /* InKeyword */) { - return false; + function parseJsxElementName() { + scanJsxIdentifier(); + var elementName = parseIdentifierName(); + while (parseOptional(21 /* DotToken */)) { + scanJsxIdentifier(); + var node = createNode(135 /* QualifiedName */, elementName.pos); + node.left = elementName; + node.right = parseIdentifierName(); + elementName = finishNode(node); } - return getBinaryOperatorPrecedence() > 0; + return elementName; } - function getBinaryOperatorPrecedence() { - switch (token) { - case 52 /* BarBarToken */: - return 1; - case 51 /* AmpersandAmpersandToken */: - return 2; - case 47 /* BarToken */: - return 3; - case 48 /* CaretToken */: - return 4; - case 46 /* AmpersandToken */: - return 5; - case 30 /* EqualsEqualsToken */: - case 31 /* ExclamationEqualsToken */: - case 32 /* EqualsEqualsEqualsToken */: - case 33 /* ExclamationEqualsEqualsToken */: - return 6; - case 25 /* LessThanToken */: - case 27 /* GreaterThanToken */: - case 28 /* LessThanEqualsToken */: - case 29 /* GreaterThanEqualsToken */: - case 91 /* InstanceOfKeyword */: - case 90 /* InKeyword */: - case 116 /* AsKeyword */: - return 7; - case 43 /* LessThanLessThanToken */: - case 44 /* GreaterThanGreaterThanToken */: - case 45 /* GreaterThanGreaterThanGreaterThanToken */: - return 8; - case 35 /* PlusToken */: - case 36 /* MinusToken */: - return 9; - case 37 /* AsteriskToken */: - case 39 /* SlashToken */: - case 40 /* PercentToken */: - return 10; - case 38 /* AsteriskAsteriskToken */: - return 11; + function parseJsxExpression(inExpressionContext) { + var node = createNode(240 /* JsxExpression */); + parseExpected(15 /* OpenBraceToken */); + if (token !== 16 /* CloseBraceToken */) { + node.expression = parseExpression(); + } + if (inExpressionContext) { + parseExpected(16 /* CloseBraceToken */); + } + else { + parseExpected(16 /* CloseBraceToken */, /*message*/ undefined, /*advance*/ false); + scanJsxText(); } - // -1 is lower than all other precedences. Returning it will cause binary expression - // parsing to stop. - return -1; - } - function makeBinaryExpression(left, operatorToken, right) { - var node = createNode(181 /* BinaryExpression */, left.pos); - node.left = left; - node.operatorToken = operatorToken; - node.right = right; return finishNode(node); } - function makeAsExpression(left, right) { - var node = createNode(189 /* AsExpression */, left.pos); - node.expression = left; - node.type = right; + function parseJsxAttribute() { + if (token === 15 /* OpenBraceToken */) { + return parseJsxSpreadAttribute(); + } + scanJsxIdentifier(); + var node = createNode(238 /* JsxAttribute */); + node.name = parseIdentifierName(); + if (parseOptional(56 /* EqualsToken */)) { + switch (token) { + case 9 /* StringLiteral */: + node.initializer = parseLiteralNode(); + break; + default: + node.initializer = parseJsxExpression(/*inExpressionContext*/ true); + break; + } + } return finishNode(node); } - function parsePrefixUnaryExpression() { - var node = createNode(179 /* PrefixUnaryExpression */); - node.operator = token; - nextToken(); - node.operand = parseSimpleUnaryExpression(); + function parseJsxSpreadAttribute() { + var node = createNode(239 /* JsxSpreadAttribute */); + parseExpected(15 /* OpenBraceToken */); + parseExpected(22 /* DotDotDotToken */); + node.expression = parseExpression(); + parseExpected(16 /* CloseBraceToken */); return finishNode(node); } - function parseDeleteExpression() { - var node = createNode(175 /* DeleteExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); + function parseJsxClosingElement(inExpressionContext) { + var node = createNode(237 /* JsxClosingElement */); + parseExpected(26 /* LessThanSlashToken */); + node.tagName = parseJsxElementName(); + if (inExpressionContext) { + parseExpected(27 /* GreaterThanToken */); + } + else { + parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); + scanJsxText(); + } return finishNode(node); } - function parseTypeOfExpression() { - var node = createNode(176 /* TypeOfExpression */); - nextToken(); + function parseTypeAssertion() { + var node = createNode(171 /* TypeAssertionExpression */); + parseExpected(25 /* LessThanToken */); + node.type = parseType(); + parseExpected(27 /* GreaterThanToken */); node.expression = parseSimpleUnaryExpression(); return finishNode(node); } - function parseVoidExpression() { - var node = createNode(177 /* VoidExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseMemberExpressionRest(expression) { + while (true) { + var dotToken = parseOptionalToken(21 /* DotToken */); + if (dotToken) { + var propertyAccess = createNode(166 /* PropertyAccessExpression */, expression.pos); + propertyAccess.expression = expression; + propertyAccess.dotToken = dotToken; + propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); + expression = finishNode(propertyAccess); + continue; + } + // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName + if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) { + var indexedAccess = createNode(167 /* ElementAccessExpression */, expression.pos); + indexedAccess.expression = expression; + // It's not uncommon for a user to write: "new Type[]". + // Check for that common pattern and report a better error message. + if (token !== 20 /* CloseBracketToken */) { + indexedAccess.argumentExpression = allowInAnd(parseExpression); + if (indexedAccess.argumentExpression.kind === 9 /* StringLiteral */ || indexedAccess.argumentExpression.kind === 8 /* NumericLiteral */) { + var literal = indexedAccess.argumentExpression; + literal.text = internIdentifier(literal.text); + } + } + parseExpected(20 /* CloseBracketToken */); + expression = finishNode(indexedAccess); + continue; + } + if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) { + var tagExpression = createNode(170 /* TaggedTemplateExpression */, expression.pos); + tagExpression.tag = expression; + tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */ + ? parseLiteralNode() + : parseTemplateExpression(); + expression = finishNode(tagExpression); + continue; + } + return expression; + } } - function isAwaitExpression() { - if (token === 119 /* AwaitKeyword */) { - if (inAwaitContext()) { - return true; + function parseCallExpressionRest(expression) { + while (true) { + expression = parseMemberExpressionRest(expression); + if (token === 25 /* LessThanToken */) { + // See if this is the start of a generic invocation. If so, consume it and + // keep checking for postfix expressions. Otherwise, it's just a '<' that's + // part of an arithmetic expression. Break out so we consume it higher in the + // stack. + var typeArguments = tryParse(parseTypeArgumentsInExpression); + if (!typeArguments) { + return expression; + } + var callExpr = createNode(168 /* CallExpression */, expression.pos); + callExpr.expression = expression; + callExpr.typeArguments = typeArguments; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; } - // here we are using similar heuristics as 'isYieldExpression' - return lookAhead(nextTokenIsIdentifierOnSameLine); + else if (token === 17 /* OpenParenToken */) { + var callExpr = createNode(168 /* CallExpression */, expression.pos); + callExpr.expression = expression; + callExpr.arguments = parseArgumentList(); + expression = finishNode(callExpr); + continue; + } + return expression; } - return false; } - function parseAwaitExpression() { - var node = createNode(178 /* AwaitExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function parseArgumentList() { + parseExpected(17 /* OpenParenToken */); + var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression); + parseExpected(18 /* CloseParenToken */); + return result; } - /** - * Parse ES7 unary expression and await expression - * - * ES7 UnaryExpression: - * 1) SimpleUnaryExpression[?yield] - * 2) IncrementExpression[?yield] ** UnaryExpression[?yield] - */ - function parseUnaryExpressionOrHigher() { - if (isAwaitExpression()) { - return parseAwaitExpression(); - } - if (isIncrementExpression()) { - var incrementExpression = parseIncrementExpression(); - return token === 38 /* AsteriskAsteriskToken */ ? - parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) : - incrementExpression; + function parseTypeArgumentsInExpression() { + if (!parseOptional(25 /* LessThanToken */)) { + return undefined; } - var unaryOperator = token; - var simpleUnaryExpression = parseSimpleUnaryExpression(); - if (token === 38 /* AsteriskAsteriskToken */) { - var diagnostic; - var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); - if (simpleUnaryExpression.kind === 171 /* TypeAssertionExpression */) { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); - } - else { - parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator)); - } + var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType); + if (!parseExpected(27 /* GreaterThanToken */)) { + // If it doesn't have the closing > then it's definitely not an type argument list. + return undefined; } - return simpleUnaryExpression; + // If we have a '<', then only parse this as a arugment list if the type arguments + // are complete and we have an open paren. if we don't, rewind and return nothing. + return typeArguments && canFollowTypeArgumentsInExpression() + ? typeArguments + : undefined; } - /** - * Parse ES7 simple-unary expression or higher: - * - * ES7 SimpleUnaryExpression: - * 1) IncrementExpression[?yield] - * 2) delete UnaryExpression[?yield] - * 3) void UnaryExpression[?yield] - * 4) typeof UnaryExpression[?yield] - * 5) + UnaryExpression[?yield] - * 6) - UnaryExpression[?yield] - * 7) ~ UnaryExpression[?yield] - * 8) ! UnaryExpression[?yield] - */ - function parseSimpleUnaryExpression() { + function canFollowTypeArgumentsInExpression() { switch (token) { - case 35 /* PlusToken */: - case 36 /* MinusToken */: - case 50 /* TildeToken */: - case 49 /* ExclamationToken */: - return parsePrefixUnaryExpression(); - case 78 /* DeleteKeyword */: - return parseDeleteExpression(); - case 101 /* TypeOfKeyword */: - return parseTypeOfExpression(); - case 103 /* VoidKeyword */: - return parseVoidExpression(); - case 25 /* LessThanToken */: - // This is modified UnaryExpression grammar in TypeScript - // UnaryExpression (modified): - // < type > UnaryExpression - return parseTypeAssertion(); + case 17 /* OpenParenToken */: // foo( + // this case are the only case where this token can legally follow a type argument + // list. So we definitely want to treat this as a type arg list. + case 21 /* DotToken */: // foo. + case 18 /* CloseParenToken */: // foo) + case 20 /* CloseBracketToken */: // foo] + case 54 /* ColonToken */: // foo: + case 23 /* SemicolonToken */: // foo; + case 53 /* QuestionToken */: // foo? + case 30 /* EqualsEqualsToken */: // foo == + case 32 /* EqualsEqualsEqualsToken */: // foo === + case 31 /* ExclamationEqualsToken */: // foo != + case 33 /* ExclamationEqualsEqualsToken */: // foo !== + case 51 /* AmpersandAmpersandToken */: // foo && + case 52 /* BarBarToken */: // foo || + case 48 /* CaretToken */: // foo ^ + case 46 /* AmpersandToken */: // foo & + case 47 /* BarToken */: // foo | + case 16 /* CloseBraceToken */: // foo } + case 1 /* EndOfFileToken */: + // these cases can't legally follow a type arg list. However, they're not legal + // expressions either. The user is probably in the middle of a generic type. So + // treat it as such. + return true; + case 24 /* CommaToken */: // foo, + case 15 /* OpenBraceToken */: // foo { + // We don't want to treat these as type arguments. Otherwise we'll parse this + // as an invocation expression. Instead, we want to parse out the expression + // in isolation from the type arguments. default: - return parseIncrementExpression(); + // Anything else treat as an expression. + return false; } } - /** - * Check if the current token can possibly be an ES7 increment expression. - * - * ES7 IncrementExpression: - * LeftHandSideExpression[?Yield] - * LeftHandSideExpression[?Yield][no LineTerminator here]++ - * LeftHandSideExpression[?Yield][no LineTerminator here]-- - * ++LeftHandSideExpression[?Yield] - * --LeftHandSideExpression[?Yield] - */ - function isIncrementExpression() { - // This function is called inside parseUnaryExpression to decide - // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly + function parsePrimaryExpression() { switch (token) { - case 35 /* PlusToken */: - case 36 /* MinusToken */: - case 50 /* TildeToken */: - case 49 /* ExclamationToken */: - case 78 /* DeleteKeyword */: - case 101 /* TypeOfKeyword */: - case 103 /* VoidKeyword */: - return false; - case 25 /* LessThanToken */: - // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression - if (sourceFile.languageVariant !== 1 /* JSX */) { - return false; + case 8 /* NumericLiteral */: + case 9 /* StringLiteral */: + case 11 /* NoSubstitutionTemplateLiteral */: + return parseLiteralNode(); + case 97 /* ThisKeyword */: + case 95 /* SuperKeyword */: + case 93 /* NullKeyword */: + case 99 /* TrueKeyword */: + case 84 /* FalseKeyword */: + return parseTokenNode(); + case 17 /* OpenParenToken */: + return parseParenthesizedExpression(); + case 19 /* OpenBracketToken */: + return parseArrayLiteralExpression(); + case 15 /* OpenBraceToken */: + return parseObjectLiteralExpression(); + case 118 /* AsyncKeyword */: + // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher. + // If we encounter `async [no LineTerminator here] function` then this is an async + // function; otherwise, its an identifier. + if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { + break; } - // We are in JSX context and the token is part of JSXElement. - // Fall through - default: - return true; + return parseFunctionExpression(); + case 73 /* ClassKeyword */: + return parseClassExpression(); + case 87 /* FunctionKeyword */: + return parseFunctionExpression(); + case 92 /* NewKeyword */: + return parseNewExpression(); + case 39 /* SlashToken */: + case 61 /* SlashEqualsToken */: + if (reScanSlashToken() === 10 /* RegularExpressionLiteral */) { + return parseLiteralNode(); + } + break; + case 12 /* TemplateHead */: + return parseTemplateExpression(); + } + return parseIdentifier(ts.Diagnostics.Expression_expected); + } + function parseParenthesizedExpression() { + var node = createNode(172 /* ParenthesizedExpression */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + return finishNode(node); + } + function parseSpreadElement() { + var node = createNode(185 /* SpreadElementExpression */); + parseExpected(22 /* DotDotDotToken */); + node.expression = parseAssignmentExpressionOrHigher(); + return finishNode(node); + } + function parseArgumentOrArrayLiteralElement() { + return token === 22 /* DotDotDotToken */ ? parseSpreadElement() : + token === 24 /* CommaToken */ ? createNode(187 /* OmittedExpression */) : + parseAssignmentExpressionOrHigher(); + } + function parseArgumentExpression() { + return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); + } + function parseArrayLiteralExpression() { + var node = createNode(164 /* ArrayLiteralExpression */); + parseExpected(19 /* OpenBracketToken */); + if (scanner.hasPrecedingLineBreak()) + node.flags |= 1024 /* MultiLine */; + node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); + parseExpected(20 /* CloseBracketToken */); + return finishNode(node); + } + function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { + if (parseContextualModifier(123 /* GetKeyword */)) { + return parseAccessorDeclaration(145 /* GetAccessor */, fullStart, decorators, modifiers); + } + else if (parseContextualModifier(129 /* SetKeyword */)) { + return parseAccessorDeclaration(146 /* SetAccessor */, fullStart, decorators, modifiers); } + return undefined; } - /** - * Parse ES7 IncrementExpression. IncrementExpression is used instead of ES6's PostFixExpression. - * - * ES7 IncrementExpression[yield]: - * 1) LeftHandSideExpression[?yield] - * 2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++ - * 3) LeftHandSideExpression[?yield] [[no LineTerminator here]]-- - * 4) ++LeftHandSideExpression[?yield] - * 5) --LeftHandSideExpression[?yield] - * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression - */ - function parseIncrementExpression() { - if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) { - var node = createNode(179 /* PrefixUnaryExpression */); - node.operator = token; - nextToken(); - node.operand = parseLeftHandSideExpressionOrHigher(); - return finishNode(node); + function parseObjectLiteralElement() { + var fullStart = scanner.getStartPos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; } - else if (sourceFile.languageVariant === 1 /* JSX */ && token === 25 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeyword)) { - // JSXElement is part of primaryExpression - return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); + var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var tokenIsIdentifier = isIdentifier(); + var nameToken = token; + var propertyName = parsePropertyName(); + // Disallowing of optional property assignments happens in the grammar checker. + var questionToken = parseOptionalToken(53 /* QuestionToken */); + if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); } - var expression = parseLeftHandSideExpressionOrHigher(); - ts.Debug.assert(ts.isLeftHandSideExpression(expression)); - if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) { - var node = createNode(180 /* PostfixUnaryExpression */, expression.pos); - node.operand = expression; - node.operator = token; - nextToken(); - return finishNode(node); + // check if it is short-hand property assignment or normal property assignment + // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production + // CoverInitializedName[Yield] : + // IdentifierReference[?Yield] Initializer[In, ?Yield] + // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern + var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */); + if (isShorthandPropertyAssignment) { + var shorthandDeclaration = createNode(246 /* ShorthandPropertyAssignment */, fullStart); + shorthandDeclaration.name = propertyName; + shorthandDeclaration.questionToken = questionToken; + var equalsToken = parseOptionalToken(56 /* EqualsToken */); + if (equalsToken) { + shorthandDeclaration.equalsToken = equalsToken; + shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); + } + return finishNode(shorthandDeclaration); + } + else { + var propertyAssignment = createNode(245 /* PropertyAssignment */, fullStart); + propertyAssignment.name = propertyName; + propertyAssignment.questionToken = questionToken; + parseExpected(54 /* ColonToken */); + propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); + return finishNode(propertyAssignment); } - return expression; } - function parseLeftHandSideExpressionOrHigher() { - // Original Ecma: - // LeftHandSideExpression: See 11.2 - // NewExpression - // CallExpression - // - // Our simplification: - // - // LeftHandSideExpression: See 11.2 - // MemberExpression - // CallExpression - // - // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with - // MemberExpression to make our lives easier. - // - // to best understand the below code, it's important to see how CallExpression expands - // out into its own productions: - // - // CallExpression: - // MemberExpression Arguments - // CallExpression Arguments - // CallExpression[Expression] - // CallExpression.IdentifierName - // super ( ArgumentListopt ) - // super.IdentifierName - // - // Because of the recursion in these calls, we need to bottom out first. There are two - // bottom out states we can run into. Either we see 'super' which must start either of - // the last two CallExpression productions. Or we have a MemberExpression which either - // completes the LeftHandSideExpression, or starts the beginning of the first four - // CallExpression productions. - var expression = token === 95 /* SuperKeyword */ - ? parseSuperExpression() - : parseMemberExpressionOrHigher(); - // Now, we *may* be complete. However, we might have consumed the start of a - // CallExpression. As such, we need to consume the rest of it here to be complete. - return parseCallExpressionRest(expression); + function parseObjectLiteralExpression() { + var node = createNode(165 /* ObjectLiteralExpression */); + parseExpected(15 /* OpenBraceToken */); + if (scanner.hasPrecedingLineBreak()) { + node.flags |= 1024 /* MultiLine */; + } + node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true); + parseExpected(16 /* CloseBraceToken */); + return finishNode(node); } - function parseMemberExpressionOrHigher() { - // Note: to make our lives simpler, we decompose the the NewExpression productions and - // place ObjectCreationExpression and FunctionExpression into PrimaryExpression. - // like so: - // - // PrimaryExpression : See 11.1 - // this - // Identifier - // Literal - // ArrayLiteral - // ObjectLiteral - // (Expression) - // FunctionExpression - // new MemberExpression Arguments? - // - // MemberExpression : See 11.2 - // PrimaryExpression - // MemberExpression[Expression] - // MemberExpression.IdentifierName - // - // CallExpression : See 11.2 - // MemberExpression - // CallExpression Arguments - // CallExpression[Expression] - // CallExpression.IdentifierName - // - // Technically this is ambiguous. i.e. CallExpression defines: - // - // CallExpression: - // CallExpression Arguments - // - // If you see: "new Foo()" - // - // Then that could be treated as a single ObjectCreationExpression, or it could be - // treated as the invocation of "new Foo". We disambiguate that in code (to match - // the original grammar) by making sure that if we see an ObjectCreationExpression - // we always consume arguments if they are there. So we treat "new Foo()" as an - // object creation only, and not at all as an invocation) Another way to think - // about this is that for every "new" that we see, we will consume an argument list if - // it is there as part of the *associated* object creation node. Any additional - // argument lists we see, will become invocation expressions. - // - // Because there are no other places in the grammar now that refer to FunctionExpression - // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression - // production. + function parseFunctionExpression() { + // GeneratorExpression: + // function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody } // - // Because CallExpression and MemberExpression are left recursive, we need to bottom out - // of the recursion immediately. So we parse out a primary expression to start with. - var expression = parsePrimaryExpression(); - return parseMemberExpressionRest(expression); + // FunctionExpression: + // function BindingIdentifier[opt](FormalParameters){ FunctionBody } + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); + } + var node = createNode(173 /* FunctionExpression */); + setModifiers(node, parseModifiers()); + parseExpected(87 /* FunctionKeyword */); + node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var isGenerator = !!node.asteriskToken; + var isAsync = !!(node.flags & 256 /* Async */); + node.name = + isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : + isGenerator ? doInYieldContext(parseOptionalIdentifier) : + isAsync ? doInAwaitContext(parseOptionalIdentifier) : + parseOptionalIdentifier(); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false); + if (saveDecoratorContext) { + setDecoratorContext(true); + } + return finishNode(node); } - function parseSuperExpression() { - var expression = parseTokenNode(); - if (token === 17 /* OpenParenToken */ || token === 21 /* DotToken */ || token === 19 /* OpenBracketToken */) { - return expression; + function parseOptionalIdentifier() { + return isIdentifier() ? parseIdentifier() : undefined; + } + function parseNewExpression() { + var node = createNode(169 /* NewExpression */); + parseExpected(92 /* NewKeyword */); + node.expression = parseMemberExpressionOrHigher(); + node.typeArguments = tryParse(parseTypeArgumentsInExpression); + if (node.typeArguments || token === 17 /* OpenParenToken */) { + node.arguments = parseArgumentList(); } - // If we have seen "super" it must be followed by '(' or '.'. - // If it wasn't then just try to parse out a '.' and report an error. - var node = createNode(166 /* PropertyAccessExpression */, expression.pos); - node.expression = expression; - node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); - node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); return finishNode(node); } - function parseJsxElementOrSelfClosingElement(inExpressionContext) { - var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext); - var result; - if (opening.kind === 235 /* JsxOpeningElement */) { - var node = createNode(233 /* JsxElement */, opening.pos); - node.openingElement = opening; - node.children = parseJsxChildren(node.openingElement.tagName); - node.closingElement = parseJsxClosingElement(inExpressionContext); - result = finishNode(node); + // STATEMENTS + function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { + var node = createNode(192 /* Block */); + if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) { + node.statements = parseList(1 /* BlockStatements */, parseStatement); + parseExpected(16 /* CloseBraceToken */); } else { - ts.Debug.assert(opening.kind === 234 /* JsxSelfClosingElement */); - // Nothing else to do for self-closing elements - result = opening; + node.statements = createMissingList(); } - // If the user writes the invalid code '
' in an expression context (i.e. not wrapped in - // an enclosing tag), we'll naively try to parse ^ this as a 'less than' operator and the remainder of the tag - // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX - // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter - // does less damage and we can report a better error. - // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios - // of one sort or another. - if (inExpressionContext && token === 25 /* LessThanToken */) { - var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); }); - if (invalidElement) { - parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); - var badNode = createNode(181 /* BinaryExpression */, result.pos); - badNode.end = invalidElement.end; - badNode.left = result; - badNode.right = invalidElement; - badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); - badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; - return badNode; - } + return finishNode(node); + } + function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { + var savedYieldContext = inYieldContext(); + setYieldContext(allowYield); + var savedAwaitContext = inAwaitContext(); + setAwaitContext(allowAwait); + // We may be in a [Decorator] context when parsing a function expression or + // arrow function. The body of the function is not in [Decorator] context. + var saveDecoratorContext = inDecoratorContext(); + if (saveDecoratorContext) { + setDecoratorContext(false); } - return result; + var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); + if (saveDecoratorContext) { + setDecoratorContext(true); + } + setYieldContext(savedYieldContext); + setAwaitContext(savedAwaitContext); + return block; } - function parseJsxText() { - var node = createNode(236 /* JsxText */, scanner.getStartPos()); - token = scanner.scanJsxToken(); + function parseEmptyStatement() { + var node = createNode(194 /* EmptyStatement */); + parseExpected(23 /* SemicolonToken */); return finishNode(node); } - function parseJsxChild() { - switch (token) { - case 236 /* JsxText */: - return parseJsxText(); - case 15 /* OpenBraceToken */: - return parseJsxExpression(/*inExpressionContext*/ false); - case 25 /* LessThanToken */: - return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ false); - } - ts.Debug.fail("Unknown JSX child kind " + token); + function parseIfStatement() { + var node = createNode(196 /* IfStatement */); + parseExpected(88 /* IfKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.thenStatement = parseStatement(); + node.elseStatement = parseOptional(80 /* ElseKeyword */) ? parseStatement() : undefined; + return finishNode(node); } - function parseJsxChildren(openingTagName) { - var result = []; - result.pos = scanner.getStartPos(); - var saveParsingContext = parsingContext; - parsingContext |= 1 << 14 /* JsxChildren */; - while (true) { - token = scanner.reScanJsxToken(); - if (token === 26 /* LessThanSlashToken */) { - break; + function parseDoStatement() { + var node = createNode(197 /* DoStatement */); + parseExpected(79 /* DoKeyword */); + node.statement = parseStatement(); + parseExpected(104 /* WhileKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html + // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in + // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby + // do;while(0)x will have a semicolon inserted before x. + parseOptional(23 /* SemicolonToken */); + return finishNode(node); + } + function parseWhileStatement() { + var node = createNode(198 /* WhileStatement */); + parseExpected(104 /* WhileKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.statement = parseStatement(); + return finishNode(node); + } + function parseForOrForInOrForOfStatement() { + var pos = getNodePos(); + parseExpected(86 /* ForKeyword */); + parseExpected(17 /* OpenParenToken */); + var initializer = undefined; + if (token !== 23 /* SemicolonToken */) { + if (token === 102 /* VarKeyword */ || token === 108 /* LetKeyword */ || token === 74 /* ConstKeyword */) { + initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true); } - else if (token === 1 /* EndOfFileToken */) { - parseErrorAtCurrentToken(ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, openingTagName)); - break; + else { + initializer = disallowInAnd(parseExpression); } - result.push(parseJsxChild()); } - result.end = scanner.getTokenPos(); - parsingContext = saveParsingContext; - return result; - } - function parseJsxOpeningOrSelfClosingElement(inExpressionContext) { - var fullStart = scanner.getStartPos(); - parseExpected(25 /* LessThanToken */); - var tagName = parseJsxElementName(); - var attributes = parseList(13 /* JsxAttributes */, parseJsxAttribute); - var node; - if (token === 27 /* GreaterThanToken */) { - // Closing tag, so scan the immediately-following text with the JSX scanning instead - // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate - // scanning errors - node = createNode(235 /* JsxOpeningElement */, fullStart); - scanJsxText(); + var forOrForInOrForOfStatement; + if (parseOptional(90 /* InKeyword */)) { + var forInStatement = createNode(200 /* ForInStatement */, pos); + forInStatement.initializer = initializer; + forInStatement.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forInStatement; + } + else if (parseOptional(134 /* OfKeyword */)) { + var forOfStatement = createNode(201 /* ForOfStatement */, pos); + forOfStatement.initializer = initializer; + forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forOfStatement; } else { - parseExpected(39 /* SlashToken */); - if (inExpressionContext) { - parseExpected(27 /* GreaterThanToken */); + var forStatement = createNode(199 /* ForStatement */, pos); + forStatement.initializer = initializer; + parseExpected(23 /* SemicolonToken */); + if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) { + forStatement.condition = allowInAnd(parseExpression); } - else { - parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); - scanJsxText(); + parseExpected(23 /* SemicolonToken */); + if (token !== 18 /* CloseParenToken */) { + forStatement.incrementor = allowInAnd(parseExpression); } - node = createNode(234 /* JsxSelfClosingElement */, fullStart); + parseExpected(18 /* CloseParenToken */); + forOrForInOrForOfStatement = forStatement; } - node.tagName = tagName; - node.attributes = attributes; + forOrForInOrForOfStatement.statement = parseStatement(); + return finishNode(forOrForInOrForOfStatement); + } + function parseBreakOrContinueStatement(kind) { + var node = createNode(kind); + parseExpected(kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */); + if (!canParseSemicolon()) { + node.label = parseIdentifier(); + } + parseSemicolon(); return finishNode(node); } - function parseJsxElementName() { - scanJsxIdentifier(); - var elementName = parseIdentifierName(); - while (parseOptional(21 /* DotToken */)) { - scanJsxIdentifier(); - var node = createNode(135 /* QualifiedName */, elementName.pos); - node.left = elementName; - node.right = parseIdentifierName(); - elementName = finishNode(node); + function parseReturnStatement() { + var node = createNode(204 /* ReturnStatement */); + parseExpected(94 /* ReturnKeyword */); + if (!canParseSemicolon()) { + node.expression = allowInAnd(parseExpression); } - return elementName; + parseSemicolon(); + return finishNode(node); } - function parseJsxExpression(inExpressionContext) { - var node = createNode(240 /* JsxExpression */); + function parseWithStatement() { + var node = createNode(205 /* WithStatement */); + parseExpected(105 /* WithKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + node.statement = parseStatement(); + return finishNode(node); + } + function parseCaseClause() { + var node = createNode(241 /* CaseClause */); + parseExpected(71 /* CaseKeyword */); + node.expression = allowInAnd(parseExpression); + parseExpected(54 /* ColonToken */); + node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(node); + } + function parseDefaultClause() { + var node = createNode(242 /* DefaultClause */); + parseExpected(77 /* DefaultKeyword */); + parseExpected(54 /* ColonToken */); + node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(node); + } + function parseCaseOrDefaultClause() { + return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + } + function parseSwitchStatement() { + var node = createNode(206 /* SwitchStatement */); + parseExpected(96 /* SwitchKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = allowInAnd(parseExpression); + parseExpected(18 /* CloseParenToken */); + var caseBlock = createNode(220 /* CaseBlock */, scanner.getStartPos()); parseExpected(15 /* OpenBraceToken */); - if (token !== 16 /* CloseBraceToken */) { - node.expression = parseExpression(); - } - if (inExpressionContext) { - parseExpected(16 /* CloseBraceToken */); - } - else { - parseExpected(16 /* CloseBraceToken */, /*message*/ undefined, /*advance*/ false); - scanJsxText(); - } + caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); + parseExpected(16 /* CloseBraceToken */); + node.caseBlock = finishNode(caseBlock); return finishNode(node); } - function parseJsxAttribute() { - if (token === 15 /* OpenBraceToken */) { - return parseJsxSpreadAttribute(); - } - scanJsxIdentifier(); - var node = createNode(238 /* JsxAttribute */); - node.name = parseIdentifierName(); - if (parseOptional(56 /* EqualsToken */)) { - switch (token) { - case 9 /* StringLiteral */: - node.initializer = parseLiteralNode(); - break; - default: - node.initializer = parseJsxExpression(/*inExpressionContext*/ true); - break; - } + function parseThrowStatement() { + // ThrowStatement[Yield] : + // throw [no LineTerminator here]Expression[In, ?Yield]; + // Because of automatic semicolon insertion, we need to report error if this + // throw could be terminated with a semicolon. Note: we can't call 'parseExpression' + // directly as that might consume an expression on the following line. + // We just return 'undefined' in that case. The actual error will be reported in the + // grammar walker. + var node = createNode(208 /* ThrowStatement */); + parseExpected(98 /* ThrowKeyword */); + node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + parseSemicolon(); + return finishNode(node); + } + // TODO: Review for error recovery + function parseTryStatement() { + var node = createNode(209 /* TryStatement */); + parseExpected(100 /* TryKeyword */); + node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); + node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined; + // If we don't have a catch clause, then we must have a finally clause. Try to parse + // one out no matter what. + if (!node.catchClause || token === 85 /* FinallyKeyword */) { + parseExpected(85 /* FinallyKeyword */); + node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); } return finishNode(node); } - function parseJsxSpreadAttribute() { - var node = createNode(239 /* JsxSpreadAttribute */); - parseExpected(15 /* OpenBraceToken */); - parseExpected(22 /* DotDotDotToken */); - node.expression = parseExpression(); - parseExpected(16 /* CloseBraceToken */); + function parseCatchClause() { + var result = createNode(244 /* CatchClause */); + parseExpected(72 /* CatchKeyword */); + if (parseExpected(17 /* OpenParenToken */)) { + result.variableDeclaration = parseVariableDeclaration(); + } + parseExpected(18 /* CloseParenToken */); + result.block = parseBlock(/*ignoreMissingOpenBrace*/ false); + return finishNode(result); + } + function parseDebuggerStatement() { + var node = createNode(210 /* DebuggerStatement */); + parseExpected(76 /* DebuggerKeyword */); + parseSemicolon(); return finishNode(node); } - function parseJsxClosingElement(inExpressionContext) { - var node = createNode(237 /* JsxClosingElement */); - parseExpected(26 /* LessThanSlashToken */); - node.tagName = parseJsxElementName(); - if (inExpressionContext) { - parseExpected(27 /* GreaterThanToken */); + function parseExpressionOrLabeledStatement() { + // Avoiding having to do the lookahead for a labeled statement by just trying to parse + // out an expression, seeing if it is identifier and then seeing if it is followed by + // a colon. + var fullStart = scanner.getStartPos(); + var expression = allowInAnd(parseExpression); + if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) { + var labeledStatement = createNode(207 /* LabeledStatement */, fullStart); + labeledStatement.label = expression; + labeledStatement.statement = parseStatement(); + return finishNode(labeledStatement); } else { - parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*advance*/ false); - scanJsxText(); + var expressionStatement = createNode(195 /* ExpressionStatement */, fullStart); + expressionStatement.expression = expression; + parseSemicolon(); + return finishNode(expressionStatement); } - return finishNode(node); } - function parseTypeAssertion() { - var node = createNode(171 /* TypeAssertionExpression */); - parseExpected(25 /* LessThanToken */); - node.type = parseType(); - parseExpected(27 /* GreaterThanToken */); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + function nextTokenIsIdentifierOrKeywordOnSameLine() { + nextToken(); + return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); } - function parseMemberExpressionRest(expression) { - while (true) { - var dotToken = parseOptionalToken(21 /* DotToken */); - if (dotToken) { - var propertyAccess = createNode(166 /* PropertyAccessExpression */, expression.pos); - propertyAccess.expression = expression; - propertyAccess.dotToken = dotToken; - propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true); - expression = finishNode(propertyAccess); - continue; - } - // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName - if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) { - var indexedAccess = createNode(167 /* ElementAccessExpression */, expression.pos); - indexedAccess.expression = expression; - // It's not uncommon for a user to write: "new Type[]". - // Check for that common pattern and report a better error message. - if (token !== 20 /* CloseBracketToken */) { - indexedAccess.argumentExpression = allowInAnd(parseExpression); - if (indexedAccess.argumentExpression.kind === 9 /* StringLiteral */ || indexedAccess.argumentExpression.kind === 8 /* NumericLiteral */) { - var literal = indexedAccess.argumentExpression; - literal.text = internIdentifier(literal.text); - } - } - parseExpected(20 /* CloseBracketToken */); - expression = finishNode(indexedAccess); - continue; - } - if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) { - var tagExpression = createNode(170 /* TaggedTemplateExpression */, expression.pos); - tagExpression.tag = expression; - tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */ - ? parseLiteralNode() - : parseTemplateExpression(); - expression = finishNode(tagExpression); - continue; - } - return expression; - } + function nextTokenIsFunctionKeywordOnSameLine() { + nextToken(); + return token === 87 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); } - function parseCallExpressionRest(expression) { + function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { + nextToken(); + return (ts.tokenIsIdentifierOrKeyword(token) || token === 8 /* NumericLiteral */) && !scanner.hasPrecedingLineBreak(); + } + function isDeclaration() { while (true) { - expression = parseMemberExpressionRest(expression); - if (token === 25 /* LessThanToken */) { - // See if this is the start of a generic invocation. If so, consume it and - // keep checking for postfix expressions. Otherwise, it's just a '<' that's - // part of an arithmetic expression. Break out so we consume it higher in the - // stack. - var typeArguments = tryParse(parseTypeArgumentsInExpression); - if (!typeArguments) { - return expression; - } - var callExpr = createNode(168 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.typeArguments = typeArguments; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; - } - else if (token === 17 /* OpenParenToken */) { - var callExpr = createNode(168 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.arguments = parseArgumentList(); - expression = finishNode(callExpr); - continue; + switch (token) { + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 74 /* ConstKeyword */: + case 87 /* FunctionKeyword */: + case 73 /* ClassKeyword */: + case 81 /* EnumKeyword */: + return true; + // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers; + // however, an identifier cannot be followed by another identifier on the same line. This is what we + // count on to parse out the respective declarations. For instance, we exploit this to say that + // + // namespace n + // + // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees + // + // namespace + // n + // + // as the identifier 'namespace' on one line followed by the identifier 'n' on another. + // We need to look one token ahead to see if it permissible to try parsing a declaration. + // + // *Note*: 'interface' is actually a strict mode reserved word. So while + // + // "use strict" + // interface + // I {} + // + // could be legal, it would add complexity for very little gain. + case 107 /* InterfaceKeyword */: + case 132 /* TypeKeyword */: + return nextTokenIsIdentifierOnSameLine(); + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + return nextTokenIsIdentifierOrStringLiteralOnSameLine(); + case 115 /* AbstractKeyword */: + case 118 /* AsyncKeyword */: + case 122 /* DeclareKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 112 /* PublicKeyword */: + nextToken(); + // ASI takes effect for this modifier. + if (scanner.hasPrecedingLineBreak()) { + return false; + } + continue; + case 89 /* ImportKeyword */: + nextToken(); + return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token); + case 82 /* ExportKeyword */: + nextToken(); + if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) { + return true; + } + continue; + case 113 /* StaticKeyword */: + nextToken(); + continue; + default: + return false; } - return expression; } } - function parseArgumentList() { - parseExpected(17 /* OpenParenToken */); - var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression); - parseExpected(18 /* CloseParenToken */); - return result; - } - function parseTypeArgumentsInExpression() { - if (!parseOptional(25 /* LessThanToken */)) { - return undefined; - } - var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType); - if (!parseExpected(27 /* GreaterThanToken */)) { - // If it doesn't have the closing > then it's definitely not an type argument list. - return undefined; - } - // If we have a '<', then only parse this as a arugment list if the type arguments - // are complete and we have an open paren. if we don't, rewind and return nothing. - return typeArguments && canFollowTypeArgumentsInExpression() - ? typeArguments - : undefined; + function isStartOfDeclaration() { + return lookAhead(isDeclaration); } - function canFollowTypeArgumentsInExpression() { + function isStartOfStatement() { switch (token) { - case 17 /* OpenParenToken */: // foo( - // this case are the only case where this token can legally follow a type argument - // list. So we definitely want to treat this as a type arg list. - case 21 /* DotToken */: // foo. - case 18 /* CloseParenToken */: // foo) - case 20 /* CloseBracketToken */: // foo] - case 54 /* ColonToken */: // foo: - case 23 /* SemicolonToken */: // foo; - case 53 /* QuestionToken */: // foo? - case 30 /* EqualsEqualsToken */: // foo == - case 32 /* EqualsEqualsEqualsToken */: // foo === - case 31 /* ExclamationEqualsToken */: // foo != - case 33 /* ExclamationEqualsEqualsToken */: // foo !== - case 51 /* AmpersandAmpersandToken */: // foo && - case 52 /* BarBarToken */: // foo || - case 48 /* CaretToken */: // foo ^ - case 46 /* AmpersandToken */: // foo & - case 47 /* BarToken */: // foo | - case 16 /* CloseBraceToken */: // foo } - case 1 /* EndOfFileToken */: - // these cases can't legally follow a type arg list. However, they're not legal - // expressions either. The user is probably in the middle of a generic type. So - // treat it as such. + case 55 /* AtToken */: + case 23 /* SemicolonToken */: + case 15 /* OpenBraceToken */: + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 87 /* FunctionKeyword */: + case 73 /* ClassKeyword */: + case 81 /* EnumKeyword */: + case 88 /* IfKeyword */: + case 79 /* DoKeyword */: + case 104 /* WhileKeyword */: + case 86 /* ForKeyword */: + case 75 /* ContinueKeyword */: + case 70 /* BreakKeyword */: + case 94 /* ReturnKeyword */: + case 105 /* WithKeyword */: + case 96 /* SwitchKeyword */: + case 98 /* ThrowKeyword */: + case 100 /* TryKeyword */: + case 76 /* DebuggerKeyword */: + // 'catch' and 'finally' do not actually indicate that the code is part of a statement, + // however, we say they are here so that we may gracefully parse them and error later. + case 72 /* CatchKeyword */: + case 85 /* FinallyKeyword */: return true; - case 24 /* CommaToken */: // foo, - case 15 /* OpenBraceToken */: // foo { - // We don't want to treat these as type arguments. Otherwise we'll parse this - // as an invocation expression. Instead, we want to parse out the expression - // in isolation from the type arguments. + case 74 /* ConstKeyword */: + case 82 /* ExportKeyword */: + case 89 /* ImportKeyword */: + return isStartOfDeclaration(); + case 118 /* AsyncKeyword */: + case 122 /* DeclareKeyword */: + case 107 /* InterfaceKeyword */: + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + case 132 /* TypeKeyword */: + // When these don't start a declaration, they're an identifier in an expression statement + return true; + case 112 /* PublicKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 113 /* StaticKeyword */: + // When these don't start a declaration, they may be the start of a class member if an identifier + // immediately follows. Otherwise they're an identifier in an expression statement. + return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); default: - // Anything else treat as an expression. - return false; + return isStartOfExpression(); } } - function parsePrimaryExpression() { + function nextTokenIsIdentifierOrStartOfDestructuring() { + nextToken(); + return isIdentifier() || token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */; + } + function isLetDeclaration() { + // In ES6 'let' always starts a lexical declaration if followed by an identifier or { + // or [. + return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + } + function parseStatement() { switch (token) { - case 8 /* NumericLiteral */: - case 9 /* StringLiteral */: - case 11 /* NoSubstitutionTemplateLiteral */: - return parseLiteralNode(); - case 97 /* ThisKeyword */: - case 95 /* SuperKeyword */: - case 93 /* NullKeyword */: - case 99 /* TrueKeyword */: - case 84 /* FalseKeyword */: - return parseTokenNode(); - case 17 /* OpenParenToken */: - return parseParenthesizedExpression(); - case 19 /* OpenBracketToken */: - return parseArrayLiteralExpression(); + case 23 /* SemicolonToken */: + return parseEmptyStatement(); case 15 /* OpenBraceToken */: - return parseObjectLiteralExpression(); - case 118 /* AsyncKeyword */: - // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher. - // If we encounter `async [no LineTerminator here] function` then this is an async - // function; otherwise, its an identifier. - if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) { - break; + return parseBlock(/*ignoreMissingOpenBrace*/ false); + case 102 /* VarKeyword */: + return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 108 /* LetKeyword */: + if (isLetDeclaration()) { + return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); } - return parseFunctionExpression(); - case 73 /* ClassKeyword */: - return parseClassExpression(); + break; case 87 /* FunctionKeyword */: - return parseFunctionExpression(); - case 92 /* NewKeyword */: - return parseNewExpression(); - case 39 /* SlashToken */: - case 61 /* SlashEqualsToken */: - if (reScanSlashToken() === 10 /* RegularExpressionLiteral */) { - return parseLiteralNode(); + return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 73 /* ClassKeyword */: + return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 88 /* IfKeyword */: + return parseIfStatement(); + case 79 /* DoKeyword */: + return parseDoStatement(); + case 104 /* WhileKeyword */: + return parseWhileStatement(); + case 86 /* ForKeyword */: + return parseForOrForInOrForOfStatement(); + case 75 /* ContinueKeyword */: + return parseBreakOrContinueStatement(202 /* ContinueStatement */); + case 70 /* BreakKeyword */: + return parseBreakOrContinueStatement(203 /* BreakStatement */); + case 94 /* ReturnKeyword */: + return parseReturnStatement(); + case 105 /* WithKeyword */: + return parseWithStatement(); + case 96 /* SwitchKeyword */: + return parseSwitchStatement(); + case 98 /* ThrowKeyword */: + return parseThrowStatement(); + case 100 /* TryKeyword */: + // Include 'catch' and 'finally' for error recovery. + case 72 /* CatchKeyword */: + case 85 /* FinallyKeyword */: + return parseTryStatement(); + case 76 /* DebuggerKeyword */: + return parseDebuggerStatement(); + case 55 /* AtToken */: + return parseDeclaration(); + case 118 /* AsyncKeyword */: + case 107 /* InterfaceKeyword */: + case 132 /* TypeKeyword */: + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + case 122 /* DeclareKeyword */: + case 74 /* ConstKeyword */: + case 81 /* EnumKeyword */: + case 82 /* ExportKeyword */: + case 89 /* ImportKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 112 /* PublicKeyword */: + case 115 /* AbstractKeyword */: + case 113 /* StaticKeyword */: + if (isStartOfDeclaration()) { + return parseDeclaration(); } break; - case 12 /* TemplateHead */: - return parseTemplateExpression(); } - return parseIdentifier(ts.Diagnostics.Expression_expected); - } - function parseParenthesizedExpression() { - var node = createNode(172 /* ParenthesizedExpression */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - return finishNode(node); - } - function parseSpreadElement() { - var node = createNode(185 /* SpreadElementExpression */); - parseExpected(22 /* DotDotDotToken */); - node.expression = parseAssignmentExpressionOrHigher(); - return finishNode(node); - } - function parseArgumentOrArrayLiteralElement() { - return token === 22 /* DotDotDotToken */ ? parseSpreadElement() : - token === 24 /* CommaToken */ ? createNode(187 /* OmittedExpression */) : - parseAssignmentExpressionOrHigher(); + return parseExpressionOrLabeledStatement(); } - function parseArgumentExpression() { - return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); + function parseDeclaration() { + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + switch (token) { + case 102 /* VarKeyword */: + case 108 /* LetKeyword */: + case 74 /* ConstKeyword */: + return parseVariableStatement(fullStart, decorators, modifiers); + case 87 /* FunctionKeyword */: + return parseFunctionDeclaration(fullStart, decorators, modifiers); + case 73 /* ClassKeyword */: + return parseClassDeclaration(fullStart, decorators, modifiers); + case 107 /* InterfaceKeyword */: + return parseInterfaceDeclaration(fullStart, decorators, modifiers); + case 132 /* TypeKeyword */: + return parseTypeAliasDeclaration(fullStart, decorators, modifiers); + case 81 /* EnumKeyword */: + return parseEnumDeclaration(fullStart, decorators, modifiers); + case 125 /* ModuleKeyword */: + case 126 /* NamespaceKeyword */: + return parseModuleDeclaration(fullStart, decorators, modifiers); + case 89 /* ImportKeyword */: + return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); + case 82 /* ExportKeyword */: + nextToken(); + return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ? + parseExportAssignment(fullStart, decorators, modifiers) : + parseExportDeclaration(fullStart, decorators, modifiers); + default: + if (decorators || modifiers) { + // We reached this point because we encountered decorators and/or modifiers and assumed a declaration + // would follow. For recovery and error reporting purposes, return an incomplete declaration. + var node = createMissingNode(231 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + node.pos = fullStart; + node.decorators = decorators; + setModifiers(node, modifiers); + return finishNode(node); + } + } } - function parseArrayLiteralExpression() { - var node = createNode(164 /* ArrayLiteralExpression */); - parseExpected(19 /* OpenBracketToken */); - if (scanner.hasPrecedingLineBreak()) - node.flags |= 1024 /* MultiLine */; - node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); - parseExpected(20 /* CloseBracketToken */); - return finishNode(node); + function nextTokenIsIdentifierOrStringLiteralOnSameLine() { + nextToken(); + return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9 /* StringLiteral */); } - function tryParseAccessorDeclaration(fullStart, decorators, modifiers) { - if (parseContextualModifier(123 /* GetKeyword */)) { - return parseAccessorDeclaration(145 /* GetAccessor */, fullStart, decorators, modifiers); - } - else if (parseContextualModifier(129 /* SetKeyword */)) { - return parseAccessorDeclaration(146 /* SetAccessor */, fullStart, decorators, modifiers); + function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { + if (token !== 15 /* OpenBraceToken */ && canParseSemicolon()) { + parseSemicolon(); + return; } - return undefined; + return parseFunctionBlock(isGenerator, isAsync, /*ignoreMissingOpenBrace*/ false, diagnosticMessage); } - function parseObjectLiteralElement() { - var fullStart = scanner.getStartPos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; - } - var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var tokenIsIdentifier = isIdentifier(); - var nameToken = token; - var propertyName = parsePropertyName(); - // Disallowing of optional property assignments happens in the grammar checker. - var questionToken = parseOptionalToken(53 /* QuestionToken */); - if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { - return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken); + // DECLARATIONS + function parseArrayBindingElement() { + if (token === 24 /* CommaToken */) { + return createNode(187 /* OmittedExpression */); } - // check if it is short-hand property assignment or normal property assignment - // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production - // CoverInitializedName[Yield] : - // IdentifierReference[?Yield] Initializer[In, ?Yield] - // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern - var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */); - if (isShorthandPropertyAssignment) { - var shorthandDeclaration = createNode(246 /* ShorthandPropertyAssignment */, fullStart); - shorthandDeclaration.name = propertyName; - shorthandDeclaration.questionToken = questionToken; - var equalsToken = parseOptionalToken(56 /* EqualsToken */); - if (equalsToken) { - shorthandDeclaration.equalsToken = equalsToken; - shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); - } - return finishNode(shorthandDeclaration); + var node = createNode(163 /* BindingElement */); + node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */); + node.name = parseIdentifierOrPattern(); + node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + return finishNode(node); + } + function parseObjectBindingElement() { + var node = createNode(163 /* BindingElement */); + var tokenIsIdentifier = isIdentifier(); + var propertyName = parsePropertyName(); + if (tokenIsIdentifier && token !== 54 /* ColonToken */) { + node.name = propertyName; } else { - var propertyAssignment = createNode(245 /* PropertyAssignment */, fullStart); - propertyAssignment.name = propertyName; - propertyAssignment.questionToken = questionToken; parseExpected(54 /* ColonToken */); - propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher); - return finishNode(propertyAssignment); + node.propertyName = propertyName; + node.name = parseIdentifierOrPattern(); } + node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + return finishNode(node); } - function parseObjectLiteralExpression() { - var node = createNode(165 /* ObjectLiteralExpression */); + function parseObjectBindingPattern() { + var node = createNode(161 /* ObjectBindingPattern */); parseExpected(15 /* OpenBraceToken */); - if (scanner.hasPrecedingLineBreak()) { - node.flags |= 1024 /* MultiLine */; - } - node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true); + node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); parseExpected(16 /* CloseBraceToken */); return finishNode(node); } - function parseFunctionExpression() { - // GeneratorExpression: - // function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody } - // - // FunctionExpression: - // function BindingIdentifier[opt](FormalParameters){ FunctionBody } - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var node = createNode(173 /* FunctionExpression */); - setModifiers(node, parseModifiers()); - parseExpected(87 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var isGenerator = !!node.asteriskToken; - var isAsync = !!(node.flags & 256 /* Async */); - node.name = - isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : - isGenerator ? doInYieldContext(parseOptionalIdentifier) : - isAsync ? doInAwaitContext(parseOptionalIdentifier) : - parseOptionalIdentifier(); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false); - if (saveDecoratorContext) { - setDecoratorContext(true); - } + function parseArrayBindingPattern() { + var node = createNode(162 /* ArrayBindingPattern */); + parseExpected(19 /* OpenBracketToken */); + node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); + parseExpected(20 /* CloseBracketToken */); return finishNode(node); } - function parseOptionalIdentifier() { - return isIdentifier() ? parseIdentifier() : undefined; + function isIdentifierOrPattern() { + return token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */ || isIdentifier(); } - function parseNewExpression() { - var node = createNode(169 /* NewExpression */); - parseExpected(92 /* NewKeyword */); - node.expression = parseMemberExpressionOrHigher(); - node.typeArguments = tryParse(parseTypeArgumentsInExpression); - if (node.typeArguments || token === 17 /* OpenParenToken */) { - node.arguments = parseArgumentList(); + function parseIdentifierOrPattern() { + if (token === 19 /* OpenBracketToken */) { + return parseArrayBindingPattern(); + } + if (token === 15 /* OpenBraceToken */) { + return parseObjectBindingPattern(); + } + return parseIdentifier(); + } + function parseVariableDeclaration() { + var node = createNode(211 /* VariableDeclaration */); + node.name = parseIdentifierOrPattern(); + node.type = parseTypeAnnotation(); + if (!isInOrOfKeyword(token)) { + node.initializer = parseInitializer(/*inParameter*/ false); } return finishNode(node); } - // STATEMENTS - function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { - var node = createNode(192 /* Block */); - if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) { - node.statements = parseList(1 /* BlockStatements */, parseStatement); - parseExpected(16 /* CloseBraceToken */); + function parseVariableDeclarationList(inForStatementInitializer) { + var node = createNode(212 /* VariableDeclarationList */); + switch (token) { + case 102 /* VarKeyword */: + break; + case 108 /* LetKeyword */: + node.flags |= 8192 /* Let */; + break; + case 74 /* ConstKeyword */: + node.flags |= 16384 /* Const */; + break; + default: + ts.Debug.fail(); + } + nextToken(); + // The user may have written the following: + // + // for (let of X) { } + // + // In this case, we want to parse an empty declaration list, and then parse 'of' + // as a keyword. The reason this is not automatic is that 'of' is a valid identifier. + // So we need to look ahead to determine if 'of' should be treated as a keyword in + // this context. + // The checker will then give an error that there is an empty declaration list. + if (token === 134 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { + node.declarations = createMissingList(); } else { - node.statements = createMissingList(); + var savedDisallowIn = inDisallowInContext(); + setDisallowInContext(inForStatementInitializer); + node.declarations = parseDelimitedList(8 /* VariableDeclarations */, parseVariableDeclaration); + setDisallowInContext(savedDisallowIn); } return finishNode(node); } - function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) { - var savedYieldContext = inYieldContext(); - setYieldContext(allowYield); - var savedAwaitContext = inAwaitContext(); - setAwaitContext(allowAwait); - // We may be in a [Decorator] context when parsing a function expression or - // arrow function. The body of the function is not in [Decorator] context. - var saveDecoratorContext = inDecoratorContext(); - if (saveDecoratorContext) { - setDecoratorContext(false); - } - var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); - if (saveDecoratorContext) { - setDecoratorContext(true); - } - setYieldContext(savedYieldContext); - setAwaitContext(savedAwaitContext); - return block; + function canFollowContextualOfKeyword() { + return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */; } - function parseEmptyStatement() { - var node = createNode(194 /* EmptyStatement */); - parseExpected(23 /* SemicolonToken */); + function parseVariableStatement(fullStart, decorators, modifiers) { + var node = createNode(193 /* VariableStatement */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); + parseSemicolon(); return finishNode(node); } - function parseIfStatement() { - var node = createNode(196 /* IfStatement */); - parseExpected(88 /* IfKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.thenStatement = parseStatement(); - node.elseStatement = parseOptional(80 /* ElseKeyword */) ? parseStatement() : undefined; + function parseFunctionDeclaration(fullStart, decorators, modifiers) { + var node = createNode(213 /* FunctionDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(87 /* FunctionKeyword */); + node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier(); + var isGenerator = !!node.asteriskToken; + var isAsync = !!(node.flags & 256 /* Async */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected); return finishNode(node); } - function parseDoStatement() { - var node = createNode(197 /* DoStatement */); - parseExpected(79 /* DoKeyword */); - node.statement = parseStatement(); - parseExpected(104 /* WhileKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html - // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in - // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby - // do;while(0)x will have a semicolon inserted before x. - parseOptional(23 /* SemicolonToken */); + function parseConstructorDeclaration(pos, decorators, modifiers) { + var node = createNode(144 /* Constructor */, pos); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(121 /* ConstructorKeyword */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected); return finishNode(node); } - function parseWhileStatement() { - var node = createNode(198 /* WhileStatement */); - parseExpected(104 /* WhileKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.statement = parseStatement(); + function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) { + var method = createNode(143 /* MethodDeclaration */, fullStart); + method.decorators = decorators; + setModifiers(method, modifiers); + method.asteriskToken = asteriskToken; + method.name = name; + method.questionToken = questionToken; + var isGenerator = !!asteriskToken; + var isAsync = !!(method.flags & 256 /* Async */); + fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method); + method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); + return finishNode(method); + } + function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) { + var property = createNode(141 /* PropertyDeclaration */, fullStart); + property.decorators = decorators; + setModifiers(property, modifiers); + property.name = name; + property.questionToken = questionToken; + property.type = parseTypeAnnotation(); + // For instance properties specifically, since they are evaluated inside the constructor, + // we do *not * want to parse yield expressions, so we specifically turn the yield context + // off. The grammar would look something like this: + // + // MemberVariableDeclaration[Yield]: + // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; + // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; + // + // The checker may still error in the static case to explicitly disallow the yield expression. + property.initializer = modifiers && modifiers.flags & 64 /* Static */ + ? allowInAnd(parseNonParameterInitializer) + : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer); + parseSemicolon(); + return finishNode(property); + } + function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) { + var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); + var name = parsePropertyName(); + // Note: this is not legal as per the grammar. But we allow it in the parser and + // report an error in the grammar checker. + var questionToken = parseOptionalToken(53 /* QuestionToken */); + if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { + return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected); + } + else { + return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken); + } + } + function parseNonParameterInitializer() { + return parseInitializer(/*inParameter*/ false); + } + function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parsePropertyName(); + fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); + node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false); return finishNode(node); } - function parseForOrForInOrForOfStatement() { - var pos = getNodePos(); - parseExpected(86 /* ForKeyword */); - parseExpected(17 /* OpenParenToken */); - var initializer = undefined; - if (token !== 23 /* SemicolonToken */) { - if (token === 102 /* VarKeyword */ || token === 108 /* LetKeyword */ || token === 74 /* ConstKeyword */) { - initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true); + function isClassMemberModifier(idToken) { + switch (idToken) { + case 112 /* PublicKeyword */: + case 110 /* PrivateKeyword */: + case 111 /* ProtectedKeyword */: + case 113 /* StaticKeyword */: + return true; + default: + return false; + } + } + function isClassMemberStart() { + var idToken; + if (token === 55 /* AtToken */) { + return true; + } + // Eat up all modifiers, but hold on to the last one in case it is actually an identifier. + while (ts.isModifier(token)) { + idToken = token; + // If the idToken is a class modifier (protected, private, public, and static), it is + // certain that we are starting to parse class member. This allows better error recovery + // Example: + // public foo() ... // true + // public @dec blah ... // true; we will then report an error later + // export public ... // true; we will then report an error later + if (isClassMemberModifier(idToken)) { + return true; } - else { - initializer = disallowInAnd(parseExpression); + nextToken(); + } + if (token === 37 /* AsteriskToken */) { + return true; + } + // Try to get the first property-like token following all modifiers. + // This can either be an identifier or the 'get' or 'set' keywords. + if (isLiteralPropertyName()) { + idToken = token; + nextToken(); + } + // Index signatures and computed properties are class members; we can parse. + if (token === 19 /* OpenBracketToken */) { + return true; + } + // If we were able to get any potential identifier... + if (idToken !== undefined) { + // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse. + if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) { + return true; + } + // If it *is* a keyword, but not an accessor, check a little farther along + // to see if it should actually be parsed as a class member. + switch (token) { + case 17 /* OpenParenToken */: // Method declaration + case 25 /* LessThanToken */: // Generic Method declaration + case 54 /* ColonToken */: // Type Annotation for declaration + case 56 /* EqualsToken */: // Initializer for declaration + case 53 /* QuestionToken */: + return true; + default: + // Covers + // - Semicolons (declaration termination) + // - Closing braces (end-of-class, must be declaration) + // - End-of-files (not valid, but permitted so that it gets caught later on) + // - Line-breaks (enabling *automatic semicolon insertion*) + return canParseSemicolon(); } } - var forOrForInOrForOfStatement; - if (parseOptional(90 /* InKeyword */)) { - var forInStatement = createNode(200 /* ForInStatement */, pos); - forInStatement.initializer = initializer; - forInStatement.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forInStatement; + return false; + } + function parseDecorators() { + var decorators; + while (true) { + var decoratorStart = getNodePos(); + if (!parseOptional(55 /* AtToken */)) { + break; + } + if (!decorators) { + decorators = []; + decorators.pos = scanner.getStartPos(); + } + var decorator = createNode(139 /* Decorator */, decoratorStart); + decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); + decorators.push(finishNode(decorator)); } - else if (parseOptional(134 /* OfKeyword */)) { - var forOfStatement = createNode(201 /* ForOfStatement */, pos); - forOfStatement.initializer = initializer; - forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forOfStatement; + if (decorators) { + decorators.end = getNodeEnd(); } - else { - var forStatement = createNode(199 /* ForStatement */, pos); - forStatement.initializer = initializer; - parseExpected(23 /* SemicolonToken */); - if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) { - forStatement.condition = allowInAnd(parseExpression); + return decorators; + } + function parseModifiers() { + var flags = 0; + var modifiers; + while (true) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + if (!parseAnyContextualModifier()) { + break; } - parseExpected(23 /* SemicolonToken */); - if (token !== 18 /* CloseParenToken */) { - forStatement.incrementor = allowInAnd(parseExpression); + if (!modifiers) { + modifiers = []; + modifiers.pos = modifierStart; } - parseExpected(18 /* CloseParenToken */); - forOrForInOrForOfStatement = forStatement; + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); } - forOrForInOrForOfStatement.statement = parseStatement(); - return finishNode(forOrForInOrForOfStatement); + if (modifiers) { + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); + } + return modifiers; } - function parseBreakOrContinueStatement(kind) { - var node = createNode(kind); - parseExpected(kind === 203 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */); - if (!canParseSemicolon()) { - node.label = parseIdentifier(); + function parseModifiersForArrowFunction() { + var flags = 0; + var modifiers; + if (token === 118 /* AsyncKeyword */) { + var modifierStart = scanner.getStartPos(); + var modifierKind = token; + nextToken(); + modifiers = []; + modifiers.pos = modifierStart; + flags |= ts.modifierToFlag(modifierKind); + modifiers.push(finishNode(createNode(modifierKind, modifierStart))); + modifiers.flags = flags; + modifiers.end = scanner.getStartPos(); } - parseSemicolon(); - return finishNode(node); + return modifiers; } - function parseReturnStatement() { - var node = createNode(204 /* ReturnStatement */); - parseExpected(94 /* ReturnKeyword */); - if (!canParseSemicolon()) { - node.expression = allowInAnd(parseExpression); + function parseClassElement() { + if (token === 23 /* SemicolonToken */) { + var result = createNode(191 /* SemicolonClassElement */); + nextToken(); + return finishNode(result); } - parseSemicolon(); - return finishNode(node); + var fullStart = getNodePos(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); + if (accessor) { + return accessor; + } + if (token === 121 /* ConstructorKeyword */) { + return parseConstructorDeclaration(fullStart, decorators, modifiers); + } + if (isIndexSignature()) { + return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); + } + // It is very important that we check this *after* checking indexers because + // the [ token can start an index signature or a computed property name + if (ts.tokenIsIdentifierOrKeyword(token) || + token === 9 /* StringLiteral */ || + token === 8 /* NumericLiteral */ || + token === 37 /* AsteriskToken */ || + token === 19 /* OpenBracketToken */) { + return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); + } + if (decorators || modifiers) { + // treat this as a property declaration with a missing name. + var name_7 = createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, /*questionToken*/ undefined); + } + // 'isClassMemberStart' should have hinted not to attempt parsing. + ts.Debug.fail("Should not have attempted to parse class member declaration."); } - function parseWithStatement() { - var node = createNode(205 /* WithStatement */); - parseExpected(105 /* WithKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - node.statement = parseStatement(); + function parseClassExpression() { + return parseClassDeclarationOrExpression( + /*fullStart*/ scanner.getStartPos(), + /*decorators*/ undefined, + /*modifiers*/ undefined, 186 /* ClassExpression */); + } + function parseClassDeclaration(fullStart, decorators, modifiers) { + return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214 /* ClassDeclaration */); + } + function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { + var node = createNode(kind, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(73 /* ClassKeyword */); + node.name = parseNameOfClassDeclarationOrExpression(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ true); + if (parseExpected(15 /* OpenBraceToken */)) { + // ClassTail[Yield,Await] : (Modified) See 14.5 + // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } + node.members = parseClassMembers(); + parseExpected(16 /* CloseBraceToken */); + } + else { + node.members = createMissingList(); + } return finishNode(node); } - function parseCaseClause() { - var node = createNode(241 /* CaseClause */); - parseExpected(71 /* CaseKeyword */); - node.expression = allowInAnd(parseExpression); - parseExpected(54 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); - return finishNode(node); + function parseNameOfClassDeclarationOrExpression() { + // implements is a future reserved word so + // 'class implements' might mean either + // - class expression with omitted name, 'implements' starts heritage clause + // - class with name 'implements' + // 'isImplementsClause' helps to disambiguate between these two cases + return isIdentifier() && !isImplementsClause() + ? parseIdentifier() + : undefined; + } + function isImplementsClause() { + return token === 106 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); + } + function parseHeritageClauses(isClassHeritageClause) { + // ClassTail[Yield,Await] : (Modified) See 14.5 + // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } + if (isHeritageClause()) { + return parseList(20 /* HeritageClauses */, parseHeritageClause); + } + return undefined; + } + function parseHeritageClausesWorker() { + return parseList(20 /* HeritageClauses */, parseHeritageClause); + } + function parseHeritageClause() { + if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) { + var node = createNode(243 /* HeritageClause */); + node.token = token; + nextToken(); + node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); + return finishNode(node); + } + return undefined; } - function parseDefaultClause() { - var node = createNode(242 /* DefaultClause */); - parseExpected(77 /* DefaultKeyword */); - parseExpected(54 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + function parseExpressionWithTypeArguments() { + var node = createNode(188 /* ExpressionWithTypeArguments */); + node.expression = parseLeftHandSideExpressionOrHigher(); + if (token === 25 /* LessThanToken */) { + node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */); + } return finishNode(node); } - function parseCaseOrDefaultClause() { - return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + function isHeritageClause() { + return token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */; } - function parseSwitchStatement() { - var node = createNode(206 /* SwitchStatement */); - parseExpected(96 /* SwitchKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); - parseExpected(18 /* CloseParenToken */); - var caseBlock = createNode(220 /* CaseBlock */, scanner.getStartPos()); - parseExpected(15 /* OpenBraceToken */); - caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); - parseExpected(16 /* CloseBraceToken */); - node.caseBlock = finishNode(caseBlock); + function parseClassMembers() { + return parseList(5 /* ClassMembers */, parseClassElement); + } + function parseInterfaceDeclaration(fullStart, decorators, modifiers) { + var node = createNode(215 /* InterfaceDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(107 /* InterfaceKeyword */); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ false); + node.members = parseObjectTypeMembers(); return finishNode(node); } - function parseThrowStatement() { - // ThrowStatement[Yield] : - // throw [no LineTerminator here]Expression[In, ?Yield]; - // Because of automatic semicolon insertion, we need to report error if this - // throw could be terminated with a semicolon. Note: we can't call 'parseExpression' - // directly as that might consume an expression on the following line. - // We just return 'undefined' in that case. The actual error will be reported in the - // grammar walker. - var node = createNode(208 /* ThrowStatement */); - parseExpected(98 /* ThrowKeyword */); - node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { + var node = createNode(216 /* TypeAliasDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(132 /* TypeKeyword */); + node.name = parseIdentifier(); + node.typeParameters = parseTypeParameters(); + parseExpected(56 /* EqualsToken */); + node.type = parseType(); parseSemicolon(); return finishNode(node); } - // TODO: Review for error recovery - function parseTryStatement() { - var node = createNode(209 /* TryStatement */); - parseExpected(100 /* TryKeyword */); - node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); - node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined; - // If we don't have a catch clause, then we must have a finally clause. Try to parse - // one out no matter what. - if (!node.catchClause || token === 85 /* FinallyKeyword */) { - parseExpected(85 /* FinallyKeyword */); - node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); - } + // In an ambient declaration, the grammar only allows integer literals as initializers. + // In a non-ambient declaration, the grammar allows uninitialized members only in a + // ConstantEnumMemberSection, which starts at the beginning of an enum declaration + // or any time an integer literal initializer is encountered. + function parseEnumMember() { + var node = createNode(247 /* EnumMember */, scanner.getStartPos()); + node.name = parsePropertyName(); + node.initializer = allowInAnd(parseNonParameterInitializer); return finishNode(node); } - function parseCatchClause() { - var result = createNode(244 /* CatchClause */); - parseExpected(72 /* CatchKeyword */); - if (parseExpected(17 /* OpenParenToken */)) { - result.variableDeclaration = parseVariableDeclaration(); + function parseEnumDeclaration(fullStart, decorators, modifiers) { + var node = createNode(217 /* EnumDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + parseExpected(81 /* EnumKeyword */); + node.name = parseIdentifier(); + if (parseExpected(15 /* OpenBraceToken */)) { + node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember); + parseExpected(16 /* CloseBraceToken */); + } + else { + node.members = createMissingList(); } - parseExpected(18 /* CloseParenToken */); - result.block = parseBlock(/*ignoreMissingOpenBrace*/ false); - return finishNode(result); - } - function parseDebuggerStatement() { - var node = createNode(210 /* DebuggerStatement */); - parseExpected(76 /* DebuggerKeyword */); - parseSemicolon(); return finishNode(node); } - function parseExpressionOrLabeledStatement() { - // Avoiding having to do the lookahead for a labeled statement by just trying to parse - // out an expression, seeing if it is identifier and then seeing if it is followed by - // a colon. - var fullStart = scanner.getStartPos(); - var expression = allowInAnd(parseExpression); - if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) { - var labeledStatement = createNode(207 /* LabeledStatement */, fullStart); - labeledStatement.label = expression; - labeledStatement.statement = parseStatement(); - return finishNode(labeledStatement); + function parseModuleBlock() { + var node = createNode(219 /* ModuleBlock */, scanner.getStartPos()); + if (parseExpected(15 /* OpenBraceToken */)) { + node.statements = parseList(1 /* BlockStatements */, parseStatement); + parseExpected(16 /* CloseBraceToken */); } else { - var expressionStatement = createNode(195 /* ExpressionStatement */, fullStart); - expressionStatement.expression = expression; - parseSemicolon(); - return finishNode(expressionStatement); + node.statements = createMissingList(); } + return finishNode(node); } - function nextTokenIsIdentifierOrKeywordOnSameLine() { - nextToken(); - return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak(); - } - function nextTokenIsFunctionKeywordOnSameLine() { - nextToken(); - return token === 87 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); + function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { + var node = createNode(218 /* ModuleDeclaration */, fullStart); + // If we are parsing a dotted namespace name, we want to + // propagate the 'Namespace' flag across the names if set. + var namespaceFlag = flags & 65536 /* Namespace */; + node.decorators = decorators; + setModifiers(node, modifiers); + node.flags |= flags; + node.name = parseIdentifier(); + node.body = parseOptional(21 /* DotToken */) + ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag) + : parseModuleBlock(); + return finishNode(node); } - function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() { - nextToken(); - return (ts.tokenIsIdentifierOrKeyword(token) || token === 8 /* NumericLiteral */) && !scanner.hasPrecedingLineBreak(); + function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { + var node = createNode(218 /* ModuleDeclaration */, fullStart); + node.decorators = decorators; + setModifiers(node, modifiers); + node.name = parseLiteralNode(/*internName*/ true); + node.body = parseModuleBlock(); + return finishNode(node); } - function isDeclaration() { - while (true) { - switch (token) { - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 74 /* ConstKeyword */: - case 87 /* FunctionKeyword */: - case 73 /* ClassKeyword */: - case 81 /* EnumKeyword */: - return true; - // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers; - // however, an identifier cannot be followed by another identifier on the same line. This is what we - // count on to parse out the respective declarations. For instance, we exploit this to say that - // - // namespace n - // - // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees - // - // namespace - // n - // - // as the identifier 'namespace' on one line followed by the identifier 'n' on another. - // We need to look one token ahead to see if it permissible to try parsing a declaration. - // - // *Note*: 'interface' is actually a strict mode reserved word. So while - // - // "use strict" - // interface - // I {} - // - // could be legal, it would add complexity for very little gain. - case 107 /* InterfaceKeyword */: - case 132 /* TypeKeyword */: - return nextTokenIsIdentifierOnSameLine(); - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - return nextTokenIsIdentifierOrStringLiteralOnSameLine(); - case 115 /* AbstractKeyword */: - case 118 /* AsyncKeyword */: - case 122 /* DeclareKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 112 /* PublicKeyword */: - nextToken(); - // ASI takes effect for this modifier. - if (scanner.hasPrecedingLineBreak()) { - return false; - } - continue; - case 89 /* ImportKeyword */: - nextToken(); - return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token); - case 82 /* ExportKeyword */: - nextToken(); - if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) { - return true; - } - continue; - case 113 /* StaticKeyword */: - nextToken(); - continue; - default: - return false; - } + function parseModuleDeclaration(fullStart, decorators, modifiers) { + var flags = modifiers ? modifiers.flags : 0; + if (parseOptional(126 /* NamespaceKeyword */)) { + flags |= 65536 /* Namespace */; } - } - function isStartOfDeclaration() { - return lookAhead(isDeclaration); - } - function isStartOfStatement() { - switch (token) { - case 55 /* AtToken */: - case 23 /* SemicolonToken */: - case 15 /* OpenBraceToken */: - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 87 /* FunctionKeyword */: - case 73 /* ClassKeyword */: - case 81 /* EnumKeyword */: - case 88 /* IfKeyword */: - case 79 /* DoKeyword */: - case 104 /* WhileKeyword */: - case 86 /* ForKeyword */: - case 75 /* ContinueKeyword */: - case 70 /* BreakKeyword */: - case 94 /* ReturnKeyword */: - case 105 /* WithKeyword */: - case 96 /* SwitchKeyword */: - case 98 /* ThrowKeyword */: - case 100 /* TryKeyword */: - case 76 /* DebuggerKeyword */: - // 'catch' and 'finally' do not actually indicate that the code is part of a statement, - // however, we say they are here so that we may gracefully parse them and error later. - case 72 /* CatchKeyword */: - case 85 /* FinallyKeyword */: - return true; - case 74 /* ConstKeyword */: - case 82 /* ExportKeyword */: - case 89 /* ImportKeyword */: - return isStartOfDeclaration(); - case 118 /* AsyncKeyword */: - case 122 /* DeclareKeyword */: - case 107 /* InterfaceKeyword */: - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - case 132 /* TypeKeyword */: - // When these don't start a declaration, they're an identifier in an expression statement - return true; - case 112 /* PublicKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 113 /* StaticKeyword */: - // When these don't start a declaration, they may be the start of a class member if an identifier - // immediately follows. Otherwise they're an identifier in an expression statement. - return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); - default: - return isStartOfExpression(); + else { + parseExpected(125 /* ModuleKeyword */); + if (token === 9 /* StringLiteral */) { + return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); + } } + return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); } - function nextTokenIsIdentifierOrStartOfDestructuring() { - nextToken(); - return isIdentifier() || token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */; - } - function isLetDeclaration() { - // In ES6 'let' always starts a lexical declaration if followed by an identifier or { - // or [. - return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring); + function isExternalModuleReference() { + return token === 127 /* RequireKeyword */ && + lookAhead(nextTokenIsOpenParen); } - function parseStatement() { - switch (token) { - case 23 /* SemicolonToken */: - return parseEmptyStatement(); - case 15 /* OpenBraceToken */: - return parseBlock(/*ignoreMissingOpenBrace*/ false); - case 102 /* VarKeyword */: - return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 108 /* LetKeyword */: - if (isLetDeclaration()) { - return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - } - break; - case 87 /* FunctionKeyword */: - return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 73 /* ClassKeyword */: - return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined); - case 88 /* IfKeyword */: - return parseIfStatement(); - case 79 /* DoKeyword */: - return parseDoStatement(); - case 104 /* WhileKeyword */: - return parseWhileStatement(); - case 86 /* ForKeyword */: - return parseForOrForInOrForOfStatement(); - case 75 /* ContinueKeyword */: - return parseBreakOrContinueStatement(202 /* ContinueStatement */); - case 70 /* BreakKeyword */: - return parseBreakOrContinueStatement(203 /* BreakStatement */); - case 94 /* ReturnKeyword */: - return parseReturnStatement(); - case 105 /* WithKeyword */: - return parseWithStatement(); - case 96 /* SwitchKeyword */: - return parseSwitchStatement(); - case 98 /* ThrowKeyword */: - return parseThrowStatement(); - case 100 /* TryKeyword */: - // Include 'catch' and 'finally' for error recovery. - case 72 /* CatchKeyword */: - case 85 /* FinallyKeyword */: - return parseTryStatement(); - case 76 /* DebuggerKeyword */: - return parseDebuggerStatement(); - case 55 /* AtToken */: - return parseDeclaration(); - case 118 /* AsyncKeyword */: - case 107 /* InterfaceKeyword */: - case 132 /* TypeKeyword */: - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - case 122 /* DeclareKeyword */: - case 74 /* ConstKeyword */: - case 81 /* EnumKeyword */: - case 82 /* ExportKeyword */: - case 89 /* ImportKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 112 /* PublicKeyword */: - case 115 /* AbstractKeyword */: - case 113 /* StaticKeyword */: - if (isStartOfDeclaration()) { - return parseDeclaration(); - } - break; - } - return parseExpressionOrLabeledStatement(); + function nextTokenIsOpenParen() { + return nextToken() === 17 /* OpenParenToken */; } - function parseDeclaration() { - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - switch (token) { - case 102 /* VarKeyword */: - case 108 /* LetKeyword */: - case 74 /* ConstKeyword */: - return parseVariableStatement(fullStart, decorators, modifiers); - case 87 /* FunctionKeyword */: - return parseFunctionDeclaration(fullStart, decorators, modifiers); - case 73 /* ClassKeyword */: - return parseClassDeclaration(fullStart, decorators, modifiers); - case 107 /* InterfaceKeyword */: - return parseInterfaceDeclaration(fullStart, decorators, modifiers); - case 132 /* TypeKeyword */: - return parseTypeAliasDeclaration(fullStart, decorators, modifiers); - case 81 /* EnumKeyword */: - return parseEnumDeclaration(fullStart, decorators, modifiers); - case 125 /* ModuleKeyword */: - case 126 /* NamespaceKeyword */: - return parseModuleDeclaration(fullStart, decorators, modifiers); - case 89 /* ImportKeyword */: - return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers); - case 82 /* ExportKeyword */: - nextToken(); - return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ? - parseExportAssignment(fullStart, decorators, modifiers) : - parseExportDeclaration(fullStart, decorators, modifiers); - default: - if (decorators || modifiers) { - // We reached this point because we encountered decorators and/or modifiers and assumed a declaration - // would follow. For recovery and error reporting purposes, return an incomplete declaration. - var node = createMissingNode(231 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - node.pos = fullStart; - node.decorators = decorators; - setModifiers(node, modifiers); - return finishNode(node); - } - } + function nextTokenIsSlash() { + return nextToken() === 39 /* SlashToken */; } - function nextTokenIsIdentifierOrStringLiteralOnSameLine() { + function nextTokenIsCommaOrFromKeyword() { nextToken(); - return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9 /* StringLiteral */); + return token === 24 /* CommaToken */ || + token === 133 /* FromKeyword */; } - function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) { - if (token !== 15 /* OpenBraceToken */ && canParseSemicolon()) { - parseSemicolon(); - return; + function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { + parseExpected(89 /* ImportKeyword */); + var afterImportPos = scanner.getStartPos(); + var identifier; + if (isIdentifier()) { + identifier = parseIdentifier(); + if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) { + // ImportEquals declaration of type: + // import x = require("mod"); or + // import x = M.x; + var importEqualsDeclaration = createNode(221 /* ImportEqualsDeclaration */, fullStart); + importEqualsDeclaration.decorators = decorators; + setModifiers(importEqualsDeclaration, modifiers); + importEqualsDeclaration.name = identifier; + parseExpected(56 /* EqualsToken */); + importEqualsDeclaration.moduleReference = parseModuleReference(); + parseSemicolon(); + return finishNode(importEqualsDeclaration); + } } - return parseFunctionBlock(isGenerator, isAsync, /*ignoreMissingOpenBrace*/ false, diagnosticMessage); - } - // DECLARATIONS - function parseArrayBindingElement() { - if (token === 24 /* CommaToken */) { - return createNode(187 /* OmittedExpression */); + // Import statement + var importDeclaration = createNode(222 /* ImportDeclaration */, fullStart); + importDeclaration.decorators = decorators; + setModifiers(importDeclaration, modifiers); + // ImportDeclaration: + // import ImportClause from ModuleSpecifier ; + // import ModuleSpecifier; + if (identifier || + token === 37 /* AsteriskToken */ || + token === 15 /* OpenBraceToken */) { + importDeclaration.importClause = parseImportClause(identifier, afterImportPos); + parseExpected(133 /* FromKeyword */); } - var node = createNode(163 /* BindingElement */); - node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */); - node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); - return finishNode(node); + importDeclaration.moduleSpecifier = parseModuleSpecifier(); + parseSemicolon(); + return finishNode(importDeclaration); } - function parseObjectBindingElement() { - var node = createNode(163 /* BindingElement */); - // TODO(andersh): Handle computed properties - var tokenIsIdentifier = isIdentifier(); - var propertyName = parsePropertyName(); - if (tokenIsIdentifier && token !== 54 /* ColonToken */) { - node.name = propertyName; + function parseImportClause(identifier, fullStart) { + // ImportClause: + // ImportedDefaultBinding + // NameSpaceImport + // NamedImports + // ImportedDefaultBinding, NameSpaceImport + // ImportedDefaultBinding, NamedImports + var importClause = createNode(223 /* ImportClause */, fullStart); + if (identifier) { + // ImportedDefaultBinding: + // ImportedBinding + importClause.name = identifier; } - else { - parseExpected(54 /* ColonToken */); - node.propertyName = propertyName; - node.name = parseIdentifierOrPattern(); + // If there was no default import or if there is comma token after default import + // parse namespace or named imports + if (!importClause.name || + parseOptional(24 /* CommaToken */)) { + importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(225 /* NamedImports */); } - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); - return finishNode(node); - } - function parseObjectBindingPattern() { - var node = createNode(161 /* ObjectBindingPattern */); - parseExpected(15 /* OpenBraceToken */); - node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); - parseExpected(16 /* CloseBraceToken */); - return finishNode(node); + return finishNode(importClause); } - function parseArrayBindingPattern() { - var node = createNode(162 /* ArrayBindingPattern */); - parseExpected(19 /* OpenBracketToken */); - node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); - parseExpected(20 /* CloseBracketToken */); - return finishNode(node); + function parseModuleReference() { + return isExternalModuleReference() + ? parseExternalModuleReference() + : parseEntityName(/*allowReservedWords*/ false); } - function isIdentifierOrPattern() { - return token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */ || isIdentifier(); + function parseExternalModuleReference() { + var node = createNode(232 /* ExternalModuleReference */); + parseExpected(127 /* RequireKeyword */); + parseExpected(17 /* OpenParenToken */); + node.expression = parseModuleSpecifier(); + parseExpected(18 /* CloseParenToken */); + return finishNode(node); } - function parseIdentifierOrPattern() { - if (token === 19 /* OpenBracketToken */) { - return parseArrayBindingPattern(); - } - if (token === 15 /* OpenBraceToken */) { - return parseObjectBindingPattern(); + function parseModuleSpecifier() { + // We allow arbitrary expressions here, even though the grammar only allows string + // literals. We check to ensure that it is only a string literal later in the grammar + // walker. + var result = parseExpression(); + // Ensure the string being required is in our 'identifier' table. This will ensure + // that features like 'find refs' will look inside this file when search for its name. + if (result.kind === 9 /* StringLiteral */) { + internIdentifier(result.text); } - return parseIdentifier(); + return result; } - function parseVariableDeclaration() { - var node = createNode(211 /* VariableDeclaration */); - node.name = parseIdentifierOrPattern(); - node.type = parseTypeAnnotation(); - if (!isInOrOfKeyword(token)) { - node.initializer = parseInitializer(/*inParameter*/ false); - } + function parseNamespaceImport() { + // NameSpaceImport: + // * as ImportedBinding + var namespaceImport = createNode(224 /* NamespaceImport */); + parseExpected(37 /* AsteriskToken */); + parseExpected(116 /* AsKeyword */); + namespaceImport.name = parseIdentifier(); + return finishNode(namespaceImport); + } + function parseNamedImportsOrExports(kind) { + var node = createNode(kind); + // NamedImports: + // { } + // { ImportsList } + // { ImportsList, } + // ImportsList: + // ImportSpecifier + // ImportsList, ImportSpecifier + node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 225 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */); return finishNode(node); } - function parseVariableDeclarationList(inForStatementInitializer) { - var node = createNode(212 /* VariableDeclarationList */); - switch (token) { - case 102 /* VarKeyword */: - break; - case 108 /* LetKeyword */: - node.flags |= 8192 /* Let */; - break; - case 74 /* ConstKeyword */: - node.flags |= 16384 /* Const */; - break; - default: - ts.Debug.fail(); - } - nextToken(); - // The user may have written the following: - // - // for (let of X) { } - // - // In this case, we want to parse an empty declaration list, and then parse 'of' - // as a keyword. The reason this is not automatic is that 'of' is a valid identifier. - // So we need to look ahead to determine if 'of' should be treated as a keyword in - // this context. - // The checker will then give an error that there is an empty declaration list. - if (token === 134 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { - node.declarations = createMissingList(); + function parseExportSpecifier() { + return parseImportOrExportSpecifier(230 /* ExportSpecifier */); + } + function parseImportSpecifier() { + return parseImportOrExportSpecifier(226 /* ImportSpecifier */); + } + function parseImportOrExportSpecifier(kind) { + var node = createNode(kind); + // ImportSpecifier: + // BindingIdentifier + // IdentifierName as BindingIdentifier + // ExportSpecififer: + // IdentifierName + // IdentifierName as IdentifierName + var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + var checkIdentifierStart = scanner.getTokenPos(); + var checkIdentifierEnd = scanner.getTextPos(); + var identifierName = parseIdentifierName(); + if (token === 116 /* AsKeyword */) { + node.propertyName = identifierName; + parseExpected(116 /* AsKeyword */); + checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); + checkIdentifierStart = scanner.getTokenPos(); + checkIdentifierEnd = scanner.getTextPos(); + node.name = parseIdentifierName(); } else { - var savedDisallowIn = inDisallowInContext(); - setDisallowInContext(inForStatementInitializer); - node.declarations = parseDelimitedList(8 /* VariableDeclarations */, parseVariableDeclaration); - setDisallowInContext(savedDisallowIn); + node.name = identifierName; + } + if (kind === 226 /* ImportSpecifier */ && checkIdentifierIsKeyword) { + // Report error identifier expected + parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); } return finishNode(node); } - function canFollowContextualOfKeyword() { - return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */; - } - function parseVariableStatement(fullStart, decorators, modifiers) { - var node = createNode(193 /* VariableStatement */, fullStart); + function parseExportDeclaration(fullStart, decorators, modifiers) { + var node = createNode(228 /* ExportDeclaration */, fullStart); node.decorators = decorators; setModifiers(node, modifiers); - node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); + if (parseOptional(37 /* AsteriskToken */)) { + parseExpected(133 /* FromKeyword */); + node.moduleSpecifier = parseModuleSpecifier(); + } + else { + node.exportClause = parseNamedImportsOrExports(229 /* NamedExports */); + // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios, + // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`) + // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect. + if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { + parseExpected(133 /* FromKeyword */); + node.moduleSpecifier = parseModuleSpecifier(); + } + } parseSemicolon(); return finishNode(node); } - function parseFunctionDeclaration(fullStart, decorators, modifiers) { - var node = createNode(213 /* FunctionDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(87 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier(); - var isGenerator = !!node.asteriskToken; - var isAsync = !!(node.flags & 256 /* Async */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected); - return finishNode(node); - } - function parseConstructorDeclaration(pos, decorators, modifiers) { - var node = createNode(144 /* Constructor */, pos); + function parseExportAssignment(fullStart, decorators, modifiers) { + var node = createNode(227 /* ExportAssignment */, fullStart); node.decorators = decorators; setModifiers(node, modifiers); - parseExpected(121 /* ConstructorKeyword */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected); - return finishNode(node); - } - function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) { - var method = createNode(143 /* MethodDeclaration */, fullStart); - method.decorators = decorators; - setModifiers(method, modifiers); - method.asteriskToken = asteriskToken; - method.name = name; - method.questionToken = questionToken; - var isGenerator = !!asteriskToken; - var isAsync = !!(method.flags & 256 /* Async */); - fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method); - method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); - return finishNode(method); - } - function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) { - var property = createNode(141 /* PropertyDeclaration */, fullStart); - property.decorators = decorators; - setModifiers(property, modifiers); - property.name = name; - property.questionToken = questionToken; - property.type = parseTypeAnnotation(); - // For instance properties specifically, since they are evaluated inside the constructor, - // we do *not * want to parse yield expressions, so we specifically turn the yield context - // off. The grammar would look something like this: - // - // MemberVariableDeclaration[Yield]: - // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; - // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; - // - // The checker may still error in the static case to explicitly disallow the yield expression. - property.initializer = modifiers && modifiers.flags & 64 /* Static */ - ? allowInAnd(parseNonParameterInitializer) - : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer); - parseSemicolon(); - return finishNode(property); - } - function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) { - var asteriskToken = parseOptionalToken(37 /* AsteriskToken */); - var name = parsePropertyName(); - // Note: this is not legal as per the grammar. But we allow it in the parser and - // report an error in the grammar checker. - var questionToken = parseOptionalToken(53 /* QuestionToken */); - if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) { - return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected); + if (parseOptional(56 /* EqualsToken */)) { + node.isExportEquals = true; } else { - return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken); + parseExpected(77 /* DefaultKeyword */); } - } - function parseNonParameterInitializer() { - return parseInitializer(/*inParameter*/ false); - } - function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) { - var node = createNode(kind, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.name = parsePropertyName(); - fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); - node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false); + node.expression = parseAssignmentExpressionOrHigher(); + parseSemicolon(); return finishNode(node); } - function isClassMemberModifier(idToken) { - switch (idToken) { - case 112 /* PublicKeyword */: - case 110 /* PrivateKeyword */: - case 111 /* ProtectedKeyword */: - case 113 /* StaticKeyword */: - return true; - default: - return false; + function processReferenceComments(sourceFile) { + var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText); + var referencedFiles = []; + var amdDependencies = []; + var amdModuleName; + // Keep scanning all the leading trivia in the file until we get to something that + // isn't trivia. Any single line comment will be analyzed to see if it is a + // reference comment. + while (true) { + var kind = triviaScanner.scan(); + if (kind === 5 /* WhitespaceTrivia */ || kind === 4 /* NewLineTrivia */ || kind === 3 /* MultiLineCommentTrivia */) { + continue; + } + if (kind !== 2 /* SingleLineCommentTrivia */) { + break; + } + var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; + var comment = sourceText.substring(range.pos, range.end); + var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); + if (referencePathMatchResult) { + var fileReference = referencePathMatchResult.fileReference; + sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; + var diagnosticMessage = referencePathMatchResult.diagnosticMessage; + if (fileReference) { + referencedFiles.push(fileReference); + } + if (diagnosticMessage) { + parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); + } + } + else { + var amdModuleNameRegEx = /^\/\/\/\s*".length; + return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); } + } + function parseQualifiedName(left) { + var result = createNode(135 /* QualifiedName */, left.pos); + result.left = left; + result.right = parseIdentifierName(); + return finishNode(result); + } + function parseJSDocRecordType() { + var result = createNode(257 /* JSDocRecordType */); nextToken(); + result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember); + checkForTrailingComma(result.members); + parseExpected(16 /* CloseBraceToken */); + return finishNode(result); } - if (token === 37 /* AsteriskToken */) { - return true; + function parseJSDocRecordMember() { + var result = createNode(258 /* JSDocRecordMember */); + result.name = parseSimplePropertyName(); + if (token === 54 /* ColonToken */) { + nextToken(); + result.type = parseJSDocType(); + } + return finishNode(result); } - // Try to get the first property-like token following all modifiers. - // This can either be an identifier or the 'get' or 'set' keywords. - if (isLiteralPropertyName()) { - idToken = token; + function parseJSDocNonNullableType() { + var result = createNode(256 /* JSDocNonNullableType */); nextToken(); + result.type = parseJSDocType(); + return finishNode(result); } - // Index signatures and computed properties are class members; we can parse. - if (token === 19 /* OpenBracketToken */) { - return true; + function parseJSDocTupleType() { + var result = createNode(254 /* JSDocTupleType */); + nextToken(); + result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType); + checkForTrailingComma(result.types); + parseExpected(20 /* CloseBracketToken */); + return finishNode(result); } - // If we were able to get any potential identifier... - if (idToken !== undefined) { - // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse. - if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) { - return true; - } - // If it *is* a keyword, but not an accessor, check a little farther along - // to see if it should actually be parsed as a class member. - switch (token) { - case 17 /* OpenParenToken */: // Method declaration - case 25 /* LessThanToken */: // Generic Method declaration - case 54 /* ColonToken */: // Type Annotation for declaration - case 56 /* EqualsToken */: // Initializer for declaration - case 53 /* QuestionToken */: - return true; - default: - // Covers - // - Semicolons (declaration termination) - // - Closing braces (end-of-class, must be declaration) - // - End-of-files (not valid, but permitted so that it gets caught later on) - // - Line-breaks (enabling *automatic semicolon insertion*) - return canParseSemicolon(); + function checkForTrailingComma(list) { + if (parseDiagnostics.length === 0 && list.hasTrailingComma) { + var start = list.end - ",".length; + parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); } } - return false; - } - function parseDecorators() { - var decorators; - while (true) { - var decoratorStart = getNodePos(); - if (!parseOptional(55 /* AtToken */)) { - break; - } - if (!decorators) { - decorators = []; - decorators.pos = scanner.getStartPos(); + function parseJSDocUnionType() { + var result = createNode(253 /* JSDocUnionType */); + nextToken(); + result.types = parseJSDocTypeList(parseJSDocType()); + parseExpected(18 /* CloseParenToken */); + return finishNode(result); + } + function parseJSDocTypeList(firstType) { + ts.Debug.assert(!!firstType); + var types = []; + types.pos = firstType.pos; + types.push(firstType); + while (parseOptional(47 /* BarToken */)) { + types.push(parseJSDocType()); } - var decorator = createNode(139 /* Decorator */, decoratorStart); - decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); - decorators.push(finishNode(decorator)); + types.end = scanner.getStartPos(); + return types; } - if (decorators) { - decorators.end = getNodeEnd(); + function parseJSDocAllType() { + var result = createNode(250 /* JSDocAllType */); + nextToken(); + return finishNode(result); } - return decorators; - } - function parseModifiers() { - var flags = 0; - var modifiers; - while (true) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - if (!parseAnyContextualModifier()) { - break; + function parseJSDocUnknownOrNullableType() { + var pos = scanner.getStartPos(); + // skip the ? + nextToken(); + // Need to lookahead to decide if this is a nullable or unknown type. + // Here are cases where we'll pick the unknown type: + // + // Foo(?, + // { a: ? } + // Foo(?) + // Foo + // Foo(?= + // (?| + if (token === 24 /* CommaToken */ || + token === 16 /* CloseBraceToken */ || + token === 18 /* CloseParenToken */ || + token === 27 /* GreaterThanToken */ || + token === 56 /* EqualsToken */ || + token === 47 /* BarToken */) { + var result = createNode(251 /* JSDocUnknownType */, pos); + return finishNode(result); } - if (!modifiers) { - modifiers = []; - modifiers.pos = modifierStart; + else { + var result = createNode(255 /* JSDocNullableType */, pos); + result.type = parseJSDocType(); + return finishNode(result); } - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); } - if (modifiers) { - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); + function parseIsolatedJSDocComment(content, start, length) { + initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined); + var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length); + var diagnostics = parseDiagnostics; + clearState(); + return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; } - return modifiers; - } - function parseModifiersForArrowFunction() { - var flags = 0; - var modifiers; - if (token === 118 /* AsyncKeyword */) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token; - nextToken(); - modifiers = []; - modifiers.pos = modifierStart; - flags |= ts.modifierToFlag(modifierKind); - modifiers.push(finishNode(createNode(modifierKind, modifierStart))); - modifiers.flags = flags; - modifiers.end = scanner.getStartPos(); + JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; + function parseJSDocComment(parent, start, length) { + var comment = parseJSDocCommentWorker(start, length); + if (comment) { + fixupParentReferences(comment); + comment.parent = parent; + } + return comment; } - return modifiers; - } - function parseClassElement() { - if (token === 23 /* SemicolonToken */) { - var result = createNode(191 /* SemicolonClassElement */); - nextToken(); - return finishNode(result); + JSDocParser.parseJSDocComment = parseJSDocComment; + function parseJSDocCommentWorker(start, length) { + var content = sourceText; + start = start || 0; + var end = length === undefined ? content.length : start + length; + length = end - start; + ts.Debug.assert(start >= 0); + ts.Debug.assert(start <= end); + ts.Debug.assert(end <= content.length); + var tags; + var pos; + // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I + // considered using an actual Scanner, but this would complicate things. The + // scanner would need to know it was in a Doc Comment. Otherwise, it would then + // produce comments *inside* the doc comment. In the end it was just easier to + // write a simple scanner rather than go that route. + if (length >= "/** */".length) { + if (content.charCodeAt(start) === 47 /* slash */ && + content.charCodeAt(start + 1) === 42 /* asterisk */ && + content.charCodeAt(start + 2) === 42 /* asterisk */ && + content.charCodeAt(start + 3) !== 42 /* asterisk */) { + // Initially we can parse out a tag. We also have seen a starting asterisk. + // This is so that /** * @type */ doesn't parse. + var canParseTag = true; + var seenAsterisk = true; + for (pos = start + "/**".length; pos < end;) { + var ch = content.charCodeAt(pos); + pos++; + if (ch === 64 /* at */ && canParseTag) { + parseTag(); + // Once we parse out a tag, we cannot keep parsing out tags on this line. + canParseTag = false; + continue; + } + if (ts.isLineBreak(ch)) { + // After a line break, we can parse a tag, and we haven't seen as asterisk + // on the next line yet. + canParseTag = true; + seenAsterisk = false; + continue; + } + if (ts.isWhiteSpace(ch)) { + // Whitespace doesn't affect any of our parsing. + continue; + } + // Ignore the first asterisk on a line. + if (ch === 42 /* asterisk */) { + if (seenAsterisk) { + // If we've already seen an asterisk, then we can no longer parse a tag + // on this line. + canParseTag = false; + } + seenAsterisk = true; + continue; + } + // Anything else is doc comment text. We can't do anything with it. Because it + // wasn't a tag, we can no longer parse a tag on this line until we hit the next + // line break. + canParseTag = false; + } + } + } + return createJSDocComment(); + function createJSDocComment() { + if (!tags) { + return undefined; + } + var result = createNode(265 /* JSDocComment */, start); + result.tags = tags; + return finishNode(result, end); + } + function skipWhitespace() { + while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { + pos++; + } + } + function parseTag() { + ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */); + var atToken = createNode(55 /* AtToken */, pos - 1); + atToken.end = pos; + var tagName = scanIdentifier(); + if (!tagName) { + return; + } + var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); + addTag(tag); + } + function handleTag(atToken, tagName) { + if (tagName) { + switch (tagName.text) { + case "param": + return handleParamTag(atToken, tagName); + case "return": + case "returns": + return handleReturnTag(atToken, tagName); + case "template": + return handleTemplateTag(atToken, tagName); + case "type": + return handleTypeTag(atToken, tagName); + } + } + return undefined; + } + function handleUnknownTag(atToken, tagName) { + var result = createNode(266 /* JSDocTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + return finishNode(result, pos); + } + function addTag(tag) { + if (tag) { + if (!tags) { + tags = []; + tags.pos = tag.pos; + } + tags.push(tag); + tags.end = tag.end; + } + } + function tryParseTypeExpression() { + skipWhitespace(); + if (content.charCodeAt(pos) !== 123 /* openBrace */) { + return undefined; + } + var typeExpression = parseJSDocTypeExpression(pos, end - pos); + pos = typeExpression.end; + return typeExpression; + } + function handleParamTag(atToken, tagName) { + var typeExpression = tryParseTypeExpression(); + skipWhitespace(); + var name; + var isBracketed; + if (content.charCodeAt(pos) === 91 /* openBracket */) { + pos++; + skipWhitespace(); + name = scanIdentifier(); + isBracketed = true; + } + else { + name = scanIdentifier(); + } + if (!name) { + parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); + } + var preName, postName; + if (typeExpression) { + postName = name; + } + else { + preName = name; + } + if (!typeExpression) { + typeExpression = tryParseTypeExpression(); + } + var result = createNode(267 /* JSDocParameterTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.preParameterName = preName; + result.typeExpression = typeExpression; + result.postParameterName = postName; + result.isBracketed = isBracketed; + return finishNode(result, pos); + } + function handleReturnTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 268 /* JSDocReturnTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(268 /* JSDocReturnTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); + } + function handleTypeTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 269 /* JSDocTypeTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var result = createNode(269 /* JSDocTypeTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeExpression = tryParseTypeExpression(); + return finishNode(result, pos); + } + function handleTemplateTag(atToken, tagName) { + if (ts.forEach(tags, function (t) { return t.kind === 270 /* JSDocTemplateTag */; })) { + parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + var typeParameters = []; + typeParameters.pos = pos; + while (true) { + skipWhitespace(); + var startPos = pos; + var name_8 = scanIdentifier(); + if (!name_8) { + parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); + return undefined; + } + var typeParameter = createNode(137 /* TypeParameter */, name_8.pos); + typeParameter.name = name_8; + finishNode(typeParameter, pos); + typeParameters.push(typeParameter); + skipWhitespace(); + if (content.charCodeAt(pos) !== 44 /* comma */) { + break; + } + pos++; + } + typeParameters.end = pos; + var result = createNode(270 /* JSDocTemplateTag */, atToken.pos); + result.atToken = atToken; + result.tagName = tagName; + result.typeParameters = typeParameters; + return finishNode(result, pos); + } + function scanIdentifier() { + var startPos = pos; + for (; pos < end; pos++) { + var ch = content.charCodeAt(pos); + if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) { + continue; + } + else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) { + continue; + } + break; + } + if (startPos === pos) { + return undefined; + } + var result = createNode(69 /* Identifier */, startPos); + result.text = content.substring(startPos, pos); + return finishNode(result, pos); + } } - var fullStart = getNodePos(); - var decorators = parseDecorators(); - var modifiers = parseModifiers(); - var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers); - if (accessor) { - return accessor; + JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; + })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); + })(Parser || (Parser = {})); + var IncrementalParser; + (function (IncrementalParser) { + function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { + aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */); + checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); + if (ts.textChangeRangeIsUnchanged(textChangeRange)) { + // if the text didn't change, then we can just return our current source file as-is. + return sourceFile; } - if (token === 121 /* ConstructorKeyword */) { - return parseConstructorDeclaration(fullStart, decorators, modifiers); + if (sourceFile.statements.length === 0) { + // If we don't have any statements in the current source file, then there's no real + // way to incrementally parse. So just do a full parse instead. + return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true); + } + // Make sure we're not trying to incrementally update a source file more than once. Once + // we do an update the original source file is considered unusbale from that point onwards. + // + // This is because we do incremental parsing in-place. i.e. we take nodes from the old + // tree and give them new positions and parents. From that point on, trusting the old + // tree at all is not possible as far too much of it may violate invariants. + var incrementalSourceFile = sourceFile; + ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); + incrementalSourceFile.hasBeenIncrementallyParsed = true; + var oldText = sourceFile.text; + var syntaxCursor = createSyntaxCursor(sourceFile); + // Make the actual change larger so that we know to reparse anything whose lookahead + // might have intersected the change. + var changeRange = extendToAffectedRange(sourceFile, textChangeRange); + checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); + // Ensure that extending the affected range only moved the start of the change range + // earlier in the file. + ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); + ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); + ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); + // The is the amount the nodes after the edit range need to be adjusted. It can be + // positive (if the edit added characters), negative (if the edit deleted characters) + // or zero (if this was a pure overwrite with nothing added/removed). + var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; + // If we added or removed characters during the edit, then we need to go and adjust all + // the nodes after the edit. Those nodes may move forward (if we inserted chars) or they + // may move backward (if we deleted chars). + // + // Doing this helps us out in two ways. First, it means that any nodes/tokens we want + // to reuse are already at the appropriate position in the new text. That way when we + // reuse them, we don't have to figure out if they need to be adjusted. Second, it makes + // it very easy to determine if we can reuse a node. If the node's position is at where + // we are in the text, then we can reuse it. Otherwise we can't. If the node's position + // is ahead of us, then we'll need to rescan tokens. If the node's position is behind + // us, then we'll need to skip it or crumble it as appropriate + // + // We will also adjust the positions of nodes that intersect the change range as well. + // By doing this, we ensure that all the positions in the old tree are consistent, not + // just the positions of nodes entirely before/after the change range. By being + // consistent, we can then easily map from positions to nodes in the old tree easily. + // + // Also, mark any syntax elements that intersect the changed span. We know, up front, + // that we cannot reuse these elements. + updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); + // Now that we've set up our internal incremental state just proceed and parse the + // source file in the normal fashion. When possible the parser will retrieve and + // reuse nodes from the old tree. + // + // Note: passing in 'true' for setNodeParents is very important. When incrementally + // parsing, we will be reusing nodes from the old tree, and placing it into new + // parents. If we don't set the parents now, we'll end up with an observably + // inconsistent tree. Setting the parents on the new tree should be very fast. We + // will immediately bail out of walking any subtrees when we can see that their parents + // are already correct. + var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true); + return result; + } + IncrementalParser.updateSourceFile = updateSourceFile; + function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { + if (isArray) { + visitArray(element); } - if (isIndexSignature()) { - return parseIndexSignatureDeclaration(fullStart, decorators, modifiers); + else { + visitNode(element); } - // It is very important that we check this *after* checking indexers because - // the [ token can start an index signature or a computed property name - if (ts.tokenIsIdentifierOrKeyword(token) || - token === 9 /* StringLiteral */ || - token === 8 /* NumericLiteral */ || - token === 37 /* AsteriskToken */ || - token === 19 /* OpenBracketToken */) { - return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers); + return; + function visitNode(node) { + var text = ""; + if (aggressiveChecks && shouldCheckNode(node)) { + text = oldText.substring(node.pos, node.end); + } + // Ditch any existing LS children we may have created. This way we can avoid + // moving them forward. + if (node._children) { + node._children = undefined; + } + if (node.jsDocComment) { + node.jsDocComment = undefined; + } + node.pos += delta; + node.end += delta; + if (aggressiveChecks && shouldCheckNode(node)) { + ts.Debug.assert(text === newText.substring(node.pos, node.end)); + } + forEachChild(node, visitNode, visitArray); + checkNodePositions(node, aggressiveChecks); } - if (decorators || modifiers) { - // treat this as a property declaration with a missing name. - var name_7 = createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, /*questionToken*/ undefined); + function visitArray(array) { + array._children = undefined; + array.pos += delta; + array.end += delta; + for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { + var node = array_7[_i]; + visitNode(node); + } } - // 'isClassMemberStart' should have hinted not to attempt parsing. - ts.Debug.fail("Should not have attempted to parse class member declaration."); - } - function parseClassExpression() { - return parseClassDeclarationOrExpression( - /*fullStart*/ scanner.getStartPos(), - /*decorators*/ undefined, - /*modifiers*/ undefined, 186 /* ClassExpression */); } - function parseClassDeclaration(fullStart, decorators, modifiers) { - return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 214 /* ClassDeclaration */); + function shouldCheckNode(node) { + switch (node.kind) { + case 9 /* StringLiteral */: + case 8 /* NumericLiteral */: + case 69 /* Identifier */: + return true; + } + return false; } - function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) { - var node = createNode(kind, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(73 /* ClassKeyword */); - node.name = parseNameOfClassDeclarationOrExpression(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ true); - if (parseExpected(15 /* OpenBraceToken */)) { - // ClassTail[Yield,Await] : (Modified) See 14.5 - // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } - node.members = parseClassMembers(); - parseExpected(16 /* CloseBraceToken */); + function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { + ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); + ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); + ts.Debug.assert(element.pos <= element.end); + // We have an element that intersects the change range in some way. It may have its + // start, or its end (or both) in the changed range. We want to adjust any part + // that intersects such that the final tree is in a consistent state. i.e. all + // chlidren have spans within the span of their parent, and all siblings are ordered + // properly. + // We may need to update both the 'pos' and the 'end' of the element. + // If the 'pos' is before the start of the change, then we don't need to touch it. + // If it isn't, then the 'pos' must be inside the change. How we update it will + // depend if delta is positive or negative. If delta is positive then we have + // something like: + // + // -------------------AAA----------------- + // -------------------BBBCCCCCCC----------------- + // + // In this case, we consider any node that started in the change range to still be + // starting at the same position. + // + // however, if the delta is negative, then we instead have something like this: + // + // -------------------XXXYYYYYYY----------------- + // -------------------ZZZ----------------- + // + // In this case, any element that started in the 'X' range will keep its position. + // However any element htat started after that will have their pos adjusted to be + // at the end of the new range. i.e. any node that started in the 'Y' range will + // be adjusted to have their start at the end of the 'Z' range. + // + // The element will keep its position if possible. Or Move backward to the new-end + // if it's in the 'Y' range. + element.pos = Math.min(element.pos, changeRangeNewEnd); + // If the 'end' is after the change range, then we always adjust it by the delta + // amount. However, if the end is in the change range, then how we adjust it + // will depend on if delta is positive or negative. If delta is positive then we + // have something like: + // + // -------------------AAA----------------- + // -------------------BBBCCCCCCC----------------- + // + // In this case, we consider any node that ended inside the change range to keep its + // end position. + // + // however, if the delta is negative, then we instead have something like this: + // + // -------------------XXXYYYYYYY----------------- + // -------------------ZZZ----------------- + // + // In this case, any element that ended in the 'X' range will keep its position. + // However any element htat ended after that will have their pos adjusted to be + // at the end of the new range. i.e. any node that ended in the 'Y' range will + // be adjusted to have their end at the end of the 'Z' range. + if (element.end >= changeRangeOldEnd) { + // Element ends after the change range. Always adjust the end pos. + element.end += delta; } else { - node.members = createMissingList(); + // Element ends in the change range. The element will keep its position if + // possible. Or Move backward to the new-end if it's in the 'Y' range. + element.end = Math.min(element.end, changeRangeNewEnd); } - return finishNode(node); - } - function parseNameOfClassDeclarationOrExpression() { - // implements is a future reserved word so - // 'class implements' might mean either - // - class expression with omitted name, 'implements' starts heritage clause - // - class with name 'implements' - // 'isImplementsClause' helps to disambiguate between these two cases - return isIdentifier() && !isImplementsClause() - ? parseIdentifier() - : undefined; - } - function isImplementsClause() { - return token === 106 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); - } - function parseHeritageClauses(isClassHeritageClause) { - // ClassTail[Yield,Await] : (Modified) See 14.5 - // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } - if (isHeritageClause()) { - return parseList(20 /* HeritageClauses */, parseHeritageClause); + ts.Debug.assert(element.pos <= element.end); + if (element.parent) { + ts.Debug.assert(element.pos >= element.parent.pos); + ts.Debug.assert(element.end <= element.parent.end); } - return undefined; - } - function parseHeritageClausesWorker() { - return parseList(20 /* HeritageClauses */, parseHeritageClause); } - function parseHeritageClause() { - if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) { - var node = createNode(243 /* HeritageClause */); - node.token = token; - nextToken(); - node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); - return finishNode(node); + function checkNodePositions(node, aggressiveChecks) { + if (aggressiveChecks) { + var pos = node.pos; + forEachChild(node, function (child) { + ts.Debug.assert(child.pos >= pos); + pos = child.end; + }); + ts.Debug.assert(pos <= node.end); } - return undefined; } - function parseExpressionWithTypeArguments() { - var node = createNode(188 /* ExpressionWithTypeArguments */); - node.expression = parseLeftHandSideExpressionOrHigher(); - if (token === 25 /* LessThanToken */) { - node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */); + function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { + visitNode(sourceFile); + return; + function visitNode(child) { + ts.Debug.assert(child.pos <= child.end); + if (child.pos > changeRangeOldEnd) { + // Node is entirely past the change range. We need to move both its pos and + // end, forward or backward appropriately. + moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks); + return; + } + // Check if the element intersects the change range. If it does, then it is not + // reusable. Also, we'll need to recurse to see what constituent portions we may + // be able to use. + var fullEnd = child.end; + if (fullEnd >= changeStart) { + child.intersectsChange = true; + child._children = undefined; + // Adjust the pos or end (or both) of the intersecting element accordingly. + adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + forEachChild(child, visitNode, visitArray); + checkNodePositions(child, aggressiveChecks); + return; + } + // Otherwise, the node is entirely before the change range. No need to do anything with it. + ts.Debug.assert(fullEnd < changeStart); + } + function visitArray(array) { + ts.Debug.assert(array.pos <= array.end); + if (array.pos > changeRangeOldEnd) { + // Array is entirely after the change range. We need to move it, and move any of + // its children. + moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks); + return; + } + // Check if the element intersects the change range. If it does, then it is not + // reusable. Also, we'll need to recurse to see what constituent portions we may + // be able to use. + var fullEnd = array.end; + if (fullEnd >= changeStart) { + array.intersectsChange = true; + array._children = undefined; + // Adjust the pos or end (or both) of the intersecting array accordingly. + adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); + for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { + var node = array_8[_i]; + visitNode(node); + } + return; + } + // Otherwise, the array is entirely before the change range. No need to do anything with it. + ts.Debug.assert(fullEnd < changeStart); } - return finishNode(node); - } - function isHeritageClause() { - return token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */; - } - function parseClassMembers() { - return parseList(5 /* ClassMembers */, parseClassElement); - } - function parseInterfaceDeclaration(fullStart, decorators, modifiers) { - var node = createNode(215 /* InterfaceDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(107 /* InterfaceKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ false); - node.members = parseObjectTypeMembers(); - return finishNode(node); - } - function parseTypeAliasDeclaration(fullStart, decorators, modifiers) { - var node = createNode(216 /* TypeAliasDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(132 /* TypeKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - parseExpected(56 /* EqualsToken */); - node.type = parseType(); - parseSemicolon(); - return finishNode(node); } - // In an ambient declaration, the grammar only allows integer literals as initializers. - // In a non-ambient declaration, the grammar allows uninitialized members only in a - // ConstantEnumMemberSection, which starts at the beginning of an enum declaration - // or any time an integer literal initializer is encountered. - function parseEnumMember() { - var node = createNode(247 /* EnumMember */, scanner.getStartPos()); - node.name = parsePropertyName(); - node.initializer = allowInAnd(parseNonParameterInitializer); - return finishNode(node); + function extendToAffectedRange(sourceFile, changeRange) { + // Consider the following code: + // void foo() { /; } + // + // If the text changes with an insertion of / just before the semicolon then we end up with: + // void foo() { //; } + // + // If we were to just use the changeRange a is, then we would not rescan the { token + // (as it does not intersect the actual original change range). Because an edit may + // change the token touching it, we actually need to look back *at least* one token so + // that the prior token sees that change. + var maxLookahead = 1; + var start = changeRange.span.start; + // the first iteration aligns us with the change start. subsequent iteration move us to + // the left by maxLookahead tokens. We only need to do this as long as we're not at the + // start of the tree. + for (var i = 0; start > 0 && i <= maxLookahead; i++) { + var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); + ts.Debug.assert(nearestNode.pos <= start); + var position = nearestNode.pos; + start = Math.max(0, position - 1); + } + var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); + var finalLength = changeRange.newLength + (changeRange.span.start - start); + return ts.createTextChangeRange(finalSpan, finalLength); } - function parseEnumDeclaration(fullStart, decorators, modifiers) { - var node = createNode(217 /* EnumDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - parseExpected(81 /* EnumKeyword */); - node.name = parseIdentifier(); - if (parseExpected(15 /* OpenBraceToken */)) { - node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember); - parseExpected(16 /* CloseBraceToken */); + function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { + var bestResult = sourceFile; + var lastNodeEntirelyBeforePosition; + forEachChild(sourceFile, visit); + if (lastNodeEntirelyBeforePosition) { + var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); + if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { + bestResult = lastChildOfLastEntireNodeBeforePosition; + } } - else { - node.members = createMissingList(); + return bestResult; + function getLastChild(node) { + while (true) { + var lastChild = getLastChildWorker(node); + if (lastChild) { + node = lastChild; + } + else { + return node; + } + } } - return finishNode(node); - } - function parseModuleBlock() { - var node = createNode(219 /* ModuleBlock */, scanner.getStartPos()); - if (parseExpected(15 /* OpenBraceToken */)) { - node.statements = parseList(1 /* BlockStatements */, parseStatement); - parseExpected(16 /* CloseBraceToken */); + function getLastChildWorker(node) { + var last = undefined; + forEachChild(node, function (child) { + if (ts.nodeIsPresent(child)) { + last = child; + } + }); + return last; } - else { - node.statements = createMissingList(); + function visit(child) { + if (ts.nodeIsMissing(child)) { + // Missing nodes are effectively invisible to us. We never even consider them + // When trying to find the nearest node before us. + return; + } + // If the child intersects this position, then this node is currently the nearest + // node that starts before the position. + if (child.pos <= position) { + if (child.pos >= bestResult.pos) { + // This node starts before the position, and is closer to the position than + // the previous best node we found. It is now the new best node. + bestResult = child; + } + // Now, the node may overlap the position, or it may end entirely before the + // position. If it overlaps with the position, then either it, or one of its + // children must be the nearest node before the position. So we can just + // recurse into this child to see if we can find something better. + if (position < child.end) { + // The nearest node is either this child, or one of the children inside + // of it. We've already marked this child as the best so far. Recurse + // in case one of the children is better. + forEachChild(child, visit); + // Once we look at the children of this node, then there's no need to + // continue any further. + return true; + } + else { + ts.Debug.assert(child.end <= position); + // The child ends entirely before this position. Say you have the following + // (where $ is the position) + // + // ? $ : <...> <...> + // + // We would want to find the nearest preceding node in "complex expr 2". + // To support that, we keep track of this node, and once we're done searching + // for a best node, we recurse down this node to see if we can find a good + // result in it. + // + // This approach allows us to quickly skip over nodes that are entirely + // before the position, while still allowing us to find any nodes in the + // last one that might be what we want. + lastNodeEntirelyBeforePosition = child; + } + } + else { + ts.Debug.assert(child.pos > position); + // We're now at a node that is entirely past the position we're searching for. + // This node (and all following nodes) could never contribute to the result, + // so just skip them by returning 'true' here. + return true; + } } - return finishNode(node); - } - function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) { - var node = createNode(218 /* ModuleDeclaration */, fullStart); - // If we are parsing a dotted namespace name, we want to - // propagate the 'Namespace' flag across the names if set. - var namespaceFlag = flags & 65536 /* Namespace */; - node.decorators = decorators; - setModifiers(node, modifiers); - node.flags |= flags; - node.name = parseIdentifier(); - node.body = parseOptional(21 /* DotToken */) - ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag) - : parseModuleBlock(); - return finishNode(node); - } - function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) { - var node = createNode(218 /* ModuleDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - node.name = parseLiteralNode(/*internName*/ true); - node.body = parseModuleBlock(); - return finishNode(node); } - function parseModuleDeclaration(fullStart, decorators, modifiers) { - var flags = modifiers ? modifiers.flags : 0; - if (parseOptional(126 /* NamespaceKeyword */)) { - flags |= 65536 /* Namespace */; + function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { + var oldText = sourceFile.text; + if (textChangeRange) { + ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); + if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) { + var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); + var newTextPrefix = newText.substr(0, textChangeRange.span.start); + ts.Debug.assert(oldTextPrefix === newTextPrefix); + var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); + var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); + ts.Debug.assert(oldTextSuffix === newTextSuffix); + } } - else { - parseExpected(125 /* ModuleKeyword */); - if (token === 9 /* StringLiteral */) { - return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers); + } + function createSyntaxCursor(sourceFile) { + var currentArray = sourceFile.statements; + var currentArrayIndex = 0; + ts.Debug.assert(currentArrayIndex < currentArray.length); + var current = currentArray[currentArrayIndex]; + var lastQueriedPosition = -1 /* Value */; + return { + currentNode: function (position) { + // Only compute the current node if the position is different than the last time + // we were asked. The parser commonly asks for the node at the same position + // twice. Once to know if can read an appropriate list element at a certain point, + // and then to actually read and consume the node. + if (position !== lastQueriedPosition) { + // Much of the time the parser will need the very next node in the array that + // we just returned a node from.So just simply check for that case and move + // forward in the array instead of searching for the node again. + if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { + currentArrayIndex++; + current = currentArray[currentArrayIndex]; + } + // If we don't have a node, or the node we have isn't in the right position, + // then try to find a viable node at the position requested. + if (!current || current.pos !== position) { + findHighestListElementThatStartsAtPosition(position); + } + } + // Cache this query so that we don't do any extra work if the parser calls back + // into us. Note: this is very common as the parser will make pairs of calls like + // 'isListElement -> parseListElement'. If we were unable to find a node when + // called with 'isListElement', we don't want to redo the work when parseListElement + // is called immediately after. + lastQueriedPosition = position; + // Either we don'd have a node, or we have a node at the position being asked for. + ts.Debug.assert(!current || current.pos === position); + return current; + } + }; + // Finds the highest element in the tree we can find that starts at the provided position. + // The element must be a direct child of some node list in the tree. This way after we + // return it, we can easily return its next sibling in the list. + function findHighestListElementThatStartsAtPosition(position) { + // Clear out any cached state about the last node we found. + currentArray = undefined; + currentArrayIndex = -1 /* Value */; + current = undefined; + // Recurse into the source file to find the highest node at this position. + forEachChild(sourceFile, visitNode, visitArray); + return; + function visitNode(node) { + if (position >= node.pos && position < node.end) { + // Position was within this node. Keep searching deeper to find the node. + forEachChild(node, visitNode, visitArray); + // don't procede any futher in the search. + return true; + } + // position wasn't in this node, have to keep searching. + return false; + } + function visitArray(array) { + if (position >= array.pos && position < array.end) { + // position was in this array. Search through this array to see if we find a + // viable element. + for (var i = 0, n = array.length; i < n; i++) { + var child = array[i]; + if (child) { + if (child.pos === position) { + // Found the right node. We're done. + currentArray = array; + currentArrayIndex = i; + current = child; + return true; + } + else { + if (child.pos < position && position < child.end) { + // Position in somewhere within this child. Search in it and + // stop searching in this array. + forEachChild(child, visitNode, visitArray); + return true; + } + } + } + } + } + // position wasn't in this array, have to keep searching. + return false; } } - return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags); - } - function isExternalModuleReference() { - return token === 127 /* RequireKeyword */ && - lookAhead(nextTokenIsOpenParen); } - function nextTokenIsOpenParen() { - return nextToken() === 17 /* OpenParenToken */; + var InvalidPosition; + (function (InvalidPosition) { + InvalidPosition[InvalidPosition["Value"] = -1] = "Value"; + })(InvalidPosition || (InvalidPosition = {})); + })(IncrementalParser || (IncrementalParser = {})); +})(ts || (ts = {})); +/// +/// +/* @internal */ +var ts; +(function (ts) { + ts.bindTime = 0; + (function (ModuleInstanceState) { + ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated"; + ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated"; + ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly"; + })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {})); + var ModuleInstanceState = ts.ModuleInstanceState; + var Reachability; + (function (Reachability) { + Reachability[Reachability["Unintialized"] = 1] = "Unintialized"; + Reachability[Reachability["Reachable"] = 2] = "Reachable"; + Reachability[Reachability["Unreachable"] = 4] = "Unreachable"; + Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable"; + })(Reachability || (Reachability = {})); + function or(state1, state2) { + return (state1 | state2) & 2 /* Reachable */ + ? 2 /* Reachable */ + : (state1 & state2) & 8 /* ReportedUnreachable */ + ? 8 /* ReportedUnreachable */ + : 4 /* Unreachable */; + } + function getModuleInstanceState(node) { + // A module is uninstantiated if it contains only + // 1. interface declarations, type alias declarations + if (node.kind === 215 /* InterfaceDeclaration */ || node.kind === 216 /* TypeAliasDeclaration */) { + return 0 /* NonInstantiated */; } - function nextTokenIsSlash() { - return nextToken() === 39 /* SlashToken */; + else if (ts.isConstEnumDeclaration(node)) { + return 2 /* ConstEnumOnly */; } - function nextTokenIsCommaOrFromKeyword() { - nextToken(); - return token === 24 /* CommaToken */ || - token === 133 /* FromKeyword */; + else if ((node.kind === 222 /* ImportDeclaration */ || node.kind === 221 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) { + return 0 /* NonInstantiated */; } - function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) { - parseExpected(89 /* ImportKeyword */); - var afterImportPos = scanner.getStartPos(); - var identifier; - if (isIdentifier()) { - identifier = parseIdentifier(); - if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) { - // ImportEquals declaration of type: - // import x = require("mod"); or - // import x = M.x; - var importEqualsDeclaration = createNode(221 /* ImportEqualsDeclaration */, fullStart); - importEqualsDeclaration.decorators = decorators; - setModifiers(importEqualsDeclaration, modifiers); - importEqualsDeclaration.name = identifier; - parseExpected(56 /* EqualsToken */); - importEqualsDeclaration.moduleReference = parseModuleReference(); - parseSemicolon(); - return finishNode(importEqualsDeclaration); + else if (node.kind === 219 /* ModuleBlock */) { + var state = 0 /* NonInstantiated */; + ts.forEachChild(node, function (n) { + switch (getModuleInstanceState(n)) { + case 0 /* NonInstantiated */: + // child is non-instantiated - continue searching + return false; + case 2 /* ConstEnumOnly */: + // child is const enum only - record state and continue searching + state = 2 /* ConstEnumOnly */; + return false; + case 1 /* Instantiated */: + // child is instantiated - record state and stop + state = 1 /* Instantiated */; + return true; } - } - // Import statement - var importDeclaration = createNode(222 /* ImportDeclaration */, fullStart); - importDeclaration.decorators = decorators; - setModifiers(importDeclaration, modifiers); - // ImportDeclaration: - // import ImportClause from ModuleSpecifier ; - // import ModuleSpecifier; - if (identifier || - token === 37 /* AsteriskToken */ || - token === 15 /* OpenBraceToken */) { - importDeclaration.importClause = parseImportClause(identifier, afterImportPos); - parseExpected(133 /* FromKeyword */); - } - importDeclaration.moduleSpecifier = parseModuleSpecifier(); - parseSemicolon(); - return finishNode(importDeclaration); - } - function parseImportClause(identifier, fullStart) { - // ImportClause: - // ImportedDefaultBinding - // NameSpaceImport - // NamedImports - // ImportedDefaultBinding, NameSpaceImport - // ImportedDefaultBinding, NamedImports - var importClause = createNode(223 /* ImportClause */, fullStart); - if (identifier) { - // ImportedDefaultBinding: - // ImportedBinding - importClause.name = identifier; - } - // If there was no default import or if there is comma token after default import - // parse namespace or named imports - if (!importClause.name || - parseOptional(24 /* CommaToken */)) { - importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(225 /* NamedImports */); - } - return finishNode(importClause); + }); + return state; } - function parseModuleReference() { - return isExternalModuleReference() - ? parseExternalModuleReference() - : parseEntityName(/*allowReservedWords*/ false); + else if (node.kind === 218 /* ModuleDeclaration */) { + return getModuleInstanceState(node.body); } - function parseExternalModuleReference() { - var node = createNode(232 /* ExternalModuleReference */); - parseExpected(127 /* RequireKeyword */); - parseExpected(17 /* OpenParenToken */); - node.expression = parseModuleSpecifier(); - parseExpected(18 /* CloseParenToken */); - return finishNode(node); + else { + return 1 /* Instantiated */; } - function parseModuleSpecifier() { - // We allow arbitrary expressions here, even though the grammar only allows string - // literals. We check to ensure that it is only a string literal later in the grammar - // walker. - var result = parseExpression(); - // Ensure the string being required is in our 'identifier' table. This will ensure - // that features like 'find refs' will look inside this file when search for its name. - if (result.kind === 9 /* StringLiteral */) { - internIdentifier(result.text); + } + ts.getModuleInstanceState = getModuleInstanceState; + var ContainerFlags; + (function (ContainerFlags) { + // The current node is not a container, and no container manipulation should happen before + // recursing into it. + ContainerFlags[ContainerFlags["None"] = 0] = "None"; + // The current node is a container. It should be set as the current container (and block- + // container) before recursing into it. The current node does not have locals. Examples: + // + // Classes, ObjectLiterals, TypeLiterals, Interfaces... + ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer"; + // The current node is a block-scoped-container. It should be set as the current block- + // container before recursing into it. Examples: + // + // Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements... + ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer"; + ContainerFlags[ContainerFlags["HasLocals"] = 4] = "HasLocals"; + // If the current node is a container that also container that also contains locals. Examples: + // + // Functions, Methods, Modules, Source-files. + ContainerFlags[ContainerFlags["IsContainerWithLocals"] = 5] = "IsContainerWithLocals"; + })(ContainerFlags || (ContainerFlags = {})); + var binder = createBinder(); + function bindSourceFile(file, options) { + var start = new Date().getTime(); + binder(file, options); + ts.bindTime += new Date().getTime() - start; + } + ts.bindSourceFile = bindSourceFile; + function createBinder() { + var file; + var options; + var parent; + var container; + var blockScopeContainer; + var lastContainer; + var seenThisKeyword; + // state used by reachability checks + var hasExplicitReturn; + var currentReachabilityState; + var labelStack; + var labelIndexMap; + var implicitLabels; + // If this file is an external module, then it is automatically in strict-mode according to + // ES6. If it is not an external module, then we'll determine if it is in strict mode or + // not depending on if we see "use strict" in certain places (or if we hit a class/namespace). + var inStrictMode; + var symbolCount = 0; + var Symbol; + var classifiableNames; + function bindSourceFile(f, opts) { + file = f; + options = opts; + inStrictMode = !!file.externalModuleIndicator; + classifiableNames = {}; + Symbol = ts.objectAllocator.getSymbolConstructor(); + if (!file.locals) { + bind(file); + file.symbolCount = symbolCount; + file.classifiableNames = classifiableNames; } - return result; - } - function parseNamespaceImport() { - // NameSpaceImport: - // * as ImportedBinding - var namespaceImport = createNode(224 /* NamespaceImport */); - parseExpected(37 /* AsteriskToken */); - parseExpected(116 /* AsKeyword */); - namespaceImport.name = parseIdentifier(); - return finishNode(namespaceImport); - } - function parseNamedImportsOrExports(kind) { - var node = createNode(kind); - // NamedImports: - // { } - // { ImportsList } - // { ImportsList, } - // ImportsList: - // ImportSpecifier - // ImportsList, ImportSpecifier - node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 225 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */); - return finishNode(node); - } - function parseExportSpecifier() { - return parseImportOrExportSpecifier(230 /* ExportSpecifier */); - } - function parseImportSpecifier() { - return parseImportOrExportSpecifier(226 /* ImportSpecifier */); + parent = undefined; + container = undefined; + blockScopeContainer = undefined; + lastContainer = undefined; + seenThisKeyword = false; + hasExplicitReturn = false; + labelStack = undefined; + labelIndexMap = undefined; + implicitLabels = undefined; } - function parseImportOrExportSpecifier(kind) { - var node = createNode(kind); - // ImportSpecifier: - // BindingIdentifier - // IdentifierName as BindingIdentifier - // ExportSpecififer: - // IdentifierName - // IdentifierName as IdentifierName - var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - var checkIdentifierStart = scanner.getTokenPos(); - var checkIdentifierEnd = scanner.getTextPos(); - var identifierName = parseIdentifierName(); - if (token === 116 /* AsKeyword */) { - node.propertyName = identifierName; - parseExpected(116 /* AsKeyword */); - checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier(); - checkIdentifierStart = scanner.getTokenPos(); - checkIdentifierEnd = scanner.getTextPos(); - node.name = parseIdentifierName(); - } - else { - node.name = identifierName; - } - if (kind === 226 /* ImportSpecifier */ && checkIdentifierIsKeyword) { - // Report error identifier expected - parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected); - } - return finishNode(node); + return bindSourceFile; + function createSymbol(flags, name) { + symbolCount++; + return new Symbol(flags, name); } - function parseExportDeclaration(fullStart, decorators, modifiers) { - var node = createNode(228 /* ExportDeclaration */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(37 /* AsteriskToken */)) { - parseExpected(133 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); + function addDeclarationToSymbol(symbol, node, symbolFlags) { + symbol.flags |= symbolFlags; + node.symbol = symbol; + if (!symbol.declarations) { + symbol.declarations = []; } - else { - node.exportClause = parseNamedImportsOrExports(229 /* NamedExports */); - // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios, - // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`) - // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect. - if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { - parseExpected(133 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); - } + symbol.declarations.push(node); + if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) { + symbol.exports = {}; } - parseSemicolon(); - return finishNode(node); - } - function parseExportAssignment(fullStart, decorators, modifiers) { - var node = createNode(227 /* ExportAssignment */, fullStart); - node.decorators = decorators; - setModifiers(node, modifiers); - if (parseOptional(56 /* EqualsToken */)) { - node.isExportEquals = true; + if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) { + symbol.members = {}; } - else { - parseExpected(77 /* DefaultKeyword */); + if (symbolFlags & 107455 /* Value */ && !symbol.valueDeclaration) { + symbol.valueDeclaration = node; } - node.expression = parseAssignmentExpressionOrHigher(); - parseSemicolon(); - return finishNode(node); } - function processReferenceComments(sourceFile) { - var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText); - var referencedFiles = []; - var amdDependencies = []; - var amdModuleName; - // Keep scanning all the leading trivia in the file until we get to something that - // isn't trivia. Any single line comment will be analyzed to see if it is a - // reference comment. - while (true) { - var kind = triviaScanner.scan(); - if (kind === 5 /* WhitespaceTrivia */ || kind === 4 /* NewLineTrivia */ || kind === 3 /* MultiLineCommentTrivia */) { - continue; - } - if (kind !== 2 /* SingleLineCommentTrivia */) { - break; - } - var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() }; - var comment = sourceText.substring(range.pos, range.end); - var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range); - if (referencePathMatchResult) { - var fileReference = referencePathMatchResult.fileReference; - sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - var diagnosticMessage = referencePathMatchResult.diagnosticMessage; - if (fileReference) { - referencedFiles.push(fileReference); - } - if (diagnosticMessage) { - parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage)); - } + // Should not be called on a declaration with a computed property name, + // unless it is a well known Symbol. + function getDeclarationName(node) { + if (node.name) { + if (node.kind === 218 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) { + return "\"" + node.name.text + "\""; } - else { - var amdModuleNameRegEx = /^\/\/\/\s*".length; - return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty); - } + container = saveContainer; + parent = saveParent; + blockScopeContainer = savedBlockScopeContainer; + } + /** + * Returns true if node and its subnodes were successfully traversed. + * Returning false means that node was not examined and caller needs to dive into the node himself. + */ + function bindReachableStatement(node) { + if (checkUnreachable(node)) { + ts.forEachChild(node, bind); + return; } - function parseQualifiedName(left) { - var result = createNode(135 /* QualifiedName */, left.pos); - result.left = left; - result.right = parseIdentifierName(); - return finishNode(result); + switch (node.kind) { + case 198 /* WhileStatement */: + bindWhileStatement(node); + break; + case 197 /* DoStatement */: + bindDoStatement(node); + break; + case 199 /* ForStatement */: + bindForStatement(node); + break; + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + bindForInOrForOfStatement(node); + break; + case 196 /* IfStatement */: + bindIfStatement(node); + break; + case 204 /* ReturnStatement */: + case 208 /* ThrowStatement */: + bindReturnOrThrow(node); + break; + case 203 /* BreakStatement */: + case 202 /* ContinueStatement */: + bindBreakOrContinueStatement(node); + break; + case 209 /* TryStatement */: + bindTryStatement(node); + break; + case 206 /* SwitchStatement */: + bindSwitchStatement(node); + break; + case 220 /* CaseBlock */: + bindCaseBlock(node); + break; + case 207 /* LabeledStatement */: + bindLabeledStatement(node); + break; + default: + ts.forEachChild(node, bind); + break; } - function parseJSDocRecordType() { - var result = createNode(257 /* JSDocRecordType */); - nextToken(); - result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember); - checkForTrailingComma(result.members); - parseExpected(16 /* CloseBraceToken */); - return finishNode(result); + } + function bindWhileStatement(n) { + var preWhileState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + var postWhileState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + // bind expressions (don't affect reachability) + bind(n.expression); + currentReachabilityState = preWhileState; + var postWhileLabel = pushImplicitLabel(); + bind(n.statement); + popImplicitLabel(postWhileLabel, postWhileState); + } + function bindDoStatement(n) { + var preDoState = currentReachabilityState; + var postDoLabel = pushImplicitLabel(); + bind(n.statement); + var postDoState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : preDoState; + popImplicitLabel(postDoLabel, postDoState); + // bind expressions (don't affect reachability) + bind(n.expression); + } + function bindForStatement(n) { + var preForState = currentReachabilityState; + var postForLabel = pushImplicitLabel(); + // bind expressions (don't affect reachability) + bind(n.initializer); + bind(n.condition); + bind(n.incrementor); + bind(n.statement); + // for statement is considered infinite when it condition is either omitted or is true keyword + // - for(..;;..) + // - for(..;true;..) + var isInfiniteLoop = (!n.condition || n.condition.kind === 99 /* TrueKeyword */); + var postForState = isInfiniteLoop ? 4 /* Unreachable */ : preForState; + popImplicitLabel(postForLabel, postForState); + } + function bindForInOrForOfStatement(n) { + var preStatementState = currentReachabilityState; + var postStatementLabel = pushImplicitLabel(); + // bind expressions (don't affect reachability) + bind(n.initializer); + bind(n.expression); + bind(n.statement); + popImplicitLabel(postStatementLabel, preStatementState); + } + function bindIfStatement(n) { + // denotes reachability state when entering 'thenStatement' part of the if statement: + // i.e. if condition is false then thenStatement is unreachable + var ifTrueState = n.expression.kind === 84 /* FalseKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + // denotes reachability state when entering 'elseStatement': + // i.e. if condition is true then elseStatement is unreachable + var ifFalseState = n.expression.kind === 99 /* TrueKeyword */ ? 4 /* Unreachable */ : currentReachabilityState; + currentReachabilityState = ifTrueState; + // bind expression (don't affect reachability) + bind(n.expression); + bind(n.thenStatement); + if (n.elseStatement) { + var preElseState = currentReachabilityState; + currentReachabilityState = ifFalseState; + bind(n.elseStatement); + currentReachabilityState = or(currentReachabilityState, preElseState); } - function parseJSDocRecordMember() { - var result = createNode(258 /* JSDocRecordMember */); - result.name = parseSimplePropertyName(); - if (token === 54 /* ColonToken */) { - nextToken(); - result.type = parseJSDocType(); - } - return finishNode(result); + else { + currentReachabilityState = or(currentReachabilityState, ifFalseState); } - function parseJSDocNonNullableType() { - var result = createNode(256 /* JSDocNonNullableType */); - nextToken(); - result.type = parseJSDocType(); - return finishNode(result); + } + function bindReturnOrThrow(n) { + // bind expression (don't affect reachability) + bind(n.expression); + if (n.kind === 204 /* ReturnStatement */) { + hasExplicitReturn = true; } - function parseJSDocTupleType() { - var result = createNode(254 /* JSDocTupleType */); - nextToken(); - result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType); - checkForTrailingComma(result.types); - parseExpected(20 /* CloseBracketToken */); - return finishNode(result); + currentReachabilityState = 4 /* Unreachable */; + } + function bindBreakOrContinueStatement(n) { + // call bind on label (don't affect reachability) + bind(n.label); + // for continue case touch label so it will be marked a used + var isValidJump = jumpToLabel(n.label, n.kind === 203 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */); + if (isValidJump) { + currentReachabilityState = 4 /* Unreachable */; } - function checkForTrailingComma(list) { - if (parseDiagnostics.length === 0 && list.hasTrailingComma) { - var start = list.end - ",".length; - parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed); + } + function bindTryStatement(n) { + // catch\finally blocks has the same reachability as try block + var preTryState = currentReachabilityState; + bind(n.tryBlock); + var postTryState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.catchClause); + var postCatchState = currentReachabilityState; + currentReachabilityState = preTryState; + bind(n.finallyBlock); + // post catch/finally state is reachable if + // - post try state is reachable - control flow can fall out of try block + // - post catch state is reachable - control flow can fall out of catch block + currentReachabilityState = or(postTryState, postCatchState); + } + function bindSwitchStatement(n) { + var preSwitchState = currentReachabilityState; + var postSwitchLabel = pushImplicitLabel(); + // bind expression (don't affect reachability) + bind(n.expression); + bind(n.caseBlock); + var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 242 /* DefaultClause */; }); + // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case + var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState; + popImplicitLabel(postSwitchLabel, postSwitchState); + } + function bindCaseBlock(n) { + var startState = currentReachabilityState; + for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) { + var clause = _a[_i]; + currentReachabilityState = startState; + bind(clause); + if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) { + errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch); } } - function parseJSDocUnionType() { - var result = createNode(253 /* JSDocUnionType */); - nextToken(); - result.types = parseJSDocTypeList(parseJSDocType()); - parseExpected(18 /* CloseParenToken */); - return finishNode(result); + } + function bindLabeledStatement(n) { + // call bind on label (don't affect reachability) + bind(n.label); + var ok = pushNamedLabel(n.label); + bind(n.statement); + if (ok) { + popNamedLabel(n.label, currentReachabilityState); } - function parseJSDocTypeList(firstType) { - ts.Debug.assert(!!firstType); - var types = []; - types.pos = firstType.pos; - types.push(firstType); - while (parseOptional(47 /* BarToken */)) { - types.push(parseJSDocType()); - } - types.end = scanner.getStartPos(); - return types; + } + function getContainerFlags(node) { + switch (node.kind) { + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + case 215 /* InterfaceDeclaration */: + case 217 /* EnumDeclaration */: + case 155 /* TypeLiteral */: + case 165 /* ObjectLiteralExpression */: + return 1 /* IsContainer */; + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + case 213 /* FunctionDeclaration */: + case 144 /* Constructor */: + case 145 /* GetAccessor */: + case 146 /* SetAccessor */: + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + case 218 /* ModuleDeclaration */: + case 248 /* SourceFile */: + case 216 /* TypeAliasDeclaration */: + return 5 /* IsContainerWithLocals */; + case 244 /* CatchClause */: + case 199 /* ForStatement */: + case 200 /* ForInStatement */: + case 201 /* ForOfStatement */: + case 220 /* CaseBlock */: + return 2 /* IsBlockScopedContainer */; + case 192 /* Block */: + // do not treat blocks directly inside a function as a block-scoped-container. + // Locals that reside in this block should go to the function locals. Othewise 'x' + // would not appear to be a redeclaration of a block scoped local in the following + // example: + // + // function foo() { + // var x; + // let x; + // } + // + // If we placed 'var x' into the function locals and 'let x' into the locals of + // the block, then there would be no collision. + // + // By not creating a new block-scoped-container here, we ensure that both 'var x' + // and 'let x' go into the Function-container's locals, and we do get a collision + // conflict. + return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */; } - function parseJSDocAllType() { - var result = createNode(250 /* JSDocAllType */); - nextToken(); - return finishNode(result); + return 0 /* None */; + } + function addToContainerChain(next) { + if (lastContainer) { + lastContainer.nextContainer = next; } - function parseJSDocUnknownOrNullableType() { - var pos = scanner.getStartPos(); - // skip the ? - nextToken(); - // Need to lookahead to decide if this is a nullable or unknown type. - // Here are cases where we'll pick the unknown type: - // - // Foo(?, - // { a: ? } - // Foo(?) - // Foo - // Foo(?= - // (?| - if (token === 24 /* CommaToken */ || - token === 16 /* CloseBraceToken */ || - token === 18 /* CloseParenToken */ || - token === 27 /* GreaterThanToken */ || - token === 56 /* EqualsToken */ || - token === 47 /* BarToken */) { - var result = createNode(251 /* JSDocUnknownType */, pos); - return finishNode(result); - } - else { - var result = createNode(255 /* JSDocNullableType */, pos); - result.type = parseJSDocType(); - return finishNode(result); + lastContainer = next; + } + function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) { + // Just call this directly so that the return type of this function stays "void". + declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes); + } + function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) { + switch (container.kind) { + // Modules, source files, and classes need specialized handling for how their + // members are declared (for example, a member of a class will go into a specific + // symbol table depending on if it is static or not). We defer to specialized + // handlers to take care of declaring these child members. + case 218 /* ModuleDeclaration */: + return declareModuleMember(node, symbolFlags, symbolExcludes); + case 248 /* SourceFile */: + return declareSourceFileMember(node, symbolFlags, symbolExcludes); + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + return declareClassMember(node, symbolFlags, symbolExcludes); + case 217 /* EnumDeclaration */: + return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); + case 155 /* TypeLiteral */: + case 165 /* ObjectLiteralExpression */: + case 215 /* InterfaceDeclaration */: + // Interface/Object-types always have their children added to the 'members' of + // their container. They are only accessible through an instance of their + // container, and are never in scope otherwise (even inside the body of the + // object / type / interface declaring them). An exception is type parameters, + // which are in scope without qualification (similar to 'locals'). + return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + case 144 /* Constructor */: + case 145 /* GetAccessor */: + case 146 /* SetAccessor */: + case 213 /* FunctionDeclaration */: + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + case 216 /* TypeAliasDeclaration */: + // All the children of these container types are never visible through another + // symbol (i.e. through another symbol's 'exports' or 'members'). Instead, + // they're only accessed 'lexically' (i.e. from code that exists underneath + // their container in the tree. To accomplish this, we simply add their declared + // symbol to the 'locals' of the container. These symbols can then be found as + // the type checker walks up the containers, checking them for matching names. + return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function declareClassMember(node, symbolFlags, symbolExcludes) { + return node.flags & 64 /* Static */ + ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) + : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); + } + function declareSourceFileMember(node, symbolFlags, symbolExcludes) { + return ts.isExternalModule(file) + ? declareModuleMember(node, symbolFlags, symbolExcludes) + : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes); + } + function hasExportDeclarations(node) { + var body = node.kind === 248 /* SourceFile */ ? node : node.body; + if (body.kind === 248 /* SourceFile */ || body.kind === 219 /* ModuleBlock */) { + for (var _i = 0, _a = body.statements; _i < _a.length; _i++) { + var stat = _a[_i]; + if (stat.kind === 228 /* ExportDeclaration */ || stat.kind === 227 /* ExportAssignment */) { + return true; + } } } - function parseIsolatedJSDocComment(content, start, length) { - initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined); - var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length); - var diagnostics = parseDiagnostics; - clearState(); - return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined; + return false; + } + function setExportContextFlag(node) { + // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular + // declarations with export modifiers) is an export context in which declarations are implicitly exported. + if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) { + node.flags |= 131072 /* ExportContext */; } - JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; - function parseJSDocComment(parent, start, length) { - var comment = parseJSDocCommentWorker(start, length); - if (comment) { - fixupParentReferences(comment); - comment.parent = parent; - } - return comment; + else { + node.flags &= ~131072 /* ExportContext */; } - JSDocParser.parseJSDocComment = parseJSDocComment; - function parseJSDocCommentWorker(start, length) { - var content = sourceText; - start = start || 0; - var end = length === undefined ? content.length : start + length; - length = end - start; - ts.Debug.assert(start >= 0); - ts.Debug.assert(start <= end); - ts.Debug.assert(end <= content.length); - var tags; - var pos; - // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I - // considered using an actual Scanner, but this would complicate things. The - // scanner would need to know it was in a Doc Comment. Otherwise, it would then - // produce comments *inside* the doc comment. In the end it was just easier to - // write a simple scanner rather than go that route. - if (length >= "/** */".length) { - if (content.charCodeAt(start) === 47 /* slash */ && - content.charCodeAt(start + 1) === 42 /* asterisk */ && - content.charCodeAt(start + 2) === 42 /* asterisk */ && - content.charCodeAt(start + 3) !== 42 /* asterisk */) { - // Initially we can parse out a tag. We also have seen a starting asterisk. - // This is so that /** * @type */ doesn't parse. - var canParseTag = true; - var seenAsterisk = true; - for (pos = start + "/**".length; pos < end;) { - var ch = content.charCodeAt(pos); - pos++; - if (ch === 64 /* at */ && canParseTag) { - parseTag(); - // Once we parse out a tag, we cannot keep parsing out tags on this line. - canParseTag = false; - continue; - } - if (ts.isLineBreak(ch)) { - // After a line break, we can parse a tag, and we haven't seen as asterisk - // on the next line yet. - canParseTag = true; - seenAsterisk = false; - continue; - } - if (ts.isWhiteSpace(ch)) { - // Whitespace doesn't affect any of our parsing. - continue; - } - // Ignore the first asterisk on a line. - if (ch === 42 /* asterisk */) { - if (seenAsterisk) { - // If we've already seen an asterisk, then we can no longer parse a tag - // on this line. - canParseTag = false; - } - seenAsterisk = true; - continue; - } - // Anything else is doc comment text. We can't do anything with it. Because it - // wasn't a tag, we can no longer parse a tag on this line until we hit the next - // line break. - canParseTag = false; - } - } - } - return createJSDocComment(); - function createJSDocComment() { - if (!tags) { - return undefined; - } - var result = createNode(265 /* JSDocComment */, start); - result.tags = tags; - return finishNode(result, end); - } - function skipWhitespace() { - while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) { - pos++; - } + } + function bindModuleDeclaration(node) { + setExportContextFlag(node); + if (node.name.kind === 9 /* StringLiteral */) { + declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); + } + else { + var state = getModuleInstanceState(node); + if (state === 0 /* NonInstantiated */) { + declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */); } - function parseTag() { - ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */); - var atToken = createNode(55 /* AtToken */, pos - 1); - atToken.end = pos; - var tagName = scanIdentifier(); - if (!tagName) { - return; + else { + declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */); + if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) { + // if module was already merged with some function, class or non-const enum + // treat is a non-const-enum-only + node.symbol.constEnumOnlyModule = false; } - var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName); - addTag(tag); - } - function handleTag(atToken, tagName) { - if (tagName) { - switch (tagName.text) { - case "param": - return handleParamTag(atToken, tagName); - case "return": - case "returns": - return handleReturnTag(atToken, tagName); - case "template": - return handleTemplateTag(atToken, tagName); - case "type": - return handleTypeTag(atToken, tagName); + else { + var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */; + if (node.symbol.constEnumOnlyModule === undefined) { + // non-merged case - use the current state + node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly; } - } - return undefined; - } - function handleUnknownTag(atToken, tagName) { - var result = createNode(266 /* JSDocTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - return finishNode(result, pos); - } - function addTag(tag) { - if (tag) { - if (!tags) { - tags = []; - tags.pos = tag.pos; + else { + // merged case: module is const enum only if all its pieces are non-instantiated or const enum + node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly; } - tags.push(tag); - tags.end = tag.end; - } - } - function tryParseTypeExpression() { - skipWhitespace(); - if (content.charCodeAt(pos) !== 123 /* openBrace */) { - return undefined; - } - var typeExpression = parseJSDocTypeExpression(pos, end - pos); - pos = typeExpression.end; - return typeExpression; - } - function handleParamTag(atToken, tagName) { - var typeExpression = tryParseTypeExpression(); - skipWhitespace(); - var name; - var isBracketed; - if (content.charCodeAt(pos) === 91 /* openBracket */) { - pos++; - skipWhitespace(); - name = scanIdentifier(); - isBracketed = true; - } - else { - name = scanIdentifier(); - } - if (!name) { - parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected); - } - var preName, postName; - if (typeExpression) { - postName = name; - } - else { - preName = name; - } - if (!typeExpression) { - typeExpression = tryParseTypeExpression(); - } - var result = createNode(267 /* JSDocParameterTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.preParameterName = preName; - result.typeExpression = typeExpression; - result.postParameterName = postName; - result.isBracketed = isBracketed; - return finishNode(result, pos); - } - function handleReturnTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 268 /* JSDocReturnTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); } - var result = createNode(268 /* JSDocReturnTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); } - function handleTypeTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 269 /* JSDocTypeTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + } + } + function bindFunctionOrConstructorType(node) { + // For a given function symbol "<...>(...) => T" we want to generate a symbol identical + // to the one we would get for: { <...>(...): T } + // + // We do that by making an anonymous type literal symbol, and then setting the function + // symbol as its sole member. To the rest of the system, this symbol will be indistinguishable + // from an actual type literal symbol you would have gotten had you used the long form. + var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node)); + addDeclarationToSymbol(symbol, node, 131072 /* Signature */); + var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type"); + addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */); + typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a); + var _a; + } + function bindObjectLiteralExpression(node) { + var ElementKind; + (function (ElementKind) { + ElementKind[ElementKind["Property"] = 1] = "Property"; + ElementKind[ElementKind["Accessor"] = 2] = "Accessor"; + })(ElementKind || (ElementKind = {})); + if (inStrictMode) { + var seen = {}; + for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { + var prop = _a[_i]; + if (prop.name.kind !== 69 /* Identifier */) { + continue; } - var result = createNode(269 /* JSDocTypeTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result, pos); - } - function handleTemplateTag(atToken, tagName) { - if (ts.forEach(tags, function (t) { return t.kind === 270 /* JSDocTemplateTag */; })) { - parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text); + var identifier = prop.name; + // ECMA-262 11.1.5 Object Initialiser + // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true + // a.This production is contained in strict code and IsDataDescriptor(previous) is true and + // IsDataDescriptor(propId.descriptor) is true. + // b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true. + // c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true. + // d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true + // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields + var currentKind = prop.kind === 245 /* PropertyAssignment */ || prop.kind === 246 /* ShorthandPropertyAssignment */ || prop.kind === 143 /* MethodDeclaration */ + ? 1 /* Property */ + : 2 /* Accessor */; + var existingKind = seen[identifier.text]; + if (!existingKind) { + seen[identifier.text] = currentKind; + continue; } - var typeParameters = []; - typeParameters.pos = pos; - while (true) { - skipWhitespace(); - var startPos = pos; - var name_8 = scanIdentifier(); - if (!name_8) { - parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected); - return undefined; - } - var typeParameter = createNode(137 /* TypeParameter */, name_8.pos); - typeParameter.name = name_8; - finishNode(typeParameter, pos); - typeParameters.push(typeParameter); - skipWhitespace(); - if (content.charCodeAt(pos) !== 44 /* comma */) { - break; - } - pos++; + if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) { + var span = ts.getErrorSpanForNode(file, identifier); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode)); } - typeParameters.end = pos; - var result = createNode(270 /* JSDocTemplateTag */, atToken.pos); - result.atToken = atToken; - result.tagName = tagName; - result.typeParameters = typeParameters; - return finishNode(result, pos); } - function scanIdentifier() { - var startPos = pos; - for (; pos < end; pos++) { - var ch = content.charCodeAt(pos); - if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) { - continue; - } - else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) { - continue; - } + } + return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object"); + } + function bindAnonymousDeclaration(node, symbolFlags, name) { + var symbol = createSymbol(symbolFlags, name); + addDeclarationToSymbol(symbol, node, symbolFlags); + } + function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { + switch (blockScopeContainer.kind) { + case 218 /* ModuleDeclaration */: + declareModuleMember(node, symbolFlags, symbolExcludes); + break; + case 248 /* SourceFile */: + if (ts.isExternalModule(container)) { + declareModuleMember(node, symbolFlags, symbolExcludes); break; } - if (startPos === pos) { - return undefined; - } - var result = createNode(69 /* Identifier */, startPos); - result.text = content.substring(startPos, pos); - return finishNode(result, pos); + // fall through. + default: + if (!blockScopeContainer.locals) { + blockScopeContainer.locals = {}; + addToContainerChain(blockScopeContainer); + } + declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes); + } + } + function bindBlockScopedVariableDeclaration(node) { + bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */); + } + // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized + // check for reserved words used as identifiers in strict mode code. + function checkStrictModeIdentifier(node) { + if (inStrictMode && + node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ && + node.originalKeywordKind <= 114 /* LastFutureReservedWord */ && + !ts.isIdentifierName(node)) { + // Report error only if there are no parse errors in file + if (!file.parseDiagnostics.length) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); } } - JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker; - })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {})); - })(Parser || (Parser = {})); - var IncrementalParser; - (function (IncrementalParser) { - function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) { - aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */); - checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks); - if (ts.textChangeRangeIsUnchanged(textChangeRange)) { - // if the text didn't change, then we can just return our current source file as-is. - return sourceFile; + } + function getStrictModeIdentifierMessage(node) { + // Provide specialized messages to help the user understand why we think they're in + // strict mode. + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode; } - if (sourceFile.statements.length === 0) { - // If we don't have any statements in the current source file, then there's no real - // way to incrementally parse. So just do a full parse instead. - return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true); + if (file.externalModuleIndicator) { + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode; } - // Make sure we're not trying to incrementally update a source file more than once. Once - // we do an update the original source file is considered unusbale from that point onwards. - // - // This is because we do incremental parsing in-place. i.e. we take nodes from the old - // tree and give them new positions and parents. From that point on, trusting the old - // tree at all is not possible as far too much of it may violate invariants. - var incrementalSourceFile = sourceFile; - ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); - incrementalSourceFile.hasBeenIncrementallyParsed = true; - var oldText = sourceFile.text; - var syntaxCursor = createSyntaxCursor(sourceFile); - // Make the actual change larger so that we know to reparse anything whose lookahead - // might have intersected the change. - var changeRange = extendToAffectedRange(sourceFile, textChangeRange); - checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks); - // Ensure that extending the affected range only moved the start of the change range - // earlier in the file. - ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start); - ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span)); - ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange))); - // The is the amount the nodes after the edit range need to be adjusted. It can be - // positive (if the edit added characters), negative (if the edit deleted characters) - // or zero (if this was a pure overwrite with nothing added/removed). - var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length; - // If we added or removed characters during the edit, then we need to go and adjust all - // the nodes after the edit. Those nodes may move forward (if we inserted chars) or they - // may move backward (if we deleted chars). - // - // Doing this helps us out in two ways. First, it means that any nodes/tokens we want - // to reuse are already at the appropriate position in the new text. That way when we - // reuse them, we don't have to figure out if they need to be adjusted. Second, it makes - // it very easy to determine if we can reuse a node. If the node's position is at where - // we are in the text, then we can reuse it. Otherwise we can't. If the node's position - // is ahead of us, then we'll need to rescan tokens. If the node's position is behind - // us, then we'll need to skip it or crumble it as appropriate - // - // We will also adjust the positions of nodes that intersect the change range as well. - // By doing this, we ensure that all the positions in the old tree are consistent, not - // just the positions of nodes entirely before/after the change range. By being - // consistent, we can then easily map from positions to nodes in the old tree easily. - // - // Also, mark any syntax elements that intersect the changed span. We know, up front, - // that we cannot reuse these elements. - updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks); - // Now that we've set up our internal incremental state just proceed and parse the - // source file in the normal fashion. When possible the parser will retrieve and - // reuse nodes from the old tree. - // - // Note: passing in 'true' for setNodeParents is very important. When incrementally - // parsing, we will be reusing nodes from the old tree, and placing it into new - // parents. If we don't set the parents now, we'll end up with an observably - // inconsistent tree. Setting the parents on the new tree should be very fast. We - // will immediately bail out of walking any subtrees when we can see that their parents - // are already correct. - var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true); - return result; + return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode; } - IncrementalParser.updateSourceFile = updateSourceFile; - function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) { - if (isArray) { - visitArray(element); + function checkStrictModeBinaryExpression(node) { + if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) { + // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an + // Assignment operator(11.13) or of a PostfixExpression(11.3) + checkStrictModeEvalOrArguments(node, node.left); } - else { - visitNode(element); + } + function checkStrictModeCatchClause(node) { + // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the + // Catch production is eval or arguments + if (inStrictMode && node.variableDeclaration) { + checkStrictModeEvalOrArguments(node, node.variableDeclaration.name); } - return; - function visitNode(node) { - var text = ""; - if (aggressiveChecks && shouldCheckNode(node)) { - text = oldText.substring(node.pos, node.end); - } - // Ditch any existing LS children we may have created. This way we can avoid - // moving them forward. - if (node._children) { - node._children = undefined; - } - if (node.jsDocComment) { - node.jsDocComment = undefined; - } - node.pos += delta; - node.end += delta; - if (aggressiveChecks && shouldCheckNode(node)) { - ts.Debug.assert(text === newText.substring(node.pos, node.end)); - } - forEachChild(node, visitNode, visitArray); - checkNodePositions(node, aggressiveChecks); + } + function checkStrictModeDeleteExpression(node) { + // Grammar checking + if (inStrictMode && node.expression.kind === 69 /* Identifier */) { + // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its + // UnaryExpression is a direct reference to a variable, function argument, or function name + var span = ts.getErrorSpanForNode(file, node.expression); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode)); } - function visitArray(array) { - array._children = undefined; - array.pos += delta; - array.end += delta; - for (var _i = 0, array_7 = array; _i < array_7.length; _i++) { - var node = array_7[_i]; - visitNode(node); + } + function isEvalOrArgumentsIdentifier(node) { + return node.kind === 69 /* Identifier */ && + (node.text === "eval" || node.text === "arguments"); + } + function checkStrictModeEvalOrArguments(contextNode, name) { + if (name && name.kind === 69 /* Identifier */) { + var identifier = name; + if (isEvalOrArgumentsIdentifier(identifier)) { + // We check first if the name is inside class declaration or class expression; if so give explicit message + // otherwise report generic error message. + var span = ts.getErrorSpanForNode(file, name); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text)); } } } - function shouldCheckNode(node) { - switch (node.kind) { - case 9 /* StringLiteral */: - case 8 /* NumericLiteral */: - case 69 /* Identifier */: - return true; + function getStrictModeEvalOrArgumentsMessage(node) { + // Provide specialized messages to help the user understand why we think they're in + // strict mode. + if (ts.getContainingClass(node)) { + return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode; } - return false; + if (file.externalModuleIndicator) { + return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode; + } + return ts.Diagnostics.Invalid_use_of_0_in_strict_mode; } - function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) { - ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range"); - ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range"); - ts.Debug.assert(element.pos <= element.end); - // We have an element that intersects the change range in some way. It may have its - // start, or its end (or both) in the changed range. We want to adjust any part - // that intersects such that the final tree is in a consistent state. i.e. all - // chlidren have spans within the span of their parent, and all siblings are ordered - // properly. - // We may need to update both the 'pos' and the 'end' of the element. - // If the 'pos' is before the start of the change, then we don't need to touch it. - // If it isn't, then the 'pos' must be inside the change. How we update it will - // depend if delta is positive or negative. If delta is positive then we have - // something like: - // - // -------------------AAA----------------- - // -------------------BBBCCCCCCC----------------- - // - // In this case, we consider any node that started in the change range to still be - // starting at the same position. - // - // however, if the delta is negative, then we instead have something like this: - // - // -------------------XXXYYYYYYY----------------- - // -------------------ZZZ----------------- - // - // In this case, any element that started in the 'X' range will keep its position. - // However any element htat started after that will have their pos adjusted to be - // at the end of the new range. i.e. any node that started in the 'Y' range will - // be adjusted to have their start at the end of the 'Z' range. - // - // The element will keep its position if possible. Or Move backward to the new-end - // if it's in the 'Y' range. - element.pos = Math.min(element.pos, changeRangeNewEnd); - // If the 'end' is after the change range, then we always adjust it by the delta - // amount. However, if the end is in the change range, then how we adjust it - // will depend on if delta is positive or negative. If delta is positive then we - // have something like: - // - // -------------------AAA----------------- - // -------------------BBBCCCCCCC----------------- - // - // In this case, we consider any node that ended inside the change range to keep its - // end position. - // - // however, if the delta is negative, then we instead have something like this: - // - // -------------------XXXYYYYYYY----------------- - // -------------------ZZZ----------------- - // - // In this case, any element that ended in the 'X' range will keep its position. - // However any element htat ended after that will have their pos adjusted to be - // at the end of the new range. i.e. any node that ended in the 'Y' range will - // be adjusted to have their end at the end of the 'Z' range. - if (element.end >= changeRangeOldEnd) { - // Element ends after the change range. Always adjust the end pos. - element.end += delta; + function checkStrictModeFunctionName(node) { + if (inStrictMode) { + // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1)) + checkStrictModeEvalOrArguments(node, node.name); } - else { - // Element ends in the change range. The element will keep its position if - // possible. Or Move backward to the new-end if it's in the 'Y' range. - element.end = Math.min(element.end, changeRangeNewEnd); + } + function checkStrictModeNumericLiteral(node) { + if (inStrictMode && node.flags & 32768 /* OctalLiteral */) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); } - ts.Debug.assert(element.pos <= element.end); - if (element.parent) { - ts.Debug.assert(element.pos >= element.parent.pos); - ts.Debug.assert(element.end <= element.parent.end); + } + function checkStrictModePostfixUnaryExpression(node) { + // Grammar checking + // The identifier eval or arguments may not appear as the LeftHandSideExpression of an + // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression + // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator. + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.operand); } } - function checkNodePositions(node, aggressiveChecks) { - if (aggressiveChecks) { - var pos = node.pos; - forEachChild(node, function (child) { - ts.Debug.assert(child.pos >= pos); - pos = child.end; - }); - ts.Debug.assert(pos <= node.end); + function checkStrictModePrefixUnaryExpression(node) { + // Grammar checking + if (inStrictMode) { + if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) { + checkStrictModeEvalOrArguments(node, node.operand); + } } } - function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) { - visitNode(sourceFile); - return; - function visitNode(child) { - ts.Debug.assert(child.pos <= child.end); - if (child.pos > changeRangeOldEnd) { - // Node is entirely past the change range. We need to move both its pos and - // end, forward or backward appropriately. - moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks); + function checkStrictModeWithStatement(node) { + // Grammar checking for withStatement + if (inStrictMode) { + errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode); + } + } + function errorOnFirstToken(node, message, arg0, arg1, arg2) { + var span = ts.getSpanOfTokenAtPosition(file, node.pos); + file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2)); + } + function getDestructuringParameterName(node) { + return "__" + ts.indexOf(node.parent.parameters, node); + } + function bind(node) { + if (!node) { + return; + } + node.parent = parent; + var savedInStrictMode = inStrictMode; + if (!savedInStrictMode) { + updateStrictMode(node); + } + // First we bind declaration nodes to a symbol if possible. We'll both create a symbol + // and then potentially add the symbol to an appropriate symbol table. Possible + // destination symbol tables are: + // + // 1) The 'exports' table of the current container's symbol. + // 2) The 'members' table of the current container's symbol. + // 3) The 'locals' table of the current container. + // + // However, not all symbols will end up in any of these tables. 'Anonymous' symbols + // (like TypeLiterals for example) will not be put in any table. + bindWorker(node); + // Then we recurse into the children of the node to bind them as well. For certain + // symbols we do specialized work when we recurse. For example, we'll keep track of + // the current 'container' node when it changes. This helps us know which symbol table + // a local should go into for example. + bindChildren(node); + inStrictMode = savedInStrictMode; + } + function updateStrictMode(node) { + switch (node.kind) { + case 248 /* SourceFile */: + case 219 /* ModuleBlock */: + updateStrictModeStatementList(node.statements); return; - } - // Check if the element intersects the change range. If it does, then it is not - // reusable. Also, we'll need to recurse to see what constituent portions we may - // be able to use. - var fullEnd = child.end; - if (fullEnd >= changeStart) { - child.intersectsChange = true; - child._children = undefined; - // Adjust the pos or end (or both) of the intersecting element accordingly. - adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - forEachChild(child, visitNode, visitArray); - checkNodePositions(child, aggressiveChecks); + case 192 /* Block */: + if (ts.isFunctionLike(node.parent)) { + updateStrictModeStatementList(node.statements); + } + return; + case 214 /* ClassDeclaration */: + case 186 /* ClassExpression */: + // All classes are automatically in strict mode in ES6. + inStrictMode = true; return; - } - // Otherwise, the node is entirely before the change range. No need to do anything with it. - ts.Debug.assert(fullEnd < changeStart); } - function visitArray(array) { - ts.Debug.assert(array.pos <= array.end); - if (array.pos > changeRangeOldEnd) { - // Array is entirely after the change range. We need to move it, and move any of - // its children. - moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks); + } + function updateStrictModeStatementList(statements) { + for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { + var statement = statements_1[_i]; + if (!ts.isPrologueDirective(statement)) { return; } - // Check if the element intersects the change range. If it does, then it is not - // reusable. Also, we'll need to recurse to see what constituent portions we may - // be able to use. - var fullEnd = array.end; - if (fullEnd >= changeStart) { - array.intersectsChange = true; - array._children = undefined; - // Adjust the pos or end (or both) of the intersecting array accordingly. - adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta); - for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { - var node = array_8[_i]; - visitNode(node); - } + if (isUseStrictPrologueDirective(statement)) { + inStrictMode = true; return; } - // Otherwise, the array is entirely before the change range. No need to do anything with it. - ts.Debug.assert(fullEnd < changeStart); } } - function extendToAffectedRange(sourceFile, changeRange) { - // Consider the following code: - // void foo() { /; } - // - // If the text changes with an insertion of / just before the semicolon then we end up with: - // void foo() { //; } - // - // If we were to just use the changeRange a is, then we would not rescan the { token - // (as it does not intersect the actual original change range). Because an edit may - // change the token touching it, we actually need to look back *at least* one token so - // that the prior token sees that change. - var maxLookahead = 1; - var start = changeRange.span.start; - // the first iteration aligns us with the change start. subsequent iteration move us to - // the left by maxLookahead tokens. We only need to do this as long as we're not at the - // start of the tree. - for (var i = 0; start > 0 && i <= maxLookahead; i++) { - var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start); - ts.Debug.assert(nearestNode.pos <= start); - var position = nearestNode.pos; - start = Math.max(0, position - 1); + /// Should be called only on prologue directives (isPrologueDirective(node) should be true) + function isUseStrictPrologueDirective(node) { + var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression); + // Note: the node text must be exactly "use strict" or 'use strict'. It is not ok for the + // string to contain unicode escapes (as per ES5). + return nodeText === "\"use strict\"" || nodeText === "'use strict'"; + } + function bindWorker(node) { + switch (node.kind) { + /* Strict mode checks */ + case 69 /* Identifier */: + return checkStrictModeIdentifier(node); + case 181 /* BinaryExpression */: + if (ts.isInJavaScriptFile(node)) { + if (ts.isExportsPropertyAssignment(node)) { + bindExportsPropertyAssignment(node); + } + else if (ts.isModuleExportsAssignment(node)) { + bindModuleExportsAssignment(node); + } + } + return checkStrictModeBinaryExpression(node); + case 244 /* CatchClause */: + return checkStrictModeCatchClause(node); + case 175 /* DeleteExpression */: + return checkStrictModeDeleteExpression(node); + case 8 /* NumericLiteral */: + return checkStrictModeNumericLiteral(node); + case 180 /* PostfixUnaryExpression */: + return checkStrictModePostfixUnaryExpression(node); + case 179 /* PrefixUnaryExpression */: + return checkStrictModePrefixUnaryExpression(node); + case 205 /* WithStatement */: + return checkStrictModeWithStatement(node); + case 97 /* ThisKeyword */: + seenThisKeyword = true; + return; + case 137 /* TypeParameter */: + return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */); + case 138 /* Parameter */: + return bindParameter(node); + case 211 /* VariableDeclaration */: + case 163 /* BindingElement */: + return bindVariableDeclarationOrBindingElement(node); + case 141 /* PropertyDeclaration */: + case 140 /* PropertySignature */: + return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */); + case 245 /* PropertyAssignment */: + case 246 /* ShorthandPropertyAssignment */: + return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */); + case 247 /* EnumMember */: + return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */); + case 147 /* CallSignature */: + case 148 /* ConstructSignature */: + case 149 /* IndexSignature */: + return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */); + case 143 /* MethodDeclaration */: + case 142 /* MethodSignature */: + // If this is an ObjectLiteralExpression method, then it sits in the same space + // as other properties in the object literal. So we use SymbolFlags.PropertyExcludes + // so that it will conflict with any other object literal members with the same + // name. + return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */); + case 213 /* FunctionDeclaration */: + checkStrictModeFunctionName(node); + return declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */); + case 144 /* Constructor */: + return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */); + case 145 /* GetAccessor */: + return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */); + case 146 /* SetAccessor */: + return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */); + case 152 /* FunctionType */: + case 153 /* ConstructorType */: + return bindFunctionOrConstructorType(node); + case 155 /* TypeLiteral */: + return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type"); + case 165 /* ObjectLiteralExpression */: + return bindObjectLiteralExpression(node); + case 173 /* FunctionExpression */: + case 174 /* ArrowFunction */: + checkStrictModeFunctionName(node); + var bindingName = node.name ? node.name.text : "__function"; + return bindAnonymousDeclaration(node, 16 /* Function */, bindingName); + case 168 /* CallExpression */: + if (ts.isInJavaScriptFile(node)) { + bindCallExpression(node); + } + break; + // Members of classes, interfaces, and modules + case 186 /* ClassExpression */: + case 214 /* ClassDeclaration */: + return bindClassLikeDeclaration(node); + case 215 /* InterfaceDeclaration */: + return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */); + case 216 /* TypeAliasDeclaration */: + return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */); + case 217 /* EnumDeclaration */: + return bindEnumDeclaration(node); + case 218 /* ModuleDeclaration */: + return bindModuleDeclaration(node); + // Imports and exports + case 221 /* ImportEqualsDeclaration */: + case 224 /* NamespaceImport */: + case 226 /* ImportSpecifier */: + case 230 /* ExportSpecifier */: + return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); + case 223 /* ImportClause */: + return bindImportClause(node); + case 228 /* ExportDeclaration */: + return bindExportDeclaration(node); + case 227 /* ExportAssignment */: + return bindExportAssignment(node); + case 248 /* SourceFile */: + return bindSourceFileIfExternalModule(); + } + } + function bindSourceFileIfExternalModule() { + setExportContextFlag(file); + if (ts.isExternalModule(file)) { + bindSourceFileAsExternalModule(); + } + } + function bindSourceFileAsExternalModule() { + bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\""); + } + function bindExportAssignment(node) { + var boundExpression = node.kind === 227 /* ExportAssignment */ ? node.expression : node.right; + if (!container.symbol || !container.symbol.exports) { + // Export assignment in some sort of block construct + bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node)); + } + else if (boundExpression.kind === 69 /* Identifier */) { + // An export default clause with an identifier exports all meanings of that identifier + declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); + } + else { + // An export default clause with an expression exports a value + declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */); + } + } + function bindExportDeclaration(node) { + if (!container.symbol || !container.symbol.exports) { + // Export * in some sort of block construct + bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node)); + } + else if (!node.exportClause) { + // All export * declarations are collected in an __export symbol + declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */); } - var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span)); - var finalLength = changeRange.newLength + (changeRange.span.start - start); - return ts.createTextChangeRange(finalSpan, finalLength); } - function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) { - var bestResult = sourceFile; - var lastNodeEntirelyBeforePosition; - forEachChild(sourceFile, visit); - if (lastNodeEntirelyBeforePosition) { - var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition); - if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) { - bestResult = lastChildOfLastEntireNodeBeforePosition; + function bindImportClause(node) { + if (node.name) { + declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */); + } + } + function setCommonJsModuleIndicator(node) { + if (!file.commonJsModuleIndicator) { + file.commonJsModuleIndicator = node; + bindSourceFileAsExternalModule(); + } + } + function bindExportsPropertyAssignment(node) { + // When we create a property via 'exports.foo = bar', the 'exports.foo' property access + // expression is the declaration + setCommonJsModuleIndicator(node); + declareSymbol(file.symbol.exports, file.symbol, node.left, 4 /* Property */ | 7340032 /* Export */, 0 /* None */); + } + function bindModuleExportsAssignment(node) { + // 'module.exports = expr' assignment + setCommonJsModuleIndicator(node); + bindExportAssignment(node); + } + function bindCallExpression(node) { + // We're only inspecting call expressions to detect CommonJS modules, so we can skip + // this check if we've already seen the module indicator + if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) { + setCommonJsModuleIndicator(node); + } + } + function bindClassLikeDeclaration(node) { + if (node.kind === 214 /* ClassDeclaration */) { + bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */); + } + else { + var bindingName = node.name ? node.name.text : "__class"; + bindAnonymousDeclaration(node, 32 /* Class */, bindingName); + // Add name of class expression into the map for semantic classifier + if (node.name) { + classifiableNames[node.name.text] = node.name.text; } } - return bestResult; - function getLastChild(node) { - while (true) { - var lastChild = getLastChildWorker(node); - if (lastChild) { - node = lastChild; - } - else { - return node; - } + var symbol = node.symbol; + // TypeScript 1.0 spec (April 2014): 8.4 + // Every class automatically contains a static property member named 'prototype', the + // type of which is an instantiation of the class type with type Any supplied as a type + // argument for each type parameter. It is an error to explicitly declare a static + // property member with the name 'prototype'. + // + // Note: we check for this here because this class may be merging into a module. The + // module might have an exported variable called 'prototype'. We can't allow that as + // that would clash with the built-in 'prototype' for the class. + var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype"); + if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) { + if (node.name) { + node.name.parent = node; } + file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name)); } - function getLastChildWorker(node) { - var last = undefined; - forEachChild(node, function (child) { - if (ts.nodeIsPresent(child)) { - last = child; - } - }); - return last; + symbol.exports[prototypeSymbol.name] = prototypeSymbol; + prototypeSymbol.parent = symbol; + } + function bindEnumDeclaration(node) { + return ts.isConst(node) + ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */) + : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */); + } + function bindVariableDeclarationOrBindingElement(node) { + if (inStrictMode) { + checkStrictModeEvalOrArguments(node, node.name); } - function visit(child) { - if (ts.nodeIsMissing(child)) { - // Missing nodes are effectively invisible to us. We never even consider them - // When trying to find the nearest node before us. - return; + if (!ts.isBindingPattern(node.name)) { + if (ts.isBlockOrCatchScoped(node)) { + bindBlockScopedVariableDeclaration(node); } - // If the child intersects this position, then this node is currently the nearest - // node that starts before the position. - if (child.pos <= position) { - if (child.pos >= bestResult.pos) { - // This node starts before the position, and is closer to the position than - // the previous best node we found. It is now the new best node. - bestResult = child; - } - // Now, the node may overlap the position, or it may end entirely before the - // position. If it overlaps with the position, then either it, or one of its - // children must be the nearest node before the position. So we can just - // recurse into this child to see if we can find something better. - if (position < child.end) { - // The nearest node is either this child, or one of the children inside - // of it. We've already marked this child as the best so far. Recurse - // in case one of the children is better. - forEachChild(child, visit); - // Once we look at the children of this node, then there's no need to - // continue any further. - return true; - } - else { - ts.Debug.assert(child.end <= position); - // The child ends entirely before this position. Say you have the following - // (where $ is the position) - // - // ? $ : <...> <...> - // - // We would want to find the nearest preceding node in "complex expr 2". - // To support that, we keep track of this node, and once we're done searching - // for a best node, we recurse down this node to see if we can find a good - // result in it. - // - // This approach allows us to quickly skip over nodes that are entirely - // before the position, while still allowing us to find any nodes in the - // last one that might be what we want. - lastNodeEntirelyBeforePosition = child; - } + else if (ts.isParameterDeclaration(node)) { + // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration + // because its parent chain has already been set up, since parents are set before descending into children. + // + // If node is a binding element in parameter declaration, we need to use ParameterExcludes. + // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration + // For example: + // function foo([a,a]) {} // Duplicate Identifier error + // function bar(a,a) {} // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter + // // which correctly set excluded symbols + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); } else { - ts.Debug.assert(child.pos > position); - // We're now at a node that is entirely past the position we're searching for. - // This node (and all following nodes) could never contribute to the result, - // so just skip them by returning 'true' here. - return true; + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */); } } } - function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) { - var oldText = sourceFile.text; - if (textChangeRange) { - ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length); - if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) { - var oldTextPrefix = oldText.substr(0, textChangeRange.span.start); - var newTextPrefix = newText.substr(0, textChangeRange.span.start); - ts.Debug.assert(oldTextPrefix === newTextPrefix); - var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length); - var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length); - ts.Debug.assert(oldTextSuffix === newTextSuffix); - } + function bindParameter(node) { + if (inStrictMode) { + // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a + // strict mode FunctionLikeDeclaration or FunctionExpression(13.1) + checkStrictModeEvalOrArguments(node, node.name); + } + if (ts.isBindingPattern(node.name)) { + bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node)); + } + else { + declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */); + } + // If this is a property-parameter, then also declare the property symbol into the + // containing class. + if (node.flags & 56 /* AccessibilityModifier */ && + node.parent.kind === 144 /* Constructor */ && + ts.isClassLike(node.parent.parent)) { + var classDeclaration = node.parent.parent; + declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */); } } - function createSyntaxCursor(sourceFile) { - var currentArray = sourceFile.statements; - var currentArrayIndex = 0; - ts.Debug.assert(currentArrayIndex < currentArray.length); - var current = currentArray[currentArrayIndex]; - var lastQueriedPosition = -1 /* Value */; - return { - currentNode: function (position) { - // Only compute the current node if the position is different than the last time - // we were asked. The parser commonly asks for the node at the same position - // twice. Once to know if can read an appropriate list element at a certain point, - // and then to actually read and consume the node. - if (position !== lastQueriedPosition) { - // Much of the time the parser will need the very next node in the array that - // we just returned a node from.So just simply check for that case and move - // forward in the array instead of searching for the node again. - if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) { - currentArrayIndex++; - current = currentArray[currentArrayIndex]; - } - // If we don't have a node, or the node we have isn't in the right position, - // then try to find a viable node at the position requested. - if (!current || current.pos !== position) { - findHighestListElementThatStartsAtPosition(position); - } - } - // Cache this query so that we don't do any extra work if the parser calls back - // into us. Note: this is very common as the parser will make pairs of calls like - // 'isListElement -> parseListElement'. If we were unable to find a node when - // called with 'isListElement', we don't want to redo the work when parseListElement - // is called immediately after. - lastQueriedPosition = position; - // Either we don'd have a node, or we have a node at the position being asked for. - ts.Debug.assert(!current || current.pos === position); - return current; - } - }; - // Finds the highest element in the tree we can find that starts at the provided position. - // The element must be a direct child of some node list in the tree. This way after we - // return it, we can easily return its next sibling in the list. - function findHighestListElementThatStartsAtPosition(position) { - // Clear out any cached state about the last node we found. - currentArray = undefined; - currentArrayIndex = -1 /* Value */; - current = undefined; - // Recurse into the source file to find the highest node at this position. - forEachChild(sourceFile, visitNode, visitArray); - return; - function visitNode(node) { - if (position >= node.pos && position < node.end) { - // Position was within this node. Keep searching deeper to find the node. - forEachChild(node, visitNode, visitArray); - // don't procede any futher in the search. - return true; - } - // position wasn't in this node, have to keep searching. - return false; + function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) { + return ts.hasDynamicName(node) + ? bindAnonymousDeclaration(node, symbolFlags, "__computed") + : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes); + } + // reachability checks + function pushNamedLabel(name) { + initializeReachabilityStateIfNecessary(); + if (ts.hasProperty(labelIndexMap, name.text)) { + return false; + } + labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1; + return true; + } + function pushImplicitLabel() { + initializeReachabilityStateIfNecessary(); + var index = labelStack.push(1 /* Unintialized */) - 1; + implicitLabels.push(index); + return index; + } + function popNamedLabel(label, outerState) { + var index = labelIndexMap[label.text]; + ts.Debug.assert(index !== undefined); + ts.Debug.assert(labelStack.length == index + 1); + labelIndexMap[label.text] = undefined; + setCurrentStateAtLabel(labelStack.pop(), outerState, label); + } + function popImplicitLabel(implicitLabelIndex, outerState) { + if (labelStack.length !== implicitLabelIndex + 1) { + ts.Debug.assert(false, "Label stack: " + labelStack.length + ", index:" + implicitLabelIndex); + } + var i = implicitLabels.pop(); + if (implicitLabelIndex !== i) { + ts.Debug.assert(false, "i: " + i + ", index: " + implicitLabelIndex); + } + setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined); + } + function setCurrentStateAtLabel(innerMergedState, outerState, label) { + if (innerMergedState === 1 /* Unintialized */) { + if (label && !options.allowUnusedLabels) { + file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label)); } - function visitArray(array) { - if (position >= array.pos && position < array.end) { - // position was in this array. Search through this array to see if we find a - // viable element. - for (var i = 0, n = array.length; i < n; i++) { - var child = array[i]; - if (child) { - if (child.pos === position) { - // Found the right node. We're done. - currentArray = array; - currentArrayIndex = i; - current = child; - return true; - } - else { - if (child.pos < position && position < child.end) { - // Position in somewhere within this child. Search in it and - // stop searching in this array. - forEachChild(child, visitNode, visitArray); - return true; - } - } - } + currentReachabilityState = outerState; + } + else { + currentReachabilityState = or(innerMergedState, outerState); + } + } + function jumpToLabel(label, outerState) { + initializeReachabilityStateIfNecessary(); + var index = label ? labelIndexMap[label.text] : ts.lastOrUndefined(implicitLabels); + if (index === undefined) { + // reference to unknown label or + // break/continue used outside of loops + return false; + } + var stateAtLabel = labelStack[index]; + labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState); + return true; + } + function checkUnreachable(node) { + switch (currentReachabilityState) { + case 4 /* Unreachable */: + var reportError = + // report error on all statements except empty ones + (ts.isStatement(node) && node.kind !== 194 /* EmptyStatement */) || + // report error on class declarations + node.kind === 214 /* ClassDeclaration */ || + // report error on instantiated modules or const-enums only modules if preserveConstEnums is set + (node.kind === 218 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) || + // report error on regular enums and const enums if preserveConstEnums is set + (node.kind === 217 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums)); + if (reportError) { + currentReachabilityState = 8 /* ReportedUnreachable */; + // unreachable code is reported if + // - user has explicitly asked about it AND + // - statement is in not ambient context (statements in ambient context is already an error + // so we should not report extras) AND + // - node is not variable statement OR + // - node is block scoped variable statement OR + // - node is not block scoped variable statement and at least one variable declaration has initializer + // Rationale: we don't want to report errors on non-initialized var's since they are hoisted + // On the other side we do want to report errors on non-initialized 'lets' because of TDZ + var reportUnreachableCode = !options.allowUnreachableCode && + !ts.isInAmbientContext(node) && + (node.kind !== 193 /* VariableStatement */ || + ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ || + ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; })); + if (reportUnreachableCode) { + errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected); } } - // position wasn't in this array, have to keep searching. + case 8 /* ReportedUnreachable */: + return true; + default: return false; - } + } + function shouldReportErrorOnModuleDeclaration(node) { + var instanceState = getModuleInstanceState(node); + return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums); } } - var InvalidPosition; - (function (InvalidPosition) { - InvalidPosition[InvalidPosition["Value"] = -1] = "Value"; - })(InvalidPosition || (InvalidPosition = {})); - })(IncrementalParser || (IncrementalParser = {})); + function initializeReachabilityStateIfNecessary() { + if (labelIndexMap) { + return; + } + currentReachabilityState = 2 /* Reachable */; + labelIndexMap = {}; + labelStack = []; + implicitLabels = []; + } + } })(ts || (ts = {})); /// /* @internal */ @@ -13755,7 +13918,7 @@ var ts; symbolToString: symbolToString, getAugmentedPropertiesOfType: getAugmentedPropertiesOfType, getRootSymbols: getRootSymbols, - getContextualType: getContextualType, + getContextualType: getApparentTypeOfContextualType, getFullyQualifiedName: getFullyQualifiedName, getResolvedSignature: getResolvedSignature, getConstantValue: getConstantValue, @@ -14025,7 +14188,7 @@ var ts; return ts.getAncestor(node, 248 /* SourceFile */); } function isGlobalSourceFile(node) { - return node.kind === 248 /* SourceFile */ && !ts.isExternalModule(node); + return node.kind === 248 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node); } function getSymbol(symbols, name, meaning) { if (meaning && ts.hasProperty(symbols, name)) { @@ -14127,15 +14290,24 @@ var ts; } switch (location.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location)) + if (!ts.isExternalOrCommonJsModule(location)) break; case 218 /* ModuleDeclaration */: var moduleExports = getSymbolOfNode(location).exports; if (location.kind === 248 /* SourceFile */ || (location.kind === 218 /* ModuleDeclaration */ && location.name.kind === 9 /* StringLiteral */)) { - // It's an external module. Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. Therefore, - // if the name we find is purely an export specifier, it is not actually considered in scope. + // It's an external module. First see if the module has an export default and if the local + // name of that export default matches. + if (result = moduleExports["default"]) { + var localSymbol = ts.getLocalSymbolForExportDefault(result); + if (localSymbol && (result.flags & meaning) && localSymbol.name === name) { + break loop; + } + result = undefined; + } + // Because of module/namespace merging, a module's exports are in scope, + // yet we never want to treat an export specifier as putting a member in scope. + // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol // on an export specifier is that it might find the export specifier itself, and try to @@ -14149,12 +14321,6 @@ var ts; ts.getDeclarationOfKind(moduleExports[name], 230 /* ExportSpecifier */)) { break; } - result = moduleExports["default"]; - var localSymbol = ts.getLocalSymbolForExportDefault(result); - if (result && localSymbol && (result.flags & meaning) && localSymbol.name === name) { - break loop; - } - result = undefined; } if (result = getSymbol(moduleExports, name, meaning & 8914931 /* ModuleMember */)) { break loop; @@ -14297,7 +14463,7 @@ var ts; // declare module foo { // interface bar {} // } - // let foo/*1*/: foo/*2*/.bar; + // const foo/*1*/: foo/*2*/.bar; // The foo at /*1*/ and /*2*/ will share same symbol with two meaning // block - scope variable and namespace module. However, only when we // try to resolve name in /*1*/ which is used in variable position, @@ -14601,6 +14767,9 @@ var ts; if (moduleName === undefined) { return; } + if (moduleName.indexOf("!") >= 0) { + moduleName = moduleName.substr(0, moduleName.indexOf("!")); + } var isRelative = ts.isExternalModuleNameRelative(moduleName); if (!isRelative) { var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */); @@ -14788,7 +14957,7 @@ var ts; } switch (location_1.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location_1)) { + if (!ts.isExternalOrCommonJsModule(location_1)) { break; } case 218 /* ModuleDeclaration */: @@ -14910,7 +15079,7 @@ var ts; // export class c { // } // } - // let x: typeof m.c + // const x: typeof m.c // In the above example when we start with checking if typeof m.c symbol is accessible, // we are going to see if c can be accessed in scope directly. // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible @@ -14949,7 +15118,7 @@ var ts; } function hasExternalModuleSymbol(declaration) { return (declaration.kind === 218 /* ModuleDeclaration */ && declaration.name.kind === 9 /* StringLiteral */) || - (declaration.kind === 248 /* SourceFile */ && ts.isExternalModule(declaration)); + (declaration.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); } function hasVisibleDeclarations(symbol) { var aliasesToMakeVisible; @@ -15100,7 +15269,7 @@ var ts; parentSymbol = symbol; appendSymbolNameOnly(symbol, writer); } - // Let the writer know we just wrote out a symbol. The declaration emitter writer uses + // const the writer know we just wrote out a symbol. The declaration emitter writer uses // this to determine if an import it has previously seen (and not written out) needs // to be written to the file once the walk of the tree is complete. // @@ -15181,7 +15350,7 @@ var ts; writeAnonymousType(type, flags); } else if (type.flags & 256 /* StringLiteral */) { - writer.writeStringLiteral(type.text); + writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\""); } else { // Should never get here @@ -15568,7 +15737,7 @@ var ts; } } else if (node.kind === 248 /* SourceFile */) { - return ts.isExternalModule(node) ? node : undefined; + return ts.isExternalOrCommonJsModule(node) ? node : undefined; } } ts.Debug.fail("getContainingModule cant reach here"); @@ -15650,7 +15819,7 @@ var ts; // Private/protected properties/methods are not visible return false; } - // Public properties/methods are visible if its parents are visible, so let it fall into next case statement + // Public properties/methods are visible if its parents are visible, so const it fall into next case statement case 144 /* Constructor */: case 148 /* ConstructSignature */: case 147 /* CallSignature */: @@ -15678,7 +15847,7 @@ var ts; // Source file is always visible case 248 /* SourceFile */: return true; - // Export assignements do not create name bindings outside the module + // Export assignments do not create name bindings outside the module case 227 /* ExportAssignment */: return false; default: @@ -15814,6 +15983,23 @@ var ts; var symbol = getSymbolOfNode(node); return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node); } + function getTextOfPropertyName(name) { + switch (name.kind) { + case 69 /* Identifier */: + return name.text; + case 9 /* StringLiteral */: + case 8 /* NumericLiteral */: + return name.text; + case 136 /* ComputedPropertyName */: + if (ts.isStringOrNumericLiteral(name.expression.kind)) { + return name.expression.text; + } + } + return undefined; + } + function isComputedNonLiteralName(name) { + return name.kind === 136 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind); + } // Return the inferred type for a binding element function getTypeForBindingElement(declaration) { var pattern = declaration.parent; @@ -15835,10 +16021,15 @@ var ts; if (pattern.kind === 161 /* ObjectBindingPattern */) { // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form) var name_10 = declaration.propertyName || declaration.name; + if (isComputedNonLiteralName(name_10)) { + // computed properties with non-literal names are treated as 'any' + return anyType; + } // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature, // or otherwise the type of the string index signature. - type = getTypeOfPropertyOfType(parentType, name_10.text) || - isNumericLiteralName(name_10.text) && getIndexTypeOfType(parentType, 1 /* Number */) || + var text = getTextOfPropertyName(name_10); + type = getTypeOfPropertyOfType(parentType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) || getIndexTypeOfType(parentType, 0 /* String */); if (!type) { error(name_10, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_10)); @@ -15938,10 +16129,17 @@ var ts; // Return the type implied by an object binding pattern function getTypeFromObjectBindingPattern(pattern, includePatternInType) { var members = {}; + var hasComputedProperties = false; ts.forEach(pattern.elements, function (e) { - var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0); var name = e.propertyName || e.name; - var symbol = createSymbol(flags, name.text); + if (isComputedNonLiteralName(name)) { + // do not include computed properties in the implied type + hasComputedProperties = true; + return; + } + var text = getTextOfPropertyName(name); + var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0); + var symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType); symbol.bindingElement = e; members[symbol.name] = symbol; @@ -15950,6 +16148,9 @@ var ts; if (includePatternInType) { result.pattern = pattern; } + if (hasComputedProperties) { + result.flags |= 67108864 /* ObjectLiteralPatternWithComputedProperties */; + } return result; } // Return the type implied by an array binding pattern @@ -16026,6 +16227,14 @@ var ts; if (declaration.kind === 227 /* ExportAssignment */) { return links.type = checkExpression(declaration.expression); } + // Handle module.exports = expr + if (declaration.kind === 181 /* BinaryExpression */) { + return links.type = checkExpression(declaration.right); + } + // Handle exports.p = expr + if (declaration.kind === 166 /* PropertyAccessExpression */) { + return checkExpressionCached(declaration.parent.right); + } // Handle variable, parameter or property if (!pushTypeResolution(symbol, 0 /* Type */)) { return unknownType; @@ -16304,23 +16513,25 @@ var ts; } function resolveBaseTypesOfClass(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; - var baseContructorType = getBaseConstructorTypeOfClass(type); - if (!(baseContructorType.flags & 80896 /* ObjectType */)) { + var baseConstructorType = getBaseConstructorTypeOfClass(type); + if (!(baseConstructorType.flags & 80896 /* ObjectType */)) { return; } var baseTypeNode = getBaseTypeNodeOfClass(type); var baseType; - if (baseContructorType.symbol && baseContructorType.symbol.flags & 32 /* Class */) { - // When base constructor type is a class we know that the constructors all have the same type parameters as the + var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined; + if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ && + areAllOuterTypeParametersApplied(originalBaseType)) { + // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the // class and all return the instance type of the class. There is no need for further checks and we can apply the // type arguments in the same manner as a type reference to get the same error reporting experience. - baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseContructorType.symbol); + baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol); } else { // The class derives from a "class-like" constructor function, check that we have at least one construct signature // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere // we check that all instantiated signatures return the same type. - var constructors = getInstantiatedConstructorsForTypeArguments(baseContructorType, baseTypeNode.typeArguments); + var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments); if (!constructors.length) { error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments); return; @@ -16345,6 +16556,17 @@ var ts; type.resolvedBaseTypes.push(baseType); } } + function areAllOuterTypeParametersApplied(type) { + // An unapplied type parameter has its symbol still the same as the matching argument symbol. + // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked. + var outerTypeParameters = type.outerTypeParameters; + if (outerTypeParameters) { + var last = outerTypeParameters.length - 1; + var typeArguments = type.typeArguments; + return outerTypeParameters[last].symbol !== typeArguments[last].symbol; + } + return true; + } function resolveBaseTypesOfInterface(type) { type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray; for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { @@ -16424,7 +16646,7 @@ var ts; type.typeArguments = type.typeParameters; type.thisType = createType(512 /* TypeParameter */ | 33554432 /* ThisType */); type.thisType.symbol = symbol; - type.thisType.constraint = getTypeWithThisArgument(type); + type.thisType.constraint = type; } } return links.declaredType; @@ -16939,6 +17161,20 @@ var ts; type = getApparentType(type); return type.flags & 49152 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type); } + /** + * The apparent type of a type parameter is the base constraint instantiated with the type parameter + * as the type argument for the 'this' type. + */ + function getApparentTypeOfTypeParameter(type) { + if (!type.resolvedApparentType) { + var constraintType = getConstraintOfTypeParameter(type); + while (constraintType && constraintType.flags & 512 /* TypeParameter */) { + constraintType = getConstraintOfTypeParameter(constraintType); + } + type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type); + } + return type.resolvedApparentType; + } /** * For a type parameter, return the base constraint of the type parameter. For the string, number, * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the @@ -16946,12 +17182,7 @@ var ts; */ function getApparentType(type) { if (type.flags & 512 /* TypeParameter */) { - do { - type = getConstraintOfTypeParameter(type); - } while (type && type.flags & 512 /* TypeParameter */); - if (!type) { - type = emptyObjectType; - } + type = getApparentTypeOfTypeParameter(type); } if (type.flags & 258 /* StringLike */) { type = globalStringType; @@ -17116,7 +17347,7 @@ var ts; if (node.initializer) { var signatureDeclaration = node.parent; var signature = getSignatureFromDeclaration(signatureDeclaration); - var parameterIndex = signatureDeclaration.parameters.indexOf(node); + var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node); ts.Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } @@ -17217,6 +17448,16 @@ var ts; } return result; } + function resolveExternalModuleTypeByLiteral(name) { + var moduleSym = resolveExternalModuleName(name, name); + if (moduleSym) { + var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym); + if (resolvedModuleSymbol) { + return getTypeOfSymbol(resolvedModuleSymbol); + } + } + return anyType; + } function getReturnTypeOfSignature(signature) { if (!signature.resolvedReturnType) { if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) { @@ -17740,11 +17981,12 @@ var ts; return links.resolvedType; } function getStringLiteralType(node) { - if (ts.hasProperty(stringLiteralTypes, node.text)) { - return stringLiteralTypes[node.text]; + var text = node.text; + if (ts.hasProperty(stringLiteralTypes, text)) { + return stringLiteralTypes[text]; } - var type = stringLiteralTypes[node.text] = createType(256 /* StringLiteral */); - type.text = ts.getTextOfNode(node); + var type = stringLiteralTypes[text] = createType(256 /* StringLiteral */); + type.text = text; return type; } function getTypeFromStringLiteral(node) { @@ -18265,7 +18507,7 @@ var ts; return false; } function hasExcessProperties(source, target, reportErrors) { - if (someConstituentTypeHasKind(target, 80896 /* ObjectType */)) { + if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) { for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) { var prop = _a[_i]; if (!isKnownProperty(target, prop.name)) { @@ -18358,9 +18600,6 @@ var ts; return result; } function typeParameterIdenticalTo(source, target) { - if (source.symbol.name !== target.symbol.name) { - return 0 /* False */; - } // covers case when both type parameters does not have constraint (both equal to noConstraintType) if (source.constraint === target.constraint) { return -1 /* True */; @@ -18852,18 +19091,29 @@ var ts; } return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp)); } + function isMatchingSignature(source, target, partialMatch) { + // A source signature matches a target signature if the two signatures have the same number of required, + // optional, and rest parameters. + if (source.parameters.length === target.parameters.length && + source.minArgumentCount === target.minArgumentCount && + source.hasRestParameter === target.hasRestParameter) { + return true; + } + // A source signature partially matches a target signature if the target signature has no fewer required + // parameters and no more overall parameters than the source signature (where a signature with a rest + // parameter is always considered to have more overall parameters than one without). + if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter || + source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) { + return true; + } + return false; + } function compareSignatures(source, target, partialMatch, ignoreReturnTypes, compareTypes) { if (source === target) { return -1 /* True */; } - if (source.parameters.length !== target.parameters.length || - source.minArgumentCount !== target.minArgumentCount || - source.hasRestParameter !== target.hasRestParameter) { - if (!partialMatch || - source.parameters.length < target.parameters.length && !source.hasRestParameter || - source.minArgumentCount > target.minArgumentCount) { - return 0 /* False */; - } + if (!(isMatchingSignature(source, target, partialMatch))) { + return 0 /* False */; } var result = -1 /* True */; if (source.typeParameters && target.typeParameters) { @@ -18957,6 +19207,9 @@ var ts; function isTupleLikeType(type) { return !!getPropertyOfType(type, "0"); } + function isStringLiteralType(type) { + return type.flags & 256 /* StringLiteral */; + } /** * Check if a Type was written as a tuple type literal. * Prefer using isTupleLikeType() unless the use of `elementTypes` is required. @@ -19629,7 +19882,7 @@ var ts; } function narrowTypeByInstanceof(type, expr, assumeTrue) { // Check that type is not any, assumed result is true, and we have variable symbol on the left - if (isTypeAny(type) || !assumeTrue || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) { + if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) { return type; } // Check that right operand is a function type with a prototype property @@ -19660,6 +19913,12 @@ var ts; } } if (targetType) { + if (!assumeTrue) { + if (type.flags & 16384 /* Union */) { + return getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, targetType); })); + } + return type; + } return getNarrowedType(type, targetType); } return type; @@ -20129,6 +20388,9 @@ var ts; function getIndexTypeOfContextualType(type, kind) { return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }); } + function contextualTypeIsStringLiteralType(type) { + return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isStringLiteralType) : isStringLiteralType(type)); + } // Return true if the given contextual type is a tuple-like type function contextualTypeIsTupleLikeType(type) { return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type)); @@ -20150,7 +20412,7 @@ var ts; } function getContextualTypeForObjectLiteralElement(element) { var objectLiteral = element.parent; - var type = getContextualType(objectLiteral); + var type = getApparentTypeOfContextualType(objectLiteral); if (type) { if (!ts.hasDynamicName(element)) { // For a (non-symbol) computed property, there is no reason to look up the name @@ -20173,7 +20435,7 @@ var ts; // type of T. function getContextualTypeForElementExpression(node) { var arrayLiteral = node.parent; - var type = getContextualType(arrayLiteral); + var type = getApparentTypeOfContextualType(arrayLiteral); if (type) { var index = ts.indexOf(arrayLiteral.elements, node); return getTypeOfPropertyOfContextualType(type, "" + index) @@ -20206,11 +20468,28 @@ var ts; } // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily // be "pushed" onto a node using the contextualType property. - function getContextualType(node) { - var type = getContextualTypeWorker(node); + function getApparentTypeOfContextualType(node) { + var type = getContextualType(node); return type && getApparentType(type); } - function getContextualTypeWorker(node) { + /** + * Woah! Do you really want to use this function? + * + * Unless you're trying to get the *non-apparent* type for a + * value-literal type or you're authoring relevant portions of this algorithm, + * you probably meant to use 'getApparentTypeOfContextualType'. + * Otherwise this may not be very useful. + * + * In cases where you *are* working on this function, you should understand + * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'. + * + * - Use 'getContextualType' when you are simply going to propagate the result to the expression. + * - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type. + * + * @param node the expression whose contextual type will be returned. + * @returns the contextual type of an expression. + */ + function getContextualType(node) { if (isInsideWithStatementBody(node)) { // We cannot answer semantic questions within a with block, do not proceed any further return undefined; @@ -20285,7 +20564,7 @@ var ts; ts.Debug.assert(node.kind !== 143 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) - : getContextualType(node); + : getApparentTypeOfContextualType(node); if (!type) { return undefined; } @@ -20411,7 +20690,7 @@ var ts; type.pattern = node; return type; } - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType && contextualTypeIsTupleLikeType(contextualType)) { var pattern = contextualType.pattern; // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting @@ -20494,10 +20773,11 @@ var ts; checkGrammarObjectLiteralExpression(node, inDestructuringPattern); var propertiesTable = {}; var propertiesArray = []; - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); var contextualTypeHasPattern = contextualType && contextualType.pattern && (contextualType.pattern.kind === 161 /* ObjectBindingPattern */ || contextualType.pattern.kind === 165 /* ObjectLiteralExpression */); var typeFlags = 0; + var patternWithComputedProperties = false; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var memberDecl = _a[_i]; var member = memberDecl.symbol; @@ -20525,8 +20805,11 @@ var ts; if (isOptional) { prop.flags |= 536870912 /* Optional */; } + if (ts.hasDynamicName(memberDecl)) { + patternWithComputedProperties = true; + } } - else if (contextualTypeHasPattern) { + else if (contextualTypeHasPattern && !(contextualType.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */)) { // If object literal is contextually typed by the implied type of a binding pattern, and if the // binding pattern specifies a default value for the property, make the property optional. var impliedProp = getPropertyOfType(contextualType, member.name); @@ -20578,7 +20861,7 @@ var ts; var numberIndexType = getIndexType(1 /* Number */); var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */; - result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */); + result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0); if (inDestructuringPattern) { result.pattern = node; } @@ -21289,7 +21572,7 @@ var ts; // so order how inherited signatures are processed is still preserved. // interface A { (x: string): void } // interface B extends A { (x: 'foo'): string } - // let b: B; + // const b: B; // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void] function reorderCandidates(signatures, result) { var lastParent; @@ -22247,6 +22530,10 @@ var ts; return anyType; } } + // In JavaScript files, calls to any identifier 'require' are treated as external module imports + if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) { + return resolveExternalModuleTypeByLiteral(node.arguments[0]); + } return getReturnTypeOfSignature(signature); } function checkTaggedTemplateExpression(node) { @@ -22257,7 +22544,10 @@ var ts; var targetType = getTypeFromTypeNode(node.type); if (produceDiagnostics && targetType !== unknownType) { var widenedType = getWidenedType(exprType); - if (!(isTypeAssignableTo(targetType, widenedType))) { + // Permit 'number[] | "foo"' to be asserted to 'string'. + var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) && + someConstituentTypeHasKind(widenedType, 258 /* StringLike */); + if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); } } @@ -22801,19 +23091,26 @@ var ts; for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) { var p = properties_3[_i]; if (p.kind === 245 /* PropertyAssignment */ || p.kind === 246 /* ShorthandPropertyAssignment */) { - // TODO(andersh): Computed property support var name_13 = p.name; + if (name_13.kind === 136 /* ComputedPropertyName */) { + checkComputedPropertyName(name_13); + } + if (isComputedNonLiteralName(name_13)) { + continue; + } + var text = getTextOfPropertyName(name_13); var type = isTypeAny(sourceType) ? sourceType - : getTypeOfPropertyOfType(sourceType, name_13.text) || - isNumericLiteralName(name_13.text) && getIndexTypeOfType(sourceType, 1 /* Number */) || + : getTypeOfPropertyOfType(sourceType, text) || + isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) || getIndexTypeOfType(sourceType, 0 /* String */); if (type) { if (p.kind === 246 /* ShorthandPropertyAssignment */) { checkDestructuringAssignment(p, type); } else { - checkDestructuringAssignment(p.initializer || name_13, type); + // non-shorthand property assignments should always have initializers + checkDestructuringAssignment(p.initializer, type); } } else { @@ -23014,6 +23311,10 @@ var ts; case 31 /* ExclamationEqualsToken */: case 32 /* EqualsEqualsEqualsToken */: case 33 /* ExclamationEqualsEqualsToken */: + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) { + return booleanType; + } if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) { reportOperatorError(); } @@ -23137,6 +23438,13 @@ var ts; var type2 = checkExpression(node.whenFalse, contextualMapper); return getUnionType([type1, type2]); } + function checkStringLiteralExpression(node) { + var contextualType = getContextualType(node); + if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { + return getStringLiteralType(node); + } + return stringType; + } function checkTemplateExpression(node) { // We just want to check each expressions, but we are unconcerned with // the type of each expression, as any value may be coerced into a string. @@ -23187,7 +23495,7 @@ var ts; if (isInferentialContext(contextualMapper)) { var signature = getSingleCallSignature(type); if (signature && signature.typeParameters) { - var contextualType = getContextualType(node); + var contextualType = getApparentTypeOfContextualType(node); if (contextualType) { var contextualSignature = getSingleCallSignature(contextualType); if (contextualSignature && !contextualSignature.typeParameters) { @@ -23251,6 +23559,7 @@ var ts; case 183 /* TemplateExpression */: return checkTemplateExpression(node); case 9 /* StringLiteral */: + return checkStringLiteralExpression(node); case 11 /* NoSubstitutionTemplateLiteral */: return stringType; case 10 /* RegularExpressionLiteral */: @@ -24580,7 +24889,7 @@ var ts; } // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent var parent = getDeclarationContainer(node); - if (parent.kind === 248 /* SourceFile */ && ts.isExternalModule(parent)) { + if (parent.kind === 248 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) { // If the declaration happens to be in external module, report error that require and exports are reserved keywords error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); } @@ -24598,15 +24907,15 @@ var ts; // A non-initialized declaration is a no-op as the block declaration will resolve before the var // declaration. the problem is if the declaration has an initializer. this will act as a write to the // block declared value. this is fine for let, but not const. - // Only consider declarations with initializers, uninitialized let declarations will not + // Only consider declarations with initializers, uninitialized const declarations will not // step on a let/const variable. - // Do not consider let and const declarations, as duplicate block-scoped declarations + // Do not consider const and const declarations, as duplicate block-scoped declarations // are handled by the binder. - // We are only looking for let declarations that step on let\const declarations from a + // We are only looking for const declarations that step on let\const declarations from a // different scope. e.g.: // { // const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration - // let x = 0; // symbol for this declaration will be 'symbol' + // const x = 0; // symbol for this declaration will be 'symbol' // } // skip block-scoped variables and parameters if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) { @@ -24693,6 +25002,12 @@ var ts; checkExpressionCached(node.initializer); } } + if (node.kind === 163 /* BindingElement */) { + // check computed properties inside property names of binding elements + if (node.propertyName && node.propertyName.kind === 136 /* ComputedPropertyName */) { + checkComputedPropertyName(node.propertyName); + } + } // For a binding pattern, check contained binding elements if (ts.isBindingPattern(node.name)) { ts.forEach(node.name.elements, checkSourceElement); @@ -25176,6 +25491,7 @@ var ts; var firstDefaultClause; var hasDuplicateDefaultClause = false; var expressionType = checkExpression(node.expression); + var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */); ts.forEach(node.caseBlock.clauses, function (clause) { // Grammar check for duplicate default clauses, skip if we already report duplicate default clause if (clause.kind === 242 /* DefaultClause */ && !hasDuplicateDefaultClause) { @@ -25195,6 +25511,10 @@ var ts; // TypeScript 1.0 spec (April 2014):5.9 // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression. var caseType = checkExpression(caseClause.expression); + // Permit 'number[] | "foo"' to be asserted to 'string'. + if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) { + return; + } if (!isTypeAssignableTo(expressionType, caseType)) { // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined); @@ -25659,11 +25979,14 @@ var ts; var enumIsConst = ts.isConst(node); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.name.kind === 136 /* ComputedPropertyName */) { + if (isComputedNonLiteralName(member.name)) { error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums); } - else if (isNumericLiteralName(member.name.text)) { - error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + else { + var text = getTextOfPropertyName(member.name); + if (isNumericLiteralName(text)) { + error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name); + } } var previousEnumMemberIsNonConstant = autoValue === undefined; var initializer = member.initializer; @@ -26305,8 +26628,8 @@ var ts; } // Function and class expression bodies are checked after all statements in the enclosing body. This is // to ensure constructs like the following are permitted: - // let foo = function () { - // let s = foo(); + // const foo = function () { + // const s = foo(); // return "hello"; // } // Here, performing a full type check of the body of the function expression whilst in the process of @@ -26421,8 +26744,12 @@ var ts; if (!(links.flags & 1 /* TypeChecked */)) { // Check whether the file has declared it is the default lib, // and whether the user has specifically chosen to avoid checking it. - if (node.isDefaultLib && compilerOptions.skipDefaultLibCheck) { - return; + if (compilerOptions.skipDefaultLibCheck) { + // If the user specified '--noLib' and a file has a '/// ', + // then we should treat that file as a default lib. + if (node.hasNoDefaultLib) { + return; + } } // Grammar checking checkGrammarSourceFile(node); @@ -26432,7 +26759,7 @@ var ts; potentialThisCollisions.length = 0; ts.forEach(node.statements, checkSourceElement); checkFunctionAndClassExpressionBodies(node); - if (ts.isExternalModule(node)) { + if (ts.isExternalOrCommonJsModule(node)) { checkExternalModuleExports(node); } if (potentialThisCollisions.length) { @@ -26515,7 +26842,7 @@ var ts; } switch (location.kind) { case 248 /* SourceFile */: - if (!ts.isExternalModule(location)) { + if (!ts.isExternalOrCommonJsModule(location)) { break; } case 218 /* ModuleDeclaration */: @@ -27153,9 +27480,18 @@ var ts; getReferencedValueDeclaration: getReferencedValueDeclaration, getTypeReferenceSerializationKind: getTypeReferenceSerializationKind, isOptionalParameter: isOptionalParameter, - isArgumentsLocalBinding: isArgumentsLocalBinding + isArgumentsLocalBinding: isArgumentsLocalBinding, + getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration }; } + function getExternalModuleFileFromDeclaration(declaration) { + var specifier = ts.getExternalModuleName(declaration); + var moduleSymbol = getSymbolAtLocation(specifier); + if (!moduleSymbol) { + return undefined; + } + return ts.getDeclarationOfKind(moduleSymbol, 248 /* SourceFile */); + } function initializeTypeChecker() { // Bind all source files and propagate errors ts.forEach(host.getSourceFiles(), function (file) { @@ -27163,11 +27499,10 @@ var ts; }); // Initialize global symbol table ts.forEach(host.getSourceFiles(), function (file) { - if (!ts.isExternalModule(file)) { + if (!ts.isExternalOrCommonJsModule(file)) { mergeSymbolTable(globals, file.locals); } }); - // Initialize special symbols getSymbolLinks(undefinedSymbol).type = undefinedType; getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments"); getSymbolLinks(unknownSymbol).type = unknownType; @@ -27866,7 +28201,7 @@ var ts; } } function checkGrammarForNonSymbolComputedProperty(node, message) { - if (node.kind === 136 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(node.expression)) { + if (ts.isDynamicName(node)) { return grammarErrorOnNode(node, message); } } @@ -28225,11 +28560,15 @@ var ts; var writeTextOfNode; var writer = createAndSetNewTextWriterWithSymbolWriter(); var enclosingDeclaration; - var currentSourceFile; + var currentText; + var currentLineMap; + var currentIdentifiers; + var isCurrentFileExternalModule; var reportedDeclarationError = false; var errorNameNode; var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments; var emit = compilerOptions.stripInternal ? stripInternal : emitNode; + var noDeclare = !root; var moduleElementDeclarationEmitInfo = []; var asynchronousSubModuleDeclarationEmitInfo; // Contains the reference paths that needs to go in the declaration file. @@ -28272,23 +28611,56 @@ var ts; else { // Emit references corresponding to this file var emittedReferencedFiles = []; + var prevModuleElementDeclarationEmitInfo = []; ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + if (!ts.isDeclarationFile(sourceFile)) { // Check what references need to be added if (!compilerOptions.noResolve) { ts.forEach(sourceFile.referencedFiles, function (fileReference) { var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference); - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (ts.isExternalModuleOrDeclarationFile(referencedFile) && + // If the reference file is a declaration file, emit that reference + if (referencedFile && (ts.isDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) { writeReferencePath(referencedFile); emittedReferencedFiles.push(referencedFile); } }); } + } + if (!ts.isExternalModuleOrDeclarationFile(sourceFile)) { + noDeclare = false; + emitSourceFile(sourceFile); + } + else if (ts.isExternalModule(sourceFile)) { + noDeclare = true; + write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {"); + writeLine(); + increaseIndent(); emitSourceFile(sourceFile); + decreaseIndent(); + write("}"); + writeLine(); + // create asynchronous output for the importDeclarations + if (moduleElementDeclarationEmitInfo.length) { + var oldWriter = writer; + ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) { + if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { + ts.Debug.assert(aliasEmitInfo.node.kind === 222 /* ImportDeclaration */); + createAndSetNewTextWriterWithSymbolWriter(); + ts.Debug.assert(aliasEmitInfo.indent === 1); + increaseIndent(); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + decreaseIndent(); + } + }); + setWriter(oldWriter); + } + prevModuleElementDeclarationEmitInfo = prevModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); + moduleElementDeclarationEmitInfo = []; } }); + moduleElementDeclarationEmitInfo = moduleElementDeclarationEmitInfo.concat(prevModuleElementDeclarationEmitInfo); } return { reportedDeclarationError: reportedDeclarationError, @@ -28297,13 +28669,12 @@ var ts; referencePathsOutput: referencePathsOutput }; function hasInternalAnnotation(range) { - var text = currentSourceFile.text; - var comment = text.substring(range.pos, range.end); + var comment = currentText.substring(range.pos, range.end); return comment.indexOf("@internal") >= 0; } function stripInternal(node) { if (node) { - var leadingCommentRanges = ts.getLeadingCommentRanges(currentSourceFile.text, node.pos); + var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos); if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) { return; } @@ -28395,7 +28766,7 @@ var ts; var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); if (errorInfo) { if (errorInfo.typeName) { - diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); + diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); } else { diagnostics.push(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName)); @@ -28461,10 +28832,10 @@ var ts; } function writeJsDocComments(declaration) { if (declaration) { - var jsDocComments = ts.getJsDocComments(declaration, currentSourceFile); - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); + var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments); // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange); + ts.emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange); } } function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) { @@ -28481,7 +28852,7 @@ var ts; case 103 /* VoidKeyword */: case 97 /* ThisKeyword */: case 9 /* StringLiteral */: - return writeTextOfNode(currentSourceFile, type); + return writeTextOfNode(currentText, type); case 188 /* ExpressionWithTypeArguments */: return emitExpressionWithTypeArguments(type); case 151 /* TypeReference */: @@ -28512,14 +28883,14 @@ var ts; } function writeEntityName(entityName) { if (entityName.kind === 69 /* Identifier */) { - writeTextOfNode(currentSourceFile, entityName); + writeTextOfNode(currentText, entityName); } else { var left = entityName.kind === 135 /* QualifiedName */ ? entityName.left : entityName.expression; var right = entityName.kind === 135 /* QualifiedName */ ? entityName.right : entityName.name; writeEntityName(left); write("."); - writeTextOfNode(currentSourceFile, right); + writeTextOfNode(currentText, right); } } function emitEntityName(entityName) { @@ -28549,7 +28920,7 @@ var ts; } } function emitTypePredicate(type) { - writeTextOfNode(currentSourceFile, type.parameterName); + writeTextOfNode(currentText, type.parameterName); write(" is "); emitType(type.type); } @@ -28590,9 +28961,12 @@ var ts; } } function emitSourceFile(node) { - currentSourceFile = node; + currentText = node.text; + currentLineMap = ts.getLineStarts(node); + currentIdentifiers = node.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(node); enclosingDeclaration = node; - ts.emitDetachedComments(currentSourceFile, writer, ts.writeCommentRange, node, newLine, true /* remove comments */); + ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true /* remove comments */); emitLines(node.statements); } // Return a temp variable name to be used in `export default` statements. @@ -28601,13 +28975,13 @@ var ts; // do not need to keep track of created temp names. function getExportDefaultTempVariableName() { var baseName = "_default"; - if (!ts.hasProperty(currentSourceFile.identifiers, baseName)) { + if (!ts.hasProperty(currentIdentifiers, baseName)) { return baseName; } var count = 0; while (true) { var name_18 = baseName + "_" + (++count); - if (!ts.hasProperty(currentSourceFile.identifiers, name_18)) { + if (!ts.hasProperty(currentIdentifiers, name_18)) { return name_18; } } @@ -28615,7 +28989,7 @@ var ts; function emitExportAssignment(node) { if (node.expression.kind === 69 /* Identifier */) { write(node.isExportEquals ? "export = " : "export default "); - writeTextOfNode(currentSourceFile, node.expression); + writeTextOfNode(currentText, node.expression); } else { // Expression @@ -28653,7 +29027,7 @@ var ts; writeModuleElement(node); } else if (node.kind === 221 /* ImportEqualsDeclaration */ || - (node.parent.kind === 248 /* SourceFile */ && ts.isExternalModule(currentSourceFile))) { + (node.parent.kind === 248 /* SourceFile */ && isCurrentFileExternalModule)) { var isVisible; if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 248 /* SourceFile */) { // Import declaration of another module that is visited async so lets put it in right spot @@ -28707,7 +29081,7 @@ var ts; } function emitModuleElementDeclarationFlags(node) { // If the node is parented in the current source file we need to emit export declare or just export - if (node.parent === currentSourceFile) { + if (node.parent.kind === 248 /* SourceFile */) { // If the node is exported if (node.flags & 2 /* Export */) { write("export "); @@ -28715,7 +29089,7 @@ var ts; if (node.flags & 512 /* Default */) { write("default "); } - else if (node.kind !== 215 /* InterfaceDeclaration */) { + else if (node.kind !== 215 /* InterfaceDeclaration */ && !noDeclare) { write("declare "); } } @@ -28742,7 +29116,7 @@ var ts; write("export "); } write("import "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" = "); if (ts.isInternalModuleImportEqualsDeclaration(node)) { emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError); @@ -28750,7 +29124,7 @@ var ts; } else { write("require("); - writeTextOfNode(currentSourceFile, ts.getExternalModuleImportEqualsDeclarationExpression(node)); + writeTextOfNode(currentText, ts.getExternalModuleImportEqualsDeclarationExpression(node)); write(");"); } writer.writeLine(); @@ -28785,7 +29159,7 @@ var ts; if (node.importClause) { var currentWriterPos = writer.getTextPos(); if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) { - writeTextOfNode(currentSourceFile, node.importClause.name); + writeTextOfNode(currentText, node.importClause.name); } if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) { if (currentWriterPos !== writer.getTextPos()) { @@ -28794,7 +29168,7 @@ var ts; } if (node.importClause.namedBindings.kind === 224 /* NamespaceImport */) { write("* as "); - writeTextOfNode(currentSourceFile, node.importClause.namedBindings.name); + writeTextOfNode(currentText, node.importClause.namedBindings.name); } else { write("{ "); @@ -28804,16 +29178,28 @@ var ts; } write(" from "); } - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); write(";"); writer.writeLine(); } + function emitExternalModuleSpecifier(moduleSpecifier) { + if (moduleSpecifier.kind === 9 /* StringLiteral */ && (!root) && (compilerOptions.out || compilerOptions.outFile)) { + var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent); + if (moduleName) { + write("\""); + write(moduleName); + write("\""); + return; + } + } + writeTextOfNode(currentText, moduleSpecifier); + } function emitImportOrExportSpecifier(node) { if (node.propertyName) { - writeTextOfNode(currentSourceFile, node.propertyName); + writeTextOfNode(currentText, node.propertyName); write(" as "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } function emitExportSpecifier(node) { emitImportOrExportSpecifier(node); @@ -28835,7 +29221,7 @@ var ts; } if (node.moduleSpecifier) { write(" from "); - writeTextOfNode(currentSourceFile, node.moduleSpecifier); + emitExternalModuleSpecifier(node.moduleSpecifier); } write(";"); writer.writeLine(); @@ -28849,11 +29235,11 @@ var ts; else { write("module "); } - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); while (node.body.kind !== 219 /* ModuleBlock */) { node = node.body; write("."); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; @@ -28872,7 +29258,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("type "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); emitTypeParameters(node.typeParameters); write(" = "); emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError); @@ -28894,7 +29280,7 @@ var ts; write("const "); } write("enum "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); write(" {"); writeLine(); increaseIndent(); @@ -28905,7 +29291,7 @@ var ts; } function emitEnumMemberDeclaration(node) { emitJsDocComments(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var enumMemberValue = resolver.getConstantValue(node); if (enumMemberValue !== undefined) { write(" = "); @@ -28922,7 +29308,7 @@ var ts; increaseIndent(); emitJsDocComments(node); decreaseIndent(); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If there is constraint present and this is not a type parameter of the private method emit the constraint if (node.constraint && !isPrivateMethodTypeParameter(node)) { write(" extends "); @@ -29037,7 +29423,7 @@ var ts; write("abstract "); } write("class "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -29060,7 +29446,7 @@ var ts; emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("interface "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); var prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitTypeParameters(node.typeParameters); @@ -29095,7 +29481,7 @@ var ts; // If this node is a computed name, it can only be a symbol, because we've already skipped // it if it's not a well known symbol. In that case, the text of the name will be exactly // what we want, namely the name expression enclosed in brackets. - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If optional property emit ? if ((node.kind === 141 /* PropertyDeclaration */ || node.kind === 140 /* PropertySignature */) && ts.hasQuestionToken(node)) { write("?"); @@ -29177,7 +29563,7 @@ var ts; emitBindingPattern(bindingElement.name); } else { - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError); } } @@ -29221,7 +29607,7 @@ var ts; emitJsDocComments(accessors.getAccessor); emitJsDocComments(accessors.setAccessor); emitClassMemberDeclarationFlags(node); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (!(node.flags & 16 /* Private */)) { accessorWithTypeAnnotation = node; var type = getTypeAnnotationFromAccessor(node); @@ -29307,13 +29693,13 @@ var ts; } if (node.kind === 213 /* FunctionDeclaration */) { write("function "); - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } else if (node.kind === 144 /* Constructor */) { write("constructor"); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); if (ts.hasQuestionToken(node)) { write("?"); } @@ -29437,7 +29823,7 @@ var ts; emitBindingPattern(node.name); } else { - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); } if (resolver.isOptionalParameter(node)) { write("?"); @@ -29552,7 +29938,7 @@ var ts; // Example: // original: function foo({y: [a,b,c]}) {} // emit : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void; - writeTextOfNode(currentSourceFile, bindingElement.propertyName); + writeTextOfNode(currentText, bindingElement.propertyName); write(": "); } if (bindingElement.name) { @@ -29575,7 +29961,7 @@ var ts; if (bindingElement.dotDotDotToken) { write("..."); } - writeTextOfNode(currentSourceFile, bindingElement.name); + writeTextOfNode(currentText, bindingElement.name); } } } @@ -29667,6 +30053,18 @@ var ts; return ts.isExternalModule(sourceFile) || ts.isDeclarationFile(sourceFile); } ts.isExternalModuleOrDeclarationFile = isExternalModuleOrDeclarationFile; + function getResolvedExternalModuleName(host, file) { + return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName); + } + ts.getResolvedExternalModuleName = getResolvedExternalModuleName; + function getExternalModuleNameFromDeclaration(host, resolver, declaration) { + var file = resolver.getExternalModuleFileFromDeclaration(declaration); + if (!file || ts.isDeclarationFile(file)) { + return undefined; + } + return getResolvedExternalModuleName(host, file); + } + ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration; var Jump; (function (Jump) { Jump[Jump["Break"] = 2] = "Break"; @@ -29954,15 +30352,19 @@ var ts; var newLine = host.getNewLine(); var jsxDesugaring = host.getCompilerOptions().jsx !== 1 /* Preserve */; var shouldEmitJsx = function (s) { return (s.languageVariant === 1 /* JSX */ && !jsxDesugaring); }; + var outFile = compilerOptions.outFile || compilerOptions.out; + var emitJavaScript = createFileEmitter(); if (targetSourceFile === undefined) { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { - var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); - emitFile(jsFilePath, sourceFile); - } - }); - if (compilerOptions.outFile || compilerOptions.out) { - emitFile(compilerOptions.outFile || compilerOptions.out); + if (outFile) { + emitFile(outFile); + } + else { + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if (ts.shouldEmitToOwnFile(sourceFile, compilerOptions)) { + var jsFilePath = ts.getOwnEmitOutputFilePath(sourceFile, host, shouldEmitJsx(sourceFile) ? ".jsx" : ".js"); + emitFile(jsFilePath, sourceFile); + } + }); } } else { @@ -29971,8 +30373,8 @@ var ts; var jsFilePath = ts.getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js"); emitFile(jsFilePath, targetSourceFile); } - else if (!ts.isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) { - emitFile(compilerOptions.outFile || compilerOptions.out); + else if (!ts.isDeclarationFile(targetSourceFile) && outFile) { + emitFile(outFile); } } // Sort and make the unique list of diagnostics @@ -30024,10 +30426,16 @@ var ts; } } } - function emitJavaScript(jsFilePath, root) { + function createFileEmitter() { var writer = ts.createTextWriter(newLine); var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent; var currentSourceFile; + var currentText; + var currentLineMap; + var currentFileIdentifiers; + var renamedDependencies; + var isEs6Module; + var isCurrentFileExternalModule; // name of an exporter function if file is a System external module // System.register([...], function () {...}) // exporting in System modules looks like: @@ -30035,15 +30443,15 @@ var ts; // => // var x;... exporter("x", x = 1) var exportFunctionForFile; - var generatedNameSet = {}; - var nodeToGeneratedName = []; + var generatedNameSet; + var nodeToGeneratedName; var computedPropertyNamesToGeneratedNames; var convertedLoopState; - var extendsEmitted = false; - var decorateEmitted = false; - var paramEmitted = false; - var awaiterEmitted = false; - var tempFlags = 0; + var extendsEmitted; + var decorateEmitted; + var paramEmitted; + var awaiterEmitted; + var tempFlags; var tempVariables; var tempParameters; var externalImports; @@ -30075,6 +30483,8 @@ var ts; var scopeEmitEnd = function () { }; /** Sourcemap data that will get encoded */ var sourceMapData; + /** The root file passed to the emit function (if present) */ + var root; /** If removeComments is true, no leading-comments needed to be emitted **/ var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker; var moduleEmitDelegates = (_a = {}, @@ -30085,31 +30495,77 @@ var ts; _a[1 /* CommonJS */] = emitCommonJSModule, _a ); - if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { - initializeEmitterWithSourceMaps(); - } - if (root) { - // Do not call emit directly. It does not set the currentSourceFile. - emitSourceFile(root); - } - else { - ts.forEach(host.getSourceFiles(), function (sourceFile) { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - emitSourceFile(sourceFile); + var bundleEmitDelegates = (_b = {}, + _b[5 /* ES6 */] = function () { }, + _b[2 /* AMD */] = emitAMDModule, + _b[4 /* System */] = emitSystemModule, + _b[3 /* UMD */] = function () { }, + _b[1 /* CommonJS */] = function () { }, + _b + ); + return doEmit; + function doEmit(jsFilePath, rootFile) { + // reset the state + writer.reset(); + currentSourceFile = undefined; + currentText = undefined; + currentLineMap = undefined; + exportFunctionForFile = undefined; + generatedNameSet = {}; + nodeToGeneratedName = []; + computedPropertyNamesToGeneratedNames = undefined; + convertedLoopState = undefined; + extendsEmitted = false; + decorateEmitted = false; + paramEmitted = false; + awaiterEmitted = false; + tempFlags = 0; + tempVariables = undefined; + tempParameters = undefined; + externalImports = undefined; + exportSpecifiers = undefined; + exportEquals = undefined; + hasExportStars = undefined; + detachedCommentsInfo = undefined; + sourceMapData = undefined; + isEs6Module = false; + renamedDependencies = undefined; + isCurrentFileExternalModule = false; + root = rootFile; + if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { + initializeEmitterWithSourceMaps(jsFilePath, root); + } + if (root) { + // Do not call emit directly. It does not set the currentSourceFile. + emitSourceFile(root); + } + else { + if (modulekind) { + ts.forEach(host.getSourceFiles(), emitEmitHelpers); } - }); + ts.forEach(host.getSourceFiles(), function (sourceFile) { + if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && ts.isExternalModule(sourceFile))) { + emitSourceFile(sourceFile); + } + }); + } + writeLine(); + writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM); } - writeLine(); - writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM); - return; function emitSourceFile(sourceFile) { currentSourceFile = sourceFile; + currentText = sourceFile.text; + currentLineMap = ts.getLineStarts(sourceFile); exportFunctionForFile = undefined; + isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"]; + renamedDependencies = sourceFile.renamedDependencies; + currentFileIdentifiers = sourceFile.identifiers; + isCurrentFileExternalModule = ts.isExternalModule(sourceFile); emit(sourceFile); } function isUniqueName(name) { return !resolver.hasGlobalName(name) && - !ts.hasProperty(currentSourceFile.identifiers, name) && + !ts.hasProperty(currentFileIdentifiers, name) && !ts.hasProperty(generatedNameSet, name); } // Return the next available name in the pattern _a ... _z, _0, _1, ... @@ -30192,7 +30648,7 @@ var ts; var id = ts.getNodeId(node); return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node))); } - function initializeEmitterWithSourceMaps() { + function initializeEmitterWithSourceMaps(jsFilePath, root) { var sourceMapDir; // The directory in which sourcemap will be // Current source map file and its index in the sources list var sourceMapSourceIndex = -1; @@ -30280,7 +30736,7 @@ var ts; } } function recordSourceMapSpan(pos) { - var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos); + var sourceLinePos = ts.computeLineAndCharacterOfPosition(currentLineMap, pos); // Convert the location to be one-based. sourceLinePos.line++; sourceLinePos.character++; @@ -30314,13 +30770,13 @@ var ts; } function recordEmitNodeStartSpan(node) { // Get the token pos after skipping to the token (ignoring the leading trivia) - recordSourceMapSpan(ts.skipTrivia(currentSourceFile.text, node.pos)); + recordSourceMapSpan(ts.skipTrivia(currentText, node.pos)); } function recordEmitNodeEndSpan(node) { recordSourceMapSpan(node.end); } function writeTextWithSpanRecord(tokenKind, startPos, emitFn) { - var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos); + var tokenStartPos = ts.skipTrivia(currentText, startPos); recordSourceMapSpan(tokenStartPos); var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn); recordSourceMapSpan(tokenEndPos); @@ -30402,9 +30858,9 @@ var ts; sourceMapNameIndices.pop(); } ; - function writeCommentRangeWithMap(curentSourceFile, writer, comment, newLine) { + function writeCommentRangeWithMap(currentText, currentLineMap, writer, comment, newLine) { recordSourceMapSpan(comment.pos); - ts.writeCommentRange(currentSourceFile, writer, comment, newLine); + ts.writeCommentRange(currentText, currentLineMap, writer, comment, newLine); recordSourceMapSpan(comment.end); } function serializeSourceMapContents(version, file, sourceRoot, sources, names, mappings, sourcesContent) { @@ -30434,7 +30890,7 @@ var ts; return output; } } - function writeJavaScriptAndSourceMapFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptAndSourceMapFile(emitOutput, jsFilePath, writeByteOrderMark) { encodeLastRecordedSourceMapSpan(); var sourceMapText = serializeSourceMapContents(3, sourceMapData.sourceMapFile, sourceMapData.sourceMapSourceRoot, sourceMapData.sourceMapSources, sourceMapData.sourceMapNames, sourceMapData.sourceMapMappings, sourceMapData.sourceMapSourcesContent); sourceMapDataList.push(sourceMapData); @@ -30450,7 +30906,7 @@ var ts; sourceMapUrl = "//# sourceMappingURL=" + sourceMapData.jsSourceMappingURL; } // Write sourcemap url to the js file and write the js file - writeJavaScriptFile(emitOutput + sourceMapUrl, writeByteOrderMark); + writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark); } // Initialize source map data var sourceMapJsFile = ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)); @@ -30522,7 +30978,7 @@ var ts; scopeEmitEnd = recordScopeNameEnd; writeComment = writeCommentRangeWithMap; } - function writeJavaScriptFile(emitOutput, writeByteOrderMark) { + function writeJavaScriptFile(emitOutput, jsFilePath, writeByteOrderMark) { ts.writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark); } // Create a temporary variable with a unique unused name. @@ -30702,7 +31158,7 @@ var ts; // If we don't need to downlevel and we can reach the original source text using // the node's parent reference, then simply get the text as it was originally written. if (node.parent) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + return ts.getTextOfNodeFromSourceText(currentText, node); } // If we can't reach the original source text, use the canonical form if it's a number, // or an escaped quoted form of the original text if it's string-like. @@ -30729,7 +31185,7 @@ var ts; // Find original source text, since we need to emit the raw strings of the tagged template. // The raw strings contain the (escaped) strings of what the user wrote. // Examples: `\n` is converted to "\\n", a template string with a newline to "\n". - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node); + var text = ts.getTextOfNodeFromSourceText(currentText, node); // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"), // thus we need to remove those characters. // First template piece starts with "`", others with "}" @@ -31146,7 +31602,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } write("\""); } @@ -31246,7 +31702,7 @@ var ts; // Identifier references named import write(getGeneratedNameForNode(declaration.parent.parent.parent)); var name_23 = declaration.propertyName || declaration.name; - var identifier = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, name_23); + var identifier = ts.getTextOfNodeFromSourceText(currentText, name_23); if (languageVersion === 0 /* ES3 */ && identifier === "default") { write("[\"default\"]"); } @@ -31270,7 +31726,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function isNameOfNestedRedeclaration(node) { @@ -31308,7 +31764,7 @@ var ts; write(node.text); } else { - writeTextOfNode(currentSourceFile, node); + writeTextOfNode(currentText, node); } } function emitThis(node) { @@ -31712,7 +32168,7 @@ var ts; function emitShorthandPropertyAssignment(node) { // The name property of a short-hand property assignment is considered an expression position, so here // we manually emit the identifier to avoid rewriting. - writeTextOfNode(currentSourceFile, node.name); + writeTextOfNode(currentText, node.name); // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier, // we emit a normal property assignment. For example: // module m { @@ -31722,7 +32178,7 @@ var ts; // let obj = { y }; // } // Here we need to emit obj = { y : m.y } regardless of the output target. - if (languageVersion < 2 /* ES6 */ || isNamespaceExportReference(node.name)) { + if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) { // Emit identifier as an identifier write(": "); emit(node.name); @@ -31779,11 +32235,11 @@ var ts; var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken); // 1 .toString is a valid property access, emit a space after the literal // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal - var shouldEmitSpace; + var shouldEmitSpace = false; if (!indentedBeforeDot) { if (node.expression.kind === 8 /* NumericLiteral */) { // check if numeric literal was originally written with a dot - var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression); + var text = ts.getTextOfNodeFromSourceText(currentText, node.expression); shouldEmitSpace = text.indexOf(ts.tokenToString(21 /* DotToken */)) < 0; } else { @@ -32962,16 +33418,16 @@ var ts; emitToken(16 /* CloseBraceToken */, node.clauses.end); } function nodeStartPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function nodeEndPositionsAreOnSameLine(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, node2.end); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end); } function nodeEndIsOnSameLineAsNodeStart(node1, node2) { - return ts.getLineOfLocalPosition(currentSourceFile, node1.end) === - ts.getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos)); + return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) === + ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos)); } function emitCaseOrDefaultClause(node) { if (node.kind === 241 /* CaseClause */) { @@ -33077,7 +33533,7 @@ var ts; ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 227 /* ExportAssignment */); // only allow export default at a source file level if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) { - if (!currentSourceFile.symbol.exports["___esModule"]) { + if (!isEs6Module) { if (languageVersion === 1 /* ES5 */) { // default value of configurable, enumerable, writable are `false`. write("Object.defineProperty(exports, \"__esModule\", { value: true });"); @@ -33272,14 +33728,20 @@ var ts; return node; } function createPropertyAccessForDestructuringProperty(object, propName) { - // We create a synthetic copy of the identifier in order to avoid the rewriting that might - // otherwise occur when the identifier is emitted. - var syntheticName = ts.createSynthesizedNode(propName.kind); - syntheticName.text = propName.text; - if (syntheticName.kind !== 69 /* Identifier */) { - return createElementAccessExpression(object, syntheticName); + var index; + var nameIsComputed = propName.kind === 136 /* ComputedPropertyName */; + if (nameIsComputed) { + index = ensureIdentifier(propName.expression, /* reuseIdentifierExpression */ false); + } + else { + // We create a synthetic copy of the identifier in order to avoid the rewriting that might + // otherwise occur when the identifier is emitted. + index = ts.createSynthesizedNode(propName.kind); + index.text = propName.text; } - return createPropertyAccessExpression(object, syntheticName); + return !nameIsComputed && index.kind === 69 /* Identifier */ + ? createPropertyAccessExpression(object, index) + : createElementAccessExpression(object, index); } function createSliceCall(value, sliceIndex) { var call = ts.createSynthesizedNode(168 /* CallExpression */); @@ -33742,7 +34204,6 @@ var ts; var promiseConstructor = ts.getEntityNameFromTypeNode(node.type); var isArrowFunction = node.kind === 174 /* ArrowFunction */; var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0; - var args; // An async function is emit as an outer function that calls an inner // generator function. To preserve lexical bindings, we pass the current // `this` and `arguments` objects to `__awaiter`. The generator function @@ -35197,8 +35658,8 @@ var ts; * Here we check if alternative name was provided for a given moduleName and return it if possible. */ function tryRenameExternalModule(moduleName) { - if (currentSourceFile.renamedDependencies && ts.hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) { - return "\"" + currentSourceFile.renamedDependencies[moduleName.text] + "\""; + if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) { + return "\"" + renamedDependencies[moduleName.text] + "\""; } return undefined; } @@ -35351,7 +35812,7 @@ var ts; // - current file is not external module // - import declaration is top level and target is value imported by entity name if (resolver.isReferencedAliasDeclaration(node) || - (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { + (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) { emitLeadingComments(node); emitStart(node); // variable declaration for import-equals declaration can be hoisted in system modules @@ -35579,7 +36040,7 @@ var ts; function getLocalNameForExternalImport(node) { var namespaceDeclaration = getNamespaceDeclarationNode(node); if (namespaceDeclaration && !isDefaultImport(node)) { - return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name); + return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name); } if (node.kind === 222 /* ImportDeclaration */ && node.importClause) { return getGeneratedNameForNode(node); @@ -35884,7 +36345,7 @@ var ts; ts.getEnclosingBlockScopeContainer(node).kind === 248 /* SourceFile */; } function isCurrentFileSystemExternalModule() { - return modulekind === 4 /* System */ && ts.isExternalModule(currentSourceFile); + return modulekind === 4 /* System */ && isCurrentFileExternalModule; } function emitSystemModuleBody(node, dependencyGroups, startIndex) { // shape of the body in system modules: @@ -36054,7 +36515,13 @@ var ts; writeLine(); write("}"); // execute } - function emitSystemModule(node) { + function writeModuleName(node, emitRelativePathAsModuleName) { + var moduleName = node.moduleName; + if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) { + write("\"" + moduleName + "\", "); + } + } + function emitSystemModule(node, emitRelativePathAsModuleName) { collectExternalModuleInfo(node); // System modules has the following shape // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */}) @@ -36069,9 +36536,7 @@ var ts; exportFunctionForFile = makeUniqueName("exports"); writeLine(); write("System.register("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } + writeModuleName(node, emitRelativePathAsModuleName); write("["); var groupIndices = {}; var dependencyGroups = []; @@ -36090,6 +36555,12 @@ var ts; if (i !== 0) { write(", "); } + if (emitRelativePathAsModuleName) { + var name_29 = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]); + if (name_29) { + text = "\"" + name_29 + "\""; + } + } write(text); } write("], function(" + exportFunctionForFile + ") {"); @@ -36103,7 +36574,7 @@ var ts; writeLine(); write("});"); } - function getAMDDependencyNames(node, includeNonAmdDependencies) { + function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { // names of modules with corresponding parameter in the factory function var aliasedModuleNames = []; // names of modules with no corresponding parameters in factory function @@ -36126,6 +36597,12 @@ var ts; var importNode = externalImports_4[_c]; // Find the name of the external module var externalModuleName = getExternalModuleNameText(importNode); + if (emitRelativePathAsModuleName) { + var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode); + if (name_30) { + externalModuleName = "\"" + name_30 + "\""; + } + } // Find the name of the module alias, if there is one var importAliasName = getLocalNameForExternalImport(importNode); if (includeNonAmdDependencies && importAliasName) { @@ -36138,7 +36615,7 @@ var ts; } return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames }; } - function emitAMDDependencies(node, includeNonAmdDependencies) { + function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) { // An AMD define function has the following shape: // define(id?, dependencies?, factory); // @@ -36150,7 +36627,7 @@ var ts; // To ensure this is true in cases of modules with no aliases, e.g.: // `import "module"` or `` // we need to add modules without alias names to the end of the dependencies list - var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies); + var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName); emitAMDDependencyList(dependencyNames); write(", "); emitAMDFactoryHeader(dependencyNames); @@ -36177,15 +36654,13 @@ var ts; } write(") {"); } - function emitAMDModule(node) { + function emitAMDModule(node, emitRelativePathAsModuleName) { emitEmitHelpers(node); collectExternalModuleInfo(node); writeLine(); write("define("); - if (node.moduleName) { - write("\"" + node.moduleName + "\", "); - } - emitAMDDependencies(node, /*includeNonAmdDependencies*/ true); + writeModuleName(node, emitRelativePathAsModuleName); + emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName); increaseIndent(); var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); emitExportStarHelper(); @@ -36404,8 +36879,13 @@ var ts; emitShebang(); emitDetachedCommentsAndUpdateCommentsInfo(node); if (ts.isExternalModule(node) || compilerOptions.isolatedModules) { - var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */]; - emitModule(node); + if (root || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) { + var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */]; + emitModule(node); + } + else { + bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/ true); + } } else { // emit prologue directives prior to __extends @@ -36666,7 +37146,7 @@ var ts; } function getLeadingCommentsWithoutDetachedComments() { // get the leading comments from detachedPos - var leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); + var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos); if (detachedCommentsInfo.length - 1) { detachedCommentsInfo.pop(); } @@ -36683,10 +37163,10 @@ var ts; function isTripleSlashComment(comment) { // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text // so that we don't end up computing comment string and doing match for all // comments - if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 /* slash */ && + if (currentText.charCodeAt(comment.pos + 1) === 47 /* slash */ && comment.pos + 2 < comment.end && - currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 /* slash */) { - var textSubStr = currentSourceFile.text.substring(comment.pos, comment.end); + currentText.charCodeAt(comment.pos + 2) === 47 /* slash */) { + var textSubStr = currentText.substring(comment.pos, comment.end); return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) || textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ? true : false; @@ -36703,7 +37183,7 @@ var ts; } else { // get the leading comments from the node - return ts.getLeadingCommentRangesOfNode(node, currentSourceFile); + return ts.getLeadingCommentRangesOfNodeFromText(node, currentText); } } } @@ -36712,7 +37192,7 @@ var ts; // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments if (node.parent) { if (node.parent.kind === 248 /* SourceFile */ || node.end !== node.parent.end) { - return ts.getTrailingCommentRanges(currentSourceFile.text, node.end); + return ts.getTrailingCommentRanges(currentText, node.end); } } } @@ -36746,9 +37226,9 @@ var ts; leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment); } } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments); // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment); } function emitTrailingComments(node) { if (compilerOptions.removeComments) { @@ -36757,7 +37237,7 @@ var ts; // Emit the trailing comments only if the parent's end doesn't match var trailingComments = getTrailingCommentsToEmit(node); // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/ - ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment); } /** * Emit trailing comments at the position. The term trailing comment is used here to describe following comment: @@ -36768,9 +37248,9 @@ var ts; if (compilerOptions.removeComments) { return; } - var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, pos); + var trailingComments = ts.getTrailingCommentRanges(currentText, pos); // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/ - ts.emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment); } function emitLeadingCommentsOfPositionWorker(pos) { if (compilerOptions.removeComments) { @@ -36783,14 +37263,14 @@ var ts; } else { // get the leading comments from the node - leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos); + leadingComments = ts.getLeadingCommentRanges(currentText, pos); } - ts.emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments); + ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments); // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space - ts.emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment); + ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment); } function emitDetachedCommentsAndUpdateCommentsInfo(node) { - var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile, writer, writeComment, node, newLine, compilerOptions.removeComments); + var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments); if (currentDetachedCommentInfo) { if (detachedCommentsInfo) { detachedCommentsInfo.push(currentDetachedCommentInfo); @@ -36801,12 +37281,12 @@ var ts; } } function emitShebang() { - var shebang = ts.getShebang(currentSourceFile.text); + var shebang = ts.getShebang(currentText); if (shebang) { write(shebang); } } - var _a; + var _a, _b; } function emitFile(jsFilePath, sourceFile) { emitJavaScript(jsFilePath, sourceFile); @@ -36866,11 +37346,11 @@ var ts; if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { var failedLookupLocations = []; var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName)); - var resolvedFileName = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var resolvedFileName = loadNodeModuleFromFile(ts.supportedJsExtensions, candidate, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(ts.supportedJsExtensions, candidate, failedLookupLocations, host); return resolvedFileName ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations }; @@ -36880,8 +37360,8 @@ var ts; } } ts.nodeModuleNameResolver = nodeModuleNameResolver; - function loadNodeModuleFromFile(candidate, failedLookupLocation, host) { - return ts.forEach(ts.moduleFileExtensions, tryLoad); + function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, host) { + return ts.forEach(extensions, tryLoad); function tryLoad(ext) { var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (host.fileExists(fileName)) { @@ -36893,7 +37373,7 @@ var ts; } } } - function loadNodeModuleFromDirectory(candidate, failedLookupLocation, host) { + function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, host) { var packageJsonPath = ts.combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { var jsonContent; @@ -36906,7 +37386,7 @@ var ts; jsonContent = { typings: undefined }; } if (jsonContent.typings) { - var result = loadNodeModuleFromFile(ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + var result = loadNodeModuleFromFile(extensions, ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); if (result) { return result; } @@ -36916,7 +37396,7 @@ var ts; // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(ts.combinePaths(candidate, "index"), failedLookupLocation, host); + return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName, directory, host) { var failedLookupLocations = []; @@ -36926,11 +37406,11 @@ var ts; if (baseName !== "node_modules") { var nodeModulesFolder = ts.combinePaths(directory, "node_modules"); var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - var result = loadNodeModuleFromFile(candidate, failedLookupLocations, host); + var result = loadNodeModuleFromFile(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } - result = loadNodeModuleFromDirectory(candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(ts.supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations }; } @@ -36956,9 +37436,10 @@ var ts; var searchName; var failedLookupLocations = []; var referencedSourceFile; + var extensions = compilerOptions.allowNonTsExtensions ? ts.supportedJsExtensions : ts.supportedExtensions; while (true) { searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName)); - referencedSourceFile = ts.forEach(ts.supportedExtensions, function (extension) { + referencedSourceFile = ts.forEach(extensions, function (extension) { if (extension === ".tsx" && !compilerOptions.jsx) { // resolve .tsx files only if jsx support is enabled // 'logical not' handles both undefined and None cases @@ -36989,10 +37470,8 @@ var ts; /* @internal */ ts.defaultInitCompilerOptions = { module: 1 /* CommonJS */, - target: 0 /* ES3 */, + target: 1 /* ES5 */, noImplicitAny: false, - outDir: "built", - rootDir: ".", sourceMap: false }; function createCompilerHost(options, setParentNodes) { @@ -37397,43 +37876,55 @@ var ts; if (file.imports) { return; } + var isJavaScriptFile = ts.isSourceFileJavaScript(file); var imports; for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { var node = _a[_i]; - collect(node, /* allowRelativeModuleNames */ true); + collect(node, /* allowRelativeModuleNames */ true, /* collectOnlyRequireCalls */ false); } file.imports = imports || emptyArray; - function collect(node, allowRelativeModuleNames) { - switch (node.kind) { - case 222 /* ImportDeclaration */: - case 221 /* ImportEqualsDeclaration */: - case 228 /* ExportDeclaration */: - var moduleNameExpr = ts.getExternalModuleName(node); - if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) { - break; - } - if (!moduleNameExpr.text) { + return; + function collect(node, allowRelativeModuleNames, collectOnlyRequireCalls) { + if (!collectOnlyRequireCalls) { + switch (node.kind) { + case 222 /* ImportDeclaration */: + case 221 /* ImportEqualsDeclaration */: + case 228 /* ExportDeclaration */: + var moduleNameExpr = ts.getExternalModuleName(node); + if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) { + break; + } + if (!moduleNameExpr.text) { + break; + } + if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { + (imports || (imports = [])).push(moduleNameExpr); + } break; - } - if (allowRelativeModuleNames || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) { - (imports || (imports = [])).push(moduleNameExpr); - } - break; - case 218 /* ModuleDeclaration */: - if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) { - // TypeScript 1.0 spec (April 2014): 12.1.6 - // An AmbientExternalModuleDeclaration declares an external module. - // This type of declaration is permitted only in the global module. - // The StringLiteral must specify a top - level external module name. - // Relative external module names are not permitted - ts.forEachChild(node.body, function (node) { + case 218 /* ModuleDeclaration */: + if (node.name.kind === 9 /* StringLiteral */ && (node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) { // TypeScript 1.0 spec (April 2014): 12.1.6 - // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules - // only through top - level external module names. Relative external module names are not permitted. - collect(node, /* allowRelativeModuleNames */ false); - }); - } - break; + // An AmbientExternalModuleDeclaration declares an external module. + // This type of declaration is permitted only in the global module. + // The StringLiteral must specify a top - level external module name. + // Relative external module names are not permitted + ts.forEachChild(node.body, function (node) { + // TypeScript 1.0 spec (April 2014): 12.1.6 + // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules + // only through top - level external module names. Relative external module names are not permitted. + collect(node, /* allowRelativeModuleNames */ false, collectOnlyRequireCalls); + }); + } + break; + } + } + if (isJavaScriptFile) { + if (ts.isRequireCall(node)) { + (imports || (imports = [])).push(node.arguments[0]); + } + else { + ts.forEachChild(node, function (node) { return collect(node, allowRelativeModuleNames, /* collectOnlyRequireCalls */ true); }); + } } } } @@ -37526,7 +38017,6 @@ var ts; // always process imported modules to record module name resolutions processImportedModules(file, basePath); if (isDefaultLib) { - file.isDefaultLib = true; files.unshift(file); } else { @@ -37604,6 +38094,9 @@ var ts; commonPathComponents.length = sourcePathComponents.length; } }); + if (!commonPathComponents) { + return currentDirectory; + } return ts.getNormalizedPathFromPathComponents(commonPathComponents); } function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) { @@ -37689,12 +38182,15 @@ var ts; if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) { programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower)); } + // Cannot specify module gen that isn't amd or system with --out + if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) { + programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile")); + } // there has to be common source directory if user specified --outdir || --sourceRoot // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted if (options.outDir || options.sourceRoot || - (options.mapRoot && - (!outFile || firstExternalModuleSourceFile !== undefined))) { + options.mapRoot) { if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { // If a rootDir is specified and is valid use it as the commonSourceDirectory commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory); @@ -38212,20 +38708,20 @@ var ts; var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined; var sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)); for (var i = 0; i < sysFiles.length; i++) { - var name_29 = sysFiles[i]; - if (ts.fileExtensionIs(name_29, ".d.ts")) { - var baseName = name_29.substr(0, name_29.length - ".d.ts".length); + var name_31 = sysFiles[i]; + if (ts.fileExtensionIs(name_31, ".d.ts")) { + var baseName = name_31.substr(0, name_31.length - ".d.ts".length); if (!ts.contains(sysFiles, baseName + ".tsx") && !ts.contains(sysFiles, baseName + ".ts")) { - fileNames.push(name_29); + fileNames.push(name_31); } } - else if (ts.fileExtensionIs(name_29, ".ts")) { - if (!ts.contains(sysFiles, name_29 + "x")) { - fileNames.push(name_29); + else if (ts.fileExtensionIs(name_31, ".ts")) { + if (!ts.contains(sysFiles, name_31 + "x")) { + fileNames.push(name_31); } } else { - fileNames.push(name_29); + fileNames.push(name_31); } } } @@ -38453,12 +38949,12 @@ var ts; ts.forEach(program.getSourceFiles(), function (sourceFile) { cancellationToken.throwIfCancellationRequested(); var nameToDeclarations = sourceFile.getNamedDeclarations(); - for (var name_30 in nameToDeclarations) { - var declarations = ts.getProperty(nameToDeclarations, name_30); + for (var name_32 in nameToDeclarations) { + var declarations = ts.getProperty(nameToDeclarations, name_32); if (declarations) { // First do a quick check to see if the name of the declaration matches the // last portion of the (possibly) dotted name they're searching for. - var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_30); + var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_32); if (!matches) { continue; } @@ -38471,14 +38967,14 @@ var ts; if (!containers) { return undefined; } - matches = patternMatcher.getMatches(containers, name_30); + matches = patternMatcher.getMatches(containers, name_32); if (!matches) { continue; } } var fileName = sourceFile.fileName; var matchKind = bestMatchKind(matches); - rawItems.push({ name: name_30, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); + rawItems.push({ name: name_32, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration }); } } } @@ -38859,9 +39355,9 @@ var ts; case 211 /* VariableDeclaration */: case 163 /* BindingElement */: var variableDeclarationNode; - var name_31; + var name_33; if (node.kind === 163 /* BindingElement */) { - name_31 = node.name; + name_33 = node.name; variableDeclarationNode = node; // binding elements are added only for variable declarations // bubble up to the containing variable declaration @@ -38873,16 +39369,16 @@ var ts; else { ts.Debug.assert(!ts.isBindingPattern(node.name)); variableDeclarationNode = node; - name_31 = node.name; + name_33 = node.name; } if (ts.isConst(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.constElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.constElement); } else if (ts.isLet(variableDeclarationNode)) { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.letElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.letElement); } else { - return createItem(node, getTextOfNode(name_31), ts.ScriptElementKind.variableElement); + return createItem(node, getTextOfNode(name_33), ts.ScriptElementKind.variableElement); } case 144 /* Constructor */: return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement); @@ -39802,7 +40298,7 @@ var ts; if (!candidates.length) { // We didn't have any sig help items produced by the TS compiler. If this is a JS // file, then see if we can figure out anything better. - if (ts.isJavaScript(sourceFile.fileName)) { + if (ts.isSourceFileJavaScript(sourceFile)) { return createJavaScriptSignatureHelpItems(argumentInfo); } return undefined; @@ -41662,9 +42158,9 @@ var ts; } Rules.prototype.getRuleName = function (rule) { var o = this; - for (var name_32 in o) { - if (o[name_32] === rule) { - return name_32; + for (var name_34 in o) { + if (o[name_34] === rule) { + return name_34; } } throw new Error("Unknown rule"); @@ -42096,7 +42592,7 @@ var ts; function TokenRangeAccess(from, to, except) { this.tokens = []; for (var token = from; token <= to; token++) { - if (except.indexOf(token) < 0) { + if (ts.indexOf(except, token) < 0) { this.tokens.push(token); } } @@ -43709,13 +44205,18 @@ var ts; ]; var jsDocCompletionEntries; function createNode(kind, pos, end, flags, parent) { - var node = new (ts.getNodeConstructor(kind))(pos, end); + var node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; } var NodeObject = (function () { - function NodeObject() { + function NodeObject(kind, pos, end) { + this.kind = kind; + this.pos = pos; + this.end = end; + this.flags = 0 /* None */; + this.parent = undefined; } NodeObject.prototype.getSourceFile = function () { return ts.getSourceFileOfNode(this); @@ -44198,8 +44699,8 @@ var ts; })(); var SourceFileObject = (function (_super) { __extends(SourceFileObject, _super); - function SourceFileObject() { - _super.apply(this, arguments); + function SourceFileObject(kind, pos, end) { + _super.call(this, kind, pos, end); } SourceFileObject.prototype.update = function (newText, textChangeRange) { return ts.updateSourceFile(this, newText, textChangeRange); @@ -44521,6 +45022,9 @@ var ts; ClassificationTypeNames.typeAliasName = "type alias name"; ClassificationTypeNames.parameterName = "parameter name"; ClassificationTypeNames.docCommentTagName = "doc comment tag name"; + ClassificationTypeNames.jsxOpenTagName = "jsx open tag name"; + ClassificationTypeNames.jsxCloseTagName = "jsx close tag name"; + ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name"; return ClassificationTypeNames; })(); ts.ClassificationTypeNames = ClassificationTypeNames; @@ -44543,6 +45047,9 @@ var ts; ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName"; ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName"; ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName"; + ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName"; + ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName"; + ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName"; })(ts.ClassificationType || (ts.ClassificationType = {})); var ClassificationType = ts.ClassificationType; function displayPartsToString(displayParts) { @@ -44922,8 +45429,9 @@ var ts; }; } ts.createDocumentRegistry = createDocumentRegistry; - function preProcessFile(sourceText, readImportFiles) { + function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) { if (readImportFiles === void 0) { readImportFiles = true; } + if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; } var referencedFiles = []; var importedFiles = []; var ambientExternalModules; @@ -44957,116 +45465,66 @@ var ts; end: pos + importPath.length }); } - function processImport() { - scanner.setText(sourceText); - var token = scanner.scan(); - // Look for: - // import "mod"; - // import d from "mod" - // import {a as A } from "mod"; - // import * as NS from "mod" - // import d, {a, b as B} from "mod" - // import i = require("mod"); - // - // export * from "mod" - // export {a as b} from "mod" - // export import i = require("mod") - while (token !== 1 /* EndOfFileToken */) { - if (token === 122 /* DeclareKeyword */) { - // declare module "mod" - token = scanner.scan(); - if (token === 125 /* ModuleKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - recordAmbientExternalModule(); - continue; - } - } - } - else if (token === 89 /* ImportKeyword */) { + /** + * Returns true if at least one token was consumed from the stream + */ + function tryConsumeDeclare() { + var token = scanner.getToken(); + if (token === 122 /* DeclareKeyword */) { + // declare module "mod" + token = scanner.scan(); + if (token === 125 /* ModuleKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // import "mod"; - recordModuleName(); - continue; + recordAmbientExternalModule(); } - else { - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + } + return true; + } + return false; + } + /** + * Returns true if at least one token was consumed from the stream + */ + function tryConsumeImport() { + var token = scanner.getToken(); + if (token === 89 /* ImportKeyword */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // import "mod"; + recordModuleName(); + return true; + } + else { + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import d from "mod"; - recordModuleName(); - continue; - } - } - else if (token === 56 /* EqualsToken */) { - token = scanner.scan(); - if (token === 127 /* RequireKeyword */) { - token = scanner.scan(); - if (token === 17 /* OpenParenToken */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import i = require("mod"); - recordModuleName(); - continue; - } - } - } - } - else if (token === 24 /* CommaToken */) { - // consume comma and keep going - token = scanner.scan(); - } - else { - // unknown syntax - continue; + if (token === 9 /* StringLiteral */) { + // import d from "mod"; + recordModuleName(); + return true; } } - if (token === 15 /* OpenBraceToken */) { - token = scanner.scan(); - // consume "{ a as B, c, d as D}" clauses - while (token !== 16 /* CloseBraceToken */) { - token = scanner.scan(); - } - if (token === 16 /* CloseBraceToken */) { - token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import {a as A} from "mod"; - // import d, {a, b as B} from "mod" - recordModuleName(); - } - } + else if (token === 56 /* EqualsToken */) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + return true; } } - else if (token === 37 /* AsteriskToken */) { + else if (token === 24 /* CommaToken */) { + // consume comma and keep going token = scanner.scan(); - if (token === 116 /* AsKeyword */) { - token = scanner.scan(); - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 133 /* FromKeyword */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // import * as NS from "mod" - // import d, * as NS from "mod" - recordModuleName(); - } - } - } - } + } + else { + // unknown syntax + return true; } } - } - else if (token === 82 /* ExportKeyword */) { - token = scanner.scan(); if (token === 15 /* OpenBraceToken */) { token = scanner.scan(); // consume "{ a as B, c, d as D}" clauses - while (token !== 16 /* CloseBraceToken */) { + // make sure that it stops on EOF + while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) { token = scanner.scan(); } if (token === 16 /* CloseBraceToken */) { @@ -45074,49 +45532,171 @@ var ts; if (token === 133 /* FromKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // export {a as A} from "mod"; - // export {a, b as B} from "mod" + // import {a as A} from "mod"; + // import d, {a, b as B} from "mod" recordModuleName(); } } } } else if (token === 37 /* AsteriskToken */) { + token = scanner.scan(); + if (token === 116 /* AsKeyword */) { + token = scanner.scan(); + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // import * as NS from "mod" + // import d, * as NS from "mod" + recordModuleName(); + } + } + } + } + } + } + return true; + } + return false; + } + function tryConsumeExport() { + var token = scanner.getToken(); + if (token === 82 /* ExportKeyword */) { + token = scanner.scan(); + if (token === 15 /* OpenBraceToken */) { + token = scanner.scan(); + // consume "{ a as B, c, d as D}" clauses + // make sure it stops on EOF + while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) { + token = scanner.scan(); + } + if (token === 16 /* CloseBraceToken */) { token = scanner.scan(); if (token === 133 /* FromKeyword */) { token = scanner.scan(); if (token === 9 /* StringLiteral */) { - // export * from "mod" + // export {a as A} from "mod"; + // export {a, b as B} from "mod" recordModuleName(); } } } - else if (token === 89 /* ImportKeyword */) { + } + else if (token === 37 /* AsteriskToken */) { + token = scanner.scan(); + if (token === 133 /* FromKeyword */) { token = scanner.scan(); - if (token === 69 /* Identifier */ || ts.isKeyword(token)) { - token = scanner.scan(); - if (token === 56 /* EqualsToken */) { - token = scanner.scan(); - if (token === 127 /* RequireKeyword */) { - token = scanner.scan(); - if (token === 17 /* OpenParenToken */) { - token = scanner.scan(); - if (token === 9 /* StringLiteral */) { - // export import i = require("mod"); - recordModuleName(); - } - } - } + if (token === 9 /* StringLiteral */) { + // export * from "mod" + recordModuleName(); + } + } + } + else if (token === 89 /* ImportKeyword */) { + token = scanner.scan(); + if (token === 69 /* Identifier */ || ts.isKeyword(token)) { + token = scanner.scan(); + if (token === 56 /* EqualsToken */) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + return true; } } } } + return true; + } + return false; + } + function tryConsumeRequireCall(skipCurrentToken) { + var token = skipCurrentToken ? scanner.scan() : scanner.getToken(); + if (token === 127 /* RequireKeyword */) { + token = scanner.scan(); + if (token === 17 /* OpenParenToken */) { + token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // require("mod"); + recordModuleName(); + } + } + return true; + } + return false; + } + function tryConsumeDefine() { + var token = scanner.getToken(); + if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") { + token = scanner.scan(); + if (token !== 17 /* OpenParenToken */) { + return true; + } token = scanner.scan(); + if (token === 9 /* StringLiteral */) { + // looks like define ("modname", ... - skip string literal and comma + token = scanner.scan(); + if (token === 24 /* CommaToken */) { + token = scanner.scan(); + } + else { + // unexpected token + return true; + } + } + // should be start of dependency list + if (token !== 19 /* OpenBracketToken */) { + return true; + } + // skip open bracket + token = scanner.scan(); + var i = 0; + // scan until ']' or EOF + while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) { + // record string literals as module names + if (token === 9 /* StringLiteral */) { + recordModuleName(); + i++; + } + token = scanner.scan(); + } + return true; + } + return false; + } + function processImports() { + scanner.setText(sourceText); + scanner.scan(); + // Look for: + // import "mod"; + // import d from "mod" + // import {a as A } from "mod"; + // import * as NS from "mod" + // import d, {a, b as B} from "mod" + // import i = require("mod"); + // + // export * from "mod" + // export {a as b} from "mod" + // export import i = require("mod") + // (for JavaScript files) require("mod") + while (true) { + if (scanner.getToken() === 1 /* EndOfFileToken */) { + break; + } + // check if at least one of alternative have moved scanner forward + if (tryConsumeDeclare() || + tryConsumeImport() || + tryConsumeExport() || + (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { + continue; + } + else { + scanner.scan(); + } } scanner.setText(undefined); } if (readImportFiles) { - processImport(); + processImports(); } processTripleSlashDirectives(); return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules }; @@ -45547,7 +46127,7 @@ var ts; // For JavaScript files, we don't want to report the normal typescript semantic errors. // Instead, we just report errors for using TypeScript-only constructs from within a // JavaScript file. - if (ts.isJavaScript(fileName)) { + if (ts.isSourceFileJavaScript(targetSourceFile)) { return getJavaScriptSemanticDiagnostics(targetSourceFile); } // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. @@ -45759,7 +46339,7 @@ var ts; var typeChecker = program.getTypeChecker(); var syntacticStart = new Date().getTime(); var sourceFile = getValidSourceFile(fileName); - var isJavaScriptFile = ts.isJavaScript(fileName); + var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile); var isJsDocTagName = false; var start = new Date().getTime(); var currentToken = ts.getTokenAtPosition(sourceFile, position); @@ -46393,8 +46973,8 @@ var ts; if (element.getStart() <= position && position <= element.getEnd()) { continue; } - var name_33 = element.propertyName || element.name; - exisingImportsOrExports[name_33.text] = true; + var name_35 = element.propertyName || element.name; + exisingImportsOrExports[name_35.text] = true; } if (ts.isEmpty(exisingImportsOrExports)) { return exportsOfModule; @@ -46426,7 +47006,10 @@ var ts; } var existingName = void 0; if (m.kind === 163 /* BindingElement */ && m.propertyName) { - existingName = m.propertyName.text; + // include only identifiers in completion list + if (m.propertyName.kind === 69 /* Identifier */) { + existingName = m.propertyName.text; + } } else { // TODO(jfreeman): Account for computed property name @@ -46466,46 +47049,43 @@ var ts; return undefined; } var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName; - var entries; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - if (isRightOfDot && ts.isJavaScript(fileName)) { - entries = getCompletionEntriesFromSymbols(symbols); - ts.addRange(entries, getJavaScriptCompletionEntries()); + var sourceFile = getValidSourceFile(fileName); + var entries = []; + if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) { + var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); + ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames)); } else { if (!symbols || symbols.length === 0) { return undefined; } - entries = getCompletionEntriesFromSymbols(symbols); + getCompletionEntriesFromSymbols(symbols, entries); } // Add keywords if this is not a member completion list if (!isMemberCompletion && !isJsDocTagName) { ts.addRange(entries, keywordCompletions); } return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries }; - function getJavaScriptCompletionEntries() { + function getJavaScriptCompletionEntries(sourceFile, uniqueNames) { var entries = []; - var allNames = {}; var target = program.getCompilerOptions().target; - for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) { - var sourceFile = _a[_i]; - var nameTable = getNameTable(sourceFile); - for (var name_34 in nameTable) { - if (!allNames[name_34]) { - allNames[name_34] = name_34; - var displayName = getCompletionEntryDisplayName(name_34, target, /*performCharacterChecks:*/ true); - if (displayName) { - var entry = { - name: displayName, - kind: ScriptElementKind.warning, - kindModifiers: "", - sortText: "1" - }; - entries.push(entry); - } + var nameTable = getNameTable(sourceFile); + for (var name_36 in nameTable) { + if (!uniqueNames[name_36]) { + uniqueNames[name_36] = name_36; + var displayName = getCompletionEntryDisplayName(name_36, target, /*performCharacterChecks:*/ true); + if (displayName) { + var entry = { + name: displayName, + kind: ScriptElementKind.warning, + kindModifiers: "", + sortText: "1" + }; + entries.push(entry); } } } @@ -46543,25 +47123,24 @@ var ts; sortText: "0" }; } - function getCompletionEntriesFromSymbols(symbols) { + function getCompletionEntriesFromSymbols(symbols, entries) { var start = new Date().getTime(); - var entries = []; + var uniqueNames = {}; if (symbols) { - var nameToSymbol = {}; for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) { var symbol = symbols_3[_i]; var entry = createCompletionEntry(symbol, location); if (entry) { var id = ts.escapeIdentifier(entry.name); - if (!ts.lookUp(nameToSymbol, id)) { + if (!ts.lookUp(uniqueNames, id)) { entries.push(entry); - nameToSymbol[id] = symbol; + uniqueNames[id] = id; } } } } log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start)); - return entries; + return uniqueNames; } } function getCompletionEntryDetails(fileName, position, entryName) { @@ -46762,16 +47341,16 @@ var ts; case ScriptElementKind.parameterElement: case ScriptElementKind.localVariableElement: // If it is call or construct signature of lambda's write type name - displayParts.push(ts.punctuationPart(54 /* ColonToken */)); + displayParts.push(ts.punctuationPart(ts.SyntaxKind.ColonToken)); displayParts.push(ts.spacePart()); if (useConstructSignatures) { - displayParts.push(ts.keywordPart(92 /* NewKeyword */)); + displayParts.push(ts.keywordPart(ts.SyntaxKind.NewKeyword)); displayParts.push(ts.spacePart()); } - if (!(type.flags & 65536 /* Anonymous */)) { - ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */)); + if (!(type.flags & ts.TypeFlags.Anonymous)) { + ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, ts.SymbolFormatFlags.WriteTypeParametersOrArguments)); } - addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */); + addSignatureDisplayParts(signature, allSignatures, ts.TypeFormatFlags.WriteArrowStyleSignature); break; default: // Just signature @@ -48396,19 +48975,19 @@ var ts; if (isNameOfPropertyAssignment(node)) { var objectLiteral = node.parent.parent; var contextualType = typeChecker.getContextualType(objectLiteral); - var name_35 = node.text; + var name_37 = node.text; if (contextualType) { if (contextualType.flags & 16384 /* Union */) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - var unionProperty = contextualType.getProperty(name_35); + var unionProperty = contextualType.getProperty(name_37); if (unionProperty) { return [unionProperty]; } else { var result_4 = []; ts.forEach(contextualType.types, function (t) { - var symbol = t.getProperty(name_35); + var symbol = t.getProperty(name_37); if (symbol) { result_4.push(symbol); } @@ -48417,7 +48996,7 @@ var ts; } } else { - var symbol_1 = contextualType.getProperty(name_35); + var symbol_1 = contextualType.getProperty(name_37); if (symbol_1) { return [symbol_1]; } @@ -48828,6 +49407,9 @@ var ts; case 16 /* typeAliasName */: return ClassificationTypeNames.typeAliasName; case 17 /* parameterName */: return ClassificationTypeNames.parameterName; case 18 /* docCommentTagName */: return ClassificationTypeNames.docCommentTagName; + case 19 /* jsxOpenTagName */: return ClassificationTypeNames.jsxOpenTagName; + case 20 /* jsxCloseTagName */: return ClassificationTypeNames.jsxCloseTagName; + case 21 /* jsxSelfClosingTagName */: return ClassificationTypeNames.jsxSelfClosingTagName; } } function convertClassifications(classifications) { @@ -49097,6 +49679,21 @@ var ts; return 17 /* parameterName */; } return; + case 235 /* JsxOpeningElement */: + if (token.parent.tagName === token) { + return 19 /* jsxOpenTagName */; + } + return; + case 237 /* JsxClosingElement */: + if (token.parent.tagName === token) { + return 20 /* jsxCloseTagName */; + } + return; + case 234 /* JsxSelfClosingElement */: + if (token.parent.tagName === token) { + return 21 /* jsxSelfClosingTagName */; + } + return; } } return 2 /* identifier */; @@ -50021,18 +50618,8 @@ var ts; ts.getDefaultLibFilePath = getDefaultLibFilePath; function initializeServices() { ts.objectAllocator = { - getNodeConstructor: function (kind) { - function Node(pos, end) { - this.pos = pos; - this.end = end; - this.flags = 0 /* None */; - this.parent = undefined; - } - var proto = kind === 248 /* SourceFile */ ? new SourceFileObject() : new NodeObject(); - proto.kind = kind; - Node.prototype = proto; - return Node; - }, + getNodeConstructor: function () { return NodeObject; }, + getSourceFileConstructor: function () { return SourceFileObject; }, getSymbolConstructor: function () { return SymbolObject; }, getTypeConstructor: function () { return TypeObject; }, getSignatureConstructor: function () { return SignatureObject; } @@ -51102,7 +51689,8 @@ var ts; }; CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) { return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () { - var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength())); + // for now treat files as JavaScript + var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true); var convertResult = { referencedFiles: [], importedFiles: [], @@ -51166,7 +51754,7 @@ var ts; TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) { try { if (this.documentRegistry === undefined) { - this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames()); + this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); } var hostAdapter = new LanguageServiceShimHostAdapter(host); var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry); @@ -51199,7 +51787,7 @@ var ts; TypeScriptServicesFactory.prototype.close = function () { // Forget all the registered shims this._shims = []; - this.documentRegistry = ts.createDocumentRegistry(); + this.documentRegistry = undefined; }; TypeScriptServicesFactory.prototype.registerShim = function (shim) { this._shims.push(shim); From 527f4658ad71135ee2a5d7bf441d3c84fdfa7aeb Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 11 Nov 2015 11:39:46 -0800 Subject: [PATCH 195/353] Use string literal types in the command line parser. --- src/compiler/types.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 8b0027c1377df..5f9f82d9a6462 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2179,17 +2179,17 @@ namespace ts { /* @internal */ export interface CommandLineOptionBase { name: string; - type: string | Map; // "string", "number", "boolean", or an object literal mapping named values to actual values - isFilePath?: boolean; // True if option value is a path or fileName - shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help' - description?: DiagnosticMessage; // The message describing what the command line switch does - paramType?: DiagnosticMessage; // The name to be used for a non-boolean option's parameter + type: "string" | "number" | "boolean" | Map; // a value of a primitive type, or an object literal mapping named values to actual values + isFilePath?: boolean; // True if option value is a path or fileName + shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help' + description?: DiagnosticMessage; // The message describing what the command line switch does + paramType?: DiagnosticMessage; // The name to be used for a non-boolean option's parameter experimental?: boolean; } /* @internal */ export interface CommandLineOptionOfPrimitiveType extends CommandLineOptionBase { - type: string; // "string" | "number" | "boolean" + type: "string" | "number" | "boolean"; } /* @internal */ From 593ba66af107602b33bd4db1da8011aebce4a43d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 10 Nov 2015 14:35:30 -0800 Subject: [PATCH 196/353] Test cases for --sourceMap --inlineSources option --- .../optionsSourcemapInlineSources.js | 7 ++++ .../optionsSourcemapInlineSources.js.map | 2 ++ ...ptionsSourcemapInlineSources.sourcemap.txt | 34 +++++++++++++++++++ .../optionsSourcemapInlineSources.symbols | 5 +++ .../optionsSourcemapInlineSources.types | 6 ++++ .../optionsSourcemapInlineSourcesMapRoot.js | 7 ++++ ...ptionsSourcemapInlineSourcesMapRoot.js.map | 2 ++ ...ourcemapInlineSourcesMapRoot.sourcemap.txt | 34 +++++++++++++++++++ ...tionsSourcemapInlineSourcesMapRoot.symbols | 5 +++ ...optionsSourcemapInlineSourcesMapRoot.types | 6 ++++ ...optionsSourcemapInlineSourcesSourceRoot.js | 7 ++++ ...onsSourcemapInlineSourcesSourceRoot.js.map | 2 ++ ...cemapInlineSourcesSourceRoot.sourcemap.txt | 34 +++++++++++++++++++ ...nsSourcemapInlineSourcesSourceRoot.symbols | 5 +++ ...ionsSourcemapInlineSourcesSourceRoot.types | 6 ++++ .../compiler/optionsSourcemapInlineSources.ts | 4 +++ .../optionsSourcemapInlineSourcesMapRoot.ts | 5 +++ ...optionsSourcemapInlineSourcesSourceRoot.ts | 5 +++ 18 files changed, 176 insertions(+) create mode 100644 tests/baselines/reference/optionsSourcemapInlineSources.js create mode 100644 tests/baselines/reference/optionsSourcemapInlineSources.js.map create mode 100644 tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt create mode 100644 tests/baselines/reference/optionsSourcemapInlineSources.symbols create mode 100644 tests/baselines/reference/optionsSourcemapInlineSources.types create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types create mode 100644 tests/cases/compiler/optionsSourcemapInlineSources.ts create mode 100644 tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts create mode 100644 tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.js b/tests/baselines/reference/optionsSourcemapInlineSources.js new file mode 100644 index 0000000000000..029575ab99259 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSources.js @@ -0,0 +1,7 @@ +//// [optionsSourcemapInlineSources.ts] + +var a = 10; + +//// [optionsSourcemapInlineSources.js] +var a = 10; +//# sourceMappingURL=optionsSourcemapInlineSources.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.js.map b/tests/baselines/reference/optionsSourcemapInlineSources.js.map new file mode 100644 index 0000000000000..2be063325733a --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSources.js.map @@ -0,0 +1,2 @@ +//// [optionsSourcemapInlineSources.js.map] +{"version":3,"file":"optionsSourcemapInlineSources.js","sourceRoot":"","sources":["optionsSourcemapInlineSources.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]} \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt new file mode 100644 index 0000000000000..79119d8c68714 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSources.sourcemap.txt @@ -0,0 +1,34 @@ +=================================================================== +JsFile: optionsSourcemapInlineSources.js +mapUrl: optionsSourcemapInlineSources.js.map +sourceRoot: +sources: optionsSourcemapInlineSources.ts +sourcesContent: ["\nvar a = 10;"] +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsSourcemapInlineSources.js +sourceFile:optionsSourcemapInlineSources.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=optionsSourcemapInlineSources.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.symbols b/tests/baselines/reference/optionsSourcemapInlineSources.symbols new file mode 100644 index 0000000000000..50649b86a0ddc --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSources.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/optionsSourcemapInlineSources.ts === + +var a = 10; +>a : Symbol(a, Decl(optionsSourcemapInlineSources.ts, 1, 3)) + diff --git a/tests/baselines/reference/optionsSourcemapInlineSources.types b/tests/baselines/reference/optionsSourcemapInlineSources.types new file mode 100644 index 0000000000000..42fa1839371b9 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSources.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/optionsSourcemapInlineSources.ts === + +var a = 10; +>a : number +>10 : number + diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js new file mode 100644 index 0000000000000..f7100140850f6 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js @@ -0,0 +1,7 @@ +//// [optionsSourcemapInlineSourcesMapRoot.ts] + +var a = 10; + +//// [optionsSourcemapInlineSourcesMapRoot.js] +var a = 10; +//# sourceMappingURL=local/optionsSourcemapInlineSourcesMapRoot.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map new file mode 100644 index 0000000000000..e99843b577f73 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.js.map @@ -0,0 +1,2 @@ +//// [optionsSourcemapInlineSourcesMapRoot.js.map] +{"version":3,"file":"optionsSourcemapInlineSourcesMapRoot.js","sourceRoot":"","sources":["../optionsSourcemapInlineSourcesMapRoot.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]} \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt new file mode 100644 index 0000000000000..a00040a9c93c4 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.sourcemap.txt @@ -0,0 +1,34 @@ +=================================================================== +JsFile: optionsSourcemapInlineSourcesMapRoot.js +mapUrl: local/optionsSourcemapInlineSourcesMapRoot.js.map +sourceRoot: +sources: ../optionsSourcemapInlineSourcesMapRoot.ts +sourcesContent: ["\nvar a = 10;"] +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.js +sourceFile:../optionsSourcemapInlineSourcesMapRoot.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=local/optionsSourcemapInlineSourcesMapRoot.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols new file mode 100644 index 0000000000000..57833abe2eeba --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts === + +var a = 10; +>a : Symbol(a, Decl(optionsSourcemapInlineSourcesMapRoot.ts, 1, 3)) + diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types new file mode 100644 index 0000000000000..77abb6f7b11a3 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesMapRoot.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts === + +var a = 10; +>a : number +>10 : number + diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js new file mode 100644 index 0000000000000..948d6536f46a7 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js @@ -0,0 +1,7 @@ +//// [optionsSourcemapInlineSourcesSourceRoot.ts] + +var a = 10; + +//// [optionsSourcemapInlineSourcesSourceRoot.js] +var a = 10; +//# sourceMappingURL=optionsSourcemapInlineSourcesSourceRoot.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map new file mode 100644 index 0000000000000..ad373e11aab4e --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.js.map @@ -0,0 +1,2 @@ +//// [optionsSourcemapInlineSourcesSourceRoot.js.map] +{"version":3,"file":"optionsSourcemapInlineSourcesSourceRoot.js","sourceRoot":"local/","sources":["optionsSourcemapInlineSourcesSourceRoot.ts"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,EAAE,CAAC","sourcesContent":["\nvar a = 10;"]} \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt new file mode 100644 index 0000000000000..55102f5c1cdfa --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.sourcemap.txt @@ -0,0 +1,34 @@ +=================================================================== +JsFile: optionsSourcemapInlineSourcesSourceRoot.js +mapUrl: optionsSourcemapInlineSourcesSourceRoot.js.map +sourceRoot: local/ +sources: optionsSourcemapInlineSourcesSourceRoot.ts +sourcesContent: ["\nvar a = 10;"] +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.js +sourceFile:optionsSourcemapInlineSourcesSourceRoot.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=optionsSourcemapInlineSourcesSourceRoot.js.map \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols new file mode 100644 index 0000000000000..76f2dc5fdc426 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts === + +var a = 10; +>a : Symbol(a, Decl(optionsSourcemapInlineSourcesSourceRoot.ts, 1, 3)) + diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types new file mode 100644 index 0000000000000..3689afc382c76 --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts === + +var a = 10; +>a : number +>10 : number + diff --git a/tests/cases/compiler/optionsSourcemapInlineSources.ts b/tests/cases/compiler/optionsSourcemapInlineSources.ts new file mode 100644 index 0000000000000..dddfb5f84ca4e --- /dev/null +++ b/tests/cases/compiler/optionsSourcemapInlineSources.ts @@ -0,0 +1,4 @@ +// @sourcemap: true +// @inlineSources: true + +var a = 10; \ No newline at end of file diff --git a/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts b/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts new file mode 100644 index 0000000000000..c7a74469dc1c0 --- /dev/null +++ b/tests/cases/compiler/optionsSourcemapInlineSourcesMapRoot.ts @@ -0,0 +1,5 @@ +// @sourcemap: true +// @inlineSources: true +// @mapRoot: local + +var a = 10; \ No newline at end of file diff --git a/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts b/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts new file mode 100644 index 0000000000000..4fd372658adcf --- /dev/null +++ b/tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts @@ -0,0 +1,5 @@ +// @sourcemap: true +// @inlineSources: true +// @sourceRoot: local + +var a = 10; \ No newline at end of file From 8020bf90d6dd2dd24e7a04bf19077780444e22ab Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 10 Nov 2015 14:44:51 -0800 Subject: [PATCH 197/353] Test cases to verify --inlineSourceMap with --sourcemap --mapRoot and --sourceRoot Note that --sourceRoot fails with crash --- .../optionsInlineSourceMapMapRoot.errors.txt | 9 +++++ .../optionsInlineSourceMapMapRoot.js | 7 ++++ ...ptionsInlineSourceMapMapRoot.sourcemap.txt | 33 +++++++++++++++++++ ...optionsInlineSourceMapSourcemap.errors.txt | 7 ++++ .../optionsInlineSourceMapSourcemap.js | 7 ++++ ...ionsInlineSourceMapSourcemap.sourcemap.txt | 33 +++++++++++++++++++ .../compiler/optionsInlineSourceMapMapRoot.ts | 4 +++ .../optionsInlineSourceMapSourceRoot.ts | 4 +++ .../optionsInlineSourceMapSourcemap.ts | 4 +++ 9 files changed, 108 insertions(+) create mode 100644 tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt create mode 100644 tests/baselines/reference/optionsInlineSourceMapMapRoot.js create mode 100644 tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourcemap.js create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt create mode 100644 tests/cases/compiler/optionsInlineSourceMapMapRoot.ts create mode 100644 tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts create mode 100644 tests/cases/compiler/optionsInlineSourceMapSourcemap.ts diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt new file mode 100644 index 0000000000000..a9efb0e297179 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.errors.txt @@ -0,0 +1,9 @@ +error TS5052: Option 'mapRoot' cannot be specified without specifying option 'sourceMap'. +error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. + + +!!! error TS5052: Option 'mapRoot' cannot be specified without specifying option 'sourceMap'. +!!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. +==== tests/cases/compiler/optionsInlineSourceMapMapRoot.ts (0 errors) ==== + + var a = 10; \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.js b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js new file mode 100644 index 0000000000000..6389f9eb84a17 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js @@ -0,0 +1,7 @@ +//// [optionsInlineSourceMapMapRoot.ts] + +var a = 10; + +//// [optionsInlineSourceMapMapRoot.js] +var a = 10; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt new file mode 100644 index 0000000000000..e12e2d1096a18 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt @@ -0,0 +1,33 @@ +=================================================================== +JsFile: optionsInlineSourceMapMapRoot.js +mapUrl: c:/TypeScript/tests/cases/compiler/optionsInlineSourceMapMapRoot.js.map +sourceRoot: +sources: optionsInlineSourceMapMapRoot.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsInlineSourceMapMapRoot.js +sourceFile:optionsInlineSourceMapMapRoot.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt b/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt new file mode 100644 index 0000000000000..e91781ccd776a --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.errors.txt @@ -0,0 +1,7 @@ +error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. + + +!!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. +==== tests/cases/compiler/optionsInlineSourceMapSourcemap.ts (0 errors) ==== + + var a = 10; \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.js b/tests/baselines/reference/optionsInlineSourceMapSourcemap.js new file mode 100644 index 0000000000000..96d468d27daf3 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.js @@ -0,0 +1,7 @@ +//// [optionsInlineSourceMapSourcemap.ts] + +var a = 10; + +//// [optionsInlineSourceMapSourcemap.js] +var a = 10; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZW1hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm9wdGlvbnNJbmxpbmVTb3VyY2VNYXBTb3VyY2VtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDIn0= \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt new file mode 100644 index 0000000000000..ecd6c4062c3d4 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourcemap.sourcemap.txt @@ -0,0 +1,33 @@ +=================================================================== +JsFile: optionsInlineSourceMapSourcemap.js +mapUrl: optionsInlineSourceMapSourcemap.js.map +sourceRoot: +sources: optionsInlineSourceMapSourcemap.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsInlineSourceMapSourcemap.js +sourceFile:optionsInlineSourceMapSourcemap.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZW1hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm9wdGlvbnNJbmxpbmVTb3VyY2VNYXBTb3VyY2VtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDIn0= \ No newline at end of file diff --git a/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts b/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts new file mode 100644 index 0000000000000..ddea5f363c7b1 --- /dev/null +++ b/tests/cases/compiler/optionsInlineSourceMapMapRoot.ts @@ -0,0 +1,4 @@ +// @mapRoot: local +// @inlineSourceMap: true + +var a = 10; \ No newline at end of file diff --git a/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts b/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts new file mode 100644 index 0000000000000..b4fdc66e309ee --- /dev/null +++ b/tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts @@ -0,0 +1,4 @@ +// @sourceRoot: local +// @inlineSourceMap: true + +var a = 10; \ No newline at end of file diff --git a/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts b/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts new file mode 100644 index 0000000000000..d78097985d8af --- /dev/null +++ b/tests/cases/compiler/optionsInlineSourceMapSourcemap.ts @@ -0,0 +1,4 @@ +// @sourcemap: true +// @inlineSourceMap: true + +var a = 10; \ No newline at end of file From 1659300ddba965da7dce4ffb12970a5879dca08a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 11 Nov 2015 12:58:31 -0800 Subject: [PATCH 198/353] Fix the --sourceRoot and --mapRoot option handling --- src/compiler/program.ts | 10 +++--- .../reference/inlineSourceMap2.errors.txt | 2 -- .../optionsInlineSourceMapMapRoot.js | 2 +- ...ptionsInlineSourceMapMapRoot.sourcemap.txt | 10 +++--- .../optionsInlineSourceMapSourceRoot.js | 7 ++++ ...onsInlineSourceMapSourceRoot.sourcemap.txt | 33 +++++++++++++++++++ .../optionsInlineSourceMapSourceRoot.symbols | 5 +++ .../optionsInlineSourceMapSourceRoot.types | 6 ++++ ...ourcemapInlineSourcesSourceRoot.errors.txt | 7 ++++ ...nsSourcemapInlineSourcesSourceRoot.symbols | 5 --- ...ionsSourcemapInlineSourcesSourceRoot.types | 6 ---- 11 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourceRoot.js create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols create mode 100644 tests/baselines/reference/optionsInlineSourceMapSourceRoot.types create mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt delete mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols delete mode 100644 tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 08321da82e9cf..ca0c7d9adaa77 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -990,16 +990,15 @@ namespace ts { if (options.mapRoot) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap")); } - if (options.sourceRoot) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceRoot", "inlineSourceMap")); - } } - if (options.inlineSources) { if (!options.sourceMap && !options.inlineSourceMap) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided)); } + if (options.sourceRoot) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceRoot", "inlineSources")); + } } if (options.out && options.outFile) { @@ -1011,10 +1010,9 @@ namespace ts { if (options.mapRoot) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "mapRoot", "sourceMap")); } - if (options.sourceRoot) { + if (options.sourceRoot && !options.inlineSourceMap) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap")); } - return; } const languageVersion = options.target || ScriptTarget.ES3; diff --git a/tests/baselines/reference/inlineSourceMap2.errors.txt b/tests/baselines/reference/inlineSourceMap2.errors.txt index 24b0fddf942f1..26db1415593d0 100644 --- a/tests/baselines/reference/inlineSourceMap2.errors.txt +++ b/tests/baselines/reference/inlineSourceMap2.errors.txt @@ -1,12 +1,10 @@ error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSourceMap'. tests/cases/compiler/inlineSourceMap2.ts(5,1): error TS2304: Cannot find name 'console'. !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. !!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -!!! error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSourceMap'. ==== tests/cases/compiler/inlineSourceMap2.ts (1 errors) ==== // configuration errors diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.js b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js index 6389f9eb84a17..c165c49ec2947 100644 --- a/tests/baselines/reference/optionsInlineSourceMapMapRoot.js +++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.js @@ -4,4 +4,4 @@ var a = 10; //// [optionsInlineSourceMapMapRoot.js] var a = 10; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9vcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt index e12e2d1096a18..32e5f85d02f26 100644 --- a/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt +++ b/tests/baselines/reference/optionsInlineSourceMapMapRoot.sourcemap.txt @@ -1,12 +1,12 @@ =================================================================== JsFile: optionsInlineSourceMapMapRoot.js -mapUrl: c:/TypeScript/tests/cases/compiler/optionsInlineSourceMapMapRoot.js.map +mapUrl: local/optionsInlineSourceMapMapRoot.js.map sourceRoot: -sources: optionsInlineSourceMapMapRoot.ts +sources: ../optionsInlineSourceMapMapRoot.ts =================================================================== ------------------------------------------------------------------- emittedFile:tests/cases/compiler/optionsInlineSourceMapMapRoot.js -sourceFile:optionsInlineSourceMapMapRoot.ts +sourceFile:../optionsInlineSourceMapMapRoot.ts ------------------------------------------------------------------- >>>var a = 10; 1 > @@ -15,7 +15,7 @@ sourceFile:optionsInlineSourceMapMapRoot.ts 4 > ^^^ 5 > ^^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >var @@ -30,4 +30,4 @@ sourceFile:optionsInlineSourceMapMapRoot.ts 5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) 6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) --- ->>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcE1hcFJvb3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9vcHRpb25zSW5saW5lU291cmNlTWFwTWFwUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js new file mode 100644 index 0000000000000..748fae7320ccb --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.js @@ -0,0 +1,7 @@ +//// [optionsInlineSourceMapSourceRoot.ts] + +var a = 10; + +//// [optionsInlineSourceMapSourceRoot.js] +var a = 10; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZVJvb3QuanMiLCJzb3VyY2VSb290IjoibG9jYWwvIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwU291cmNlUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt new file mode 100644 index 0000000000000..b3f81493aa956 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.sourcemap.txt @@ -0,0 +1,33 @@ +=================================================================== +JsFile: optionsInlineSourceMapSourceRoot.js +mapUrl: optionsInlineSourceMapSourceRoot.js.map +sourceRoot: local/ +sources: optionsInlineSourceMapSourceRoot.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/optionsInlineSourceMapSourceRoot.js +sourceFile:optionsInlineSourceMapSourceRoot.ts +------------------------------------------------------------------- +>>>var a = 10; +1 > +2 >^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 >var +3 > a +4 > = +5 > 10 +6 > ; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 9) Source(2, 9) + SourceIndex(0) +5 >Emitted(1, 11) Source(2, 11) + SourceIndex(0) +6 >Emitted(1, 12) Source(2, 12) + SourceIndex(0) +--- +>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uc0lubGluZVNvdXJjZU1hcFNvdXJjZVJvb3QuanMiLCJzb3VyY2VSb290IjoibG9jYWwvIiwic291cmNlcyI6WyJvcHRpb25zSW5saW5lU291cmNlTWFwU291cmNlUm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols new file mode 100644 index 0000000000000..cf8c0826d8ee0 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts === + +var a = 10; +>a : Symbol(a, Decl(optionsInlineSourceMapSourceRoot.ts, 1, 3)) + diff --git a/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types new file mode 100644 index 0000000000000..1f6a5fc9dc609 --- /dev/null +++ b/tests/baselines/reference/optionsInlineSourceMapSourceRoot.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/optionsInlineSourceMapSourceRoot.ts === + +var a = 10; +>a : number +>10 : number + diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt new file mode 100644 index 0000000000000..bfa77ff5a3e9b --- /dev/null +++ b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.errors.txt @@ -0,0 +1,7 @@ +error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSources'. + + +!!! error TS5053: Option 'sourceRoot' cannot be specified with option 'inlineSources'. +==== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts (0 errors) ==== + + var a = 10; \ No newline at end of file diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols deleted file mode 100644 index 76f2dc5fdc426..0000000000000 --- a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.symbols +++ /dev/null @@ -1,5 +0,0 @@ -=== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts === - -var a = 10; ->a : Symbol(a, Decl(optionsSourcemapInlineSourcesSourceRoot.ts, 1, 3)) - diff --git a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types b/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types deleted file mode 100644 index 3689afc382c76..0000000000000 --- a/tests/baselines/reference/optionsSourcemapInlineSourcesSourceRoot.types +++ /dev/null @@ -1,6 +0,0 @@ -=== tests/cases/compiler/optionsSourcemapInlineSourcesSourceRoot.ts === - -var a = 10; ->a : number ->10 : number - From 15f505e6aa0a3ec3e701b9e2c30cc40a478b88d0 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 13:30:26 -0800 Subject: [PATCH 199/353] use tslint@next --- package.json | 2 +- scripts/tslint/booleanTriviaRule.ts | 11 +++++------ scripts/tslint/nextLineRule.ts | 4 ++-- scripts/tslint/noNullRule.ts | 4 ++-- scripts/tslint/preferConstRule.ts | 8 ++++---- scripts/tslint/typeOperatorSpacingRule.ts | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 7b8abfaae43f7..ebdcb73c08203 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "browserify": "latest", "istanbul": "latest", "mocha-fivemat-progress-reporter": "latest", - "tslint": "latest", + "tslint": "next", "tsd": "latest" }, "scripts": { diff --git a/scripts/tslint/booleanTriviaRule.ts b/scripts/tslint/booleanTriviaRule.ts index be32a870ff4b2..93c312ab8708a 100644 --- a/scripts/tslint/booleanTriviaRule.ts +++ b/scripts/tslint/booleanTriviaRule.ts @@ -1,6 +1,5 @@ -/// -/// - +import * as Lint from "tslint/lib/lint"; +import * as ts from "typescript"; export class Rule extends Lint.Rules.AbstractRule { public static FAILURE_STRING_FACTORY = (name: string, currently: string) => `Tag boolean argument as '${name}' (currently '${currently}')`; @@ -19,7 +18,7 @@ class BooleanTriviaWalker extends Lint.RuleWalker { visitCallExpression(node: ts.CallExpression) { super.visitCallExpression(node); - if (node.arguments) { + if (node.arguments) { const targetCallSignature = this.checker.getResolvedSignature(node); if (!!targetCallSignature) { const targetParameters = targetCallSignature.getParameters(); @@ -37,7 +36,7 @@ class BooleanTriviaWalker extends Lint.RuleWalker { let triviaContent: string; const ranges = ts.getLeadingCommentRanges(arg.getFullText(), 0); if (ranges && ranges.length === 1 && ranges[0].kind === ts.SyntaxKind.MultiLineCommentTrivia) { - triviaContent = arg.getFullText().slice(ranges[0].pos + 2, ranges[0].end - 2); //+/-2 to remove /**/ + triviaContent = arg.getFullText().slice(ranges[0].pos + 2, ranges[0].end - 2); // +/-2 to remove /**/ } if (triviaContent !== param.getName()) { this.addFailure(this.createFailure(arg.getStart(source), arg.getWidth(source), Rule.FAILURE_STRING_FACTORY(param.getName(), triviaContent))); @@ -45,6 +44,6 @@ class BooleanTriviaWalker extends Lint.RuleWalker { } } } - } + } } } diff --git a/scripts/tslint/nextLineRule.ts b/scripts/tslint/nextLineRule.ts index 6d803fc7f8810..d25652f7bce6e 100644 --- a/scripts/tslint/nextLineRule.ts +++ b/scripts/tslint/nextLineRule.ts @@ -1,5 +1,5 @@ -/// -/// +import * as Lint from "tslint/lib/lint"; +import * as ts from "typescript"; const OPTION_CATCH = "check-catch"; const OPTION_ELSE = "check-else"; diff --git a/scripts/tslint/noNullRule.ts b/scripts/tslint/noNullRule.ts index 2a2c5bc371778..8e9deca996b5e 100644 --- a/scripts/tslint/noNullRule.ts +++ b/scripts/tslint/noNullRule.ts @@ -1,5 +1,5 @@ -/// -/// +import * as Lint from "tslint/lib/lint"; +import * as ts from "typescript"; export class Rule extends Lint.Rules.AbstractRule { diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index 29160a9c634f5..e4ffa396fb713 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -1,5 +1,5 @@ -/// -/// +import * as Lint from "tslint/lib/lint"; +import * as ts from "typescript"; export class Rule extends Lint.Rules.AbstractRule { @@ -101,13 +101,13 @@ class PreferConstWalker extends Lint.RuleWalker { this.visitBindingLiteralExpression(node as (ts.ArrayLiteralExpression | ts.ObjectLiteralExpression)); } } - + private visitBindingLiteralExpression(node: ts.ArrayLiteralExpression | ts.ObjectLiteralExpression) { if (node.kind === ts.SyntaxKind.ObjectLiteralExpression) { const pattern = node as ts.ObjectLiteralExpression; for (const element of pattern.properties) { if (element.name.kind === ts.SyntaxKind.Identifier) { - this.markAssignment(element.name as ts.Identifier) + this.markAssignment(element.name as ts.Identifier); } else if (isBindingPattern(element.name)) { this.visitBindingPatternIdentifiers(element.name as ts.BindingPattern); diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts index 239254933400a..4196d0247685e 100644 --- a/scripts/tslint/typeOperatorSpacingRule.ts +++ b/scripts/tslint/typeOperatorSpacingRule.ts @@ -1,5 +1,5 @@ -/// -/// +import * as Lint from "tslint/lib/lint"; +import * as ts from "typescript"; export class Rule extends Lint.Rules.AbstractRule { From 77f8d89883c65733f3690dd01bad8bbbfa76c05a Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 13:42:46 -0800 Subject: [PATCH 200/353] because it needs to work with npm 2 as well --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ebdcb73c08203..474b35a3e1f20 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,8 @@ "clean": "jake clean", "jake": "jake", "lint": "jake lint", - "setup-hooks": "node scripts/link-hooks.js" + "setup-hooks": "node scripts/link-hooks.js", + "postinstall": "npm dedupe" }, "browser": { "buffer": false, From ee10ea1baa39f259c84bc020723d60c8b5f76d0a Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 13:58:09 -0800 Subject: [PATCH 201/353] this should work better than dedupe --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 474b35a3e1f20..261cdfa64b7d1 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "istanbul": "latest", "mocha-fivemat-progress-reporter": "latest", "tslint": "next", + "typescript": "next", "tsd": "latest" }, "scripts": { @@ -47,8 +48,7 @@ "clean": "jake clean", "jake": "jake", "lint": "jake lint", - "setup-hooks": "node scripts/link-hooks.js", - "postinstall": "npm dedupe" + "setup-hooks": "node scripts/link-hooks.js" }, "browser": { "buffer": false, From 6c29ddf16203b0bd7a88081596c061a346455106 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 15:30:09 -0800 Subject: [PATCH 202/353] loosen walk up containers, add extra test --- src/compiler/checker.ts | 8 +--- tests/baselines/reference/typeGuardInClass.js | 37 +++++++++++++++++++ .../reference/typeGuardInClass.symbols | 27 ++++++++++++++ .../reference/typeGuardInClass.types | 32 ++++++++++++++++ .../typeGuardsInFunctionAndModuleBlock.js | 8 ++-- ...typeGuardsInFunctionAndModuleBlock.symbols | 4 +- .../typeGuardsInFunctionAndModuleBlock.types | 8 ++-- .../typeGuards/typeGuardInClass.ts | 16 ++++++++ .../typeGuardsInFunctionAndModuleBlock.ts | 4 +- 9 files changed, 125 insertions(+), 19 deletions(-) create mode 100644 tests/baselines/reference/typeGuardInClass.js create mode 100644 tests/baselines/reference/typeGuardInClass.symbols create mode 100644 tests/baselines/reference/typeGuardInClass.types create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7856e3f4cda92..615d6f1834c91 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6399,13 +6399,7 @@ namespace ts { break; case SyntaxKind.SourceFile: case SyntaxKind.ModuleDeclaration: - case SyntaxKind.FunctionDeclaration: - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - case SyntaxKind.Constructor: - // Stop at the first containing function or module declaration + // Stop at the first containing file or module declaration break loop; } } diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js new file mode 100644 index 0000000000000..44bda9f4cb5af --- /dev/null +++ b/tests/baselines/reference/typeGuardInClass.js @@ -0,0 +1,37 @@ +//// [typeGuardInClass.ts] +let x: string | number; + +if (typeof x === "string") { + let n = class { + constructor() { + x; // Should be "string" + } + } +} +else { + let m = class { + constructor() { + x; // Should be "number" + } + } +} + + +//// [typeGuardInClass.js] +var x; +if (typeof x === "string") { + var n = (function () { + function class_1() { + x; // Should be "string" + } + return class_1; + })(); +} +else { + var m = (function () { + function class_2() { + x; // Should be "number" + } + return class_2; + })(); +} diff --git a/tests/baselines/reference/typeGuardInClass.symbols b/tests/baselines/reference/typeGuardInClass.symbols new file mode 100644 index 0000000000000..66de16518598b --- /dev/null +++ b/tests/baselines/reference/typeGuardInClass.symbols @@ -0,0 +1,27 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts === +let x: string | number; +>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) + +if (typeof x === "string") { +>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) + + let n = class { +>n : Symbol(n, Decl(typeGuardInClass.ts, 3, 7)) + + constructor() { + x; // Should be "string" +>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) + } + } +} +else { + let m = class { +>m : Symbol(m, Decl(typeGuardInClass.ts, 10, 7)) + + constructor() { + x; // Should be "number" +>x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) + } + } +} + diff --git a/tests/baselines/reference/typeGuardInClass.types b/tests/baselines/reference/typeGuardInClass.types new file mode 100644 index 0000000000000..8552b58508e72 --- /dev/null +++ b/tests/baselines/reference/typeGuardInClass.types @@ -0,0 +1,32 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts === +let x: string | number; +>x : string | number + +if (typeof x === "string") { +>typeof x === "string" : boolean +>typeof x : string +>x : string | number +>"string" : string + + let n = class { +>n : typeof (Anonymous class) +>class { constructor() { x; // Should be "string" } } : typeof (Anonymous class) + + constructor() { + x; // Should be "string" +>x : string + } + } +} +else { + let m = class { +>m : typeof (Anonymous class) +>class { constructor() { x; // Should be "number" } } : typeof (Anonymous class) + + constructor() { + x; // Should be "number" +>x : number + } + } +} + diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js index 7cf19dac0ad68..91443a9ae783e 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js @@ -41,12 +41,12 @@ function foo4(x: number | string | boolean) { : x.toString(); // number })(x); // x here is narrowed to number | boolean } -// Type guards affect nested function expressions, but not nested function declarations +// Type guards affect nested function expressions and nested function declarations function foo5(x: number | string | boolean) { if (typeof x === "string") { var y = x; // string; function foo() { - var z = x; // number | string | boolean, type guard has no effect + var z = x; // string } } } @@ -121,12 +121,12 @@ function foo4(x) { : x.toString(); // number })(x); // x here is narrowed to number | boolean } -// Type guards affect nested function expressions, but not nested function declarations +// Type guards affect nested function expressions and nested function declarations function foo5(x) { if (typeof x === "string") { var y = x; // string; function foo() { - var z = x; // number | string | boolean, type guard has no effect + var z = x; // string } } } diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols index 2f3232b02255d..34810f303db3d 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols @@ -130,7 +130,7 @@ function foo4(x: number | string | boolean) { })(x); // x here is narrowed to number | boolean >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 32, 14)) } -// Type guards affect nested function expressions, but not nested function declarations +// Type guards affect nested function expressions and nested function declarations function foo5(x: number | string | boolean) { >foo5 : Symbol(foo5, Decl(typeGuardsInFunctionAndModuleBlock.ts, 41, 1)) >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 43, 14)) @@ -145,7 +145,7 @@ function foo5(x: number | string | boolean) { function foo() { >foo : Symbol(foo, Decl(typeGuardsInFunctionAndModuleBlock.ts, 45, 18)) - var z = x; // number | string | boolean, type guard has no effect + var z = x; // string >z : Symbol(z, Decl(typeGuardsInFunctionAndModuleBlock.ts, 47, 15)) >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 43, 14)) } diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types index 0a084d6eb541d..f7d56ed17d1a6 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types @@ -181,7 +181,7 @@ function foo4(x: number | string | boolean) { })(x); // x here is narrowed to number | boolean >x : number | boolean } -// Type guards affect nested function expressions, but not nested function declarations +// Type guards affect nested function expressions and nested function declarations function foo5(x: number | string | boolean) { >foo5 : (x: number | string | boolean) => void >x : number | string | boolean @@ -199,9 +199,9 @@ function foo5(x: number | string | boolean) { function foo() { >foo : () => void - var z = x; // number | string | boolean, type guard has no effect ->z : number | string | boolean ->x : number | string | boolean + var z = x; // string +>z : string +>x : string } } } diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts new file mode 100644 index 0000000000000..f88088744fc72 --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts @@ -0,0 +1,16 @@ +let x: string | number; + +if (typeof x === "string") { + let n = class { + constructor() { + x; // Should be "string" + } + } +} +else { + let m = class { + constructor() { + x; // Should be "number" + } + } +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts index ec23b75b590ae..5dbc925d04b40 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts @@ -40,12 +40,12 @@ function foo4(x: number | string | boolean) { : x.toString(); // number })(x); // x here is narrowed to number | boolean } -// Type guards affect nested function expressions, but not nested function declarations +// Type guards affect nested function expressions and nested function declarations function foo5(x: number | string | boolean) { if (typeof x === "string") { var y = x; // string; function foo() { - var z = x; // number | string | boolean, type guard has no effect + var z = x; // string } } } From 472afc4e16771cf94d71b77b02a507fefd6c8651 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 11 Nov 2015 15:48:41 -0800 Subject: [PATCH 203/353] add condition to bail at containing level --- src/compiler/checker.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 615d6f1834c91..2eaf91b9614ee 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6386,6 +6386,8 @@ namespace ts { // Only narrow when symbol is variable of type any or an object, union, or type parameter type if (node && symbol.flags & SymbolFlags.Variable) { if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) { + const declaration = getDeclarationOfKind(symbol, SyntaxKind.VariableDeclaration); + const top = declaration && getDeclarationContainer(declaration); const originalType = type; const nodeStack: {node: Node, child: Node}[] = []; loop: while (node.parent) { @@ -6402,6 +6404,9 @@ namespace ts { // Stop at the first containing file or module declaration break loop; } + if (node === top) { + break; + } } let nodes: {node: Node, child: Node}; From d2445b6286e31996234035bc3bd2ba116be7d639 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 11 Nov 2015 16:10:23 -0800 Subject: [PATCH 204/353] PR feedback --- src/compiler/program.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 8f807ed7b86c5..efaeb825184fb 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -327,7 +327,6 @@ namespace ts { let files: SourceFile[] = []; let fileProcessingDiagnostics = createDiagnosticCollection(); const programDiagnostics = createDiagnosticCollection(); - const emitBlockingDiagnostics = createDiagnosticCollection(); let commonSourceDirectory: string; let diagnosticsProducingTypeChecker: TypeChecker; @@ -835,7 +834,6 @@ namespace ts { const allDiagnostics: Diagnostic[] = []; addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics()); addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics()); - addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics()); return sortAndDeduplicateDiagnostics(allDiagnostics); } @@ -1263,7 +1261,7 @@ namespace ts { }); } - // Verify that all the emit files are unique and dont overwrite input files + // Verify that all the emit files are unique and don't overwrite input files function verifyEmitFilePath(emitFileName: string, emitFilesSeen: FileMap) { if (emitFileName) { const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName); @@ -1286,7 +1284,7 @@ namespace ts { function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) { hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true); - emitBlockingDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); + programDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); } } } From 4720c3592df77ac0be3cef7e427e5ea4d0804f84 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 11 Nov 2015 16:51:29 -0800 Subject: [PATCH 205/353] added missing check if file is specified --- src/services/services.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index 0e2dd51333621..d1c87d1723940 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2847,8 +2847,11 @@ namespace ts { } function sourceFileUpToDate(sourceFile: SourceFile): boolean { + if (!sourceFile) { + return false; + } let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); - return sourceFile && sourceFile.version === hostCache.getVersion(path); + return sourceFile.version === hostCache.getVersion(path); } function programUpToDate(): boolean { From 40e0ffaff7eceb666e7b37e5198bb0acbcf16846 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Wed, 11 Nov 2015 23:22:12 -0800 Subject: [PATCH 206/353] Update authors for release 1.7 --- AUTHORS.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 0ade4c3122171..a733520ff4fde 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -8,6 +8,7 @@ TypeScript is authored by: * Basarat Ali Syed * Ben Duffield * Bill Ticehurst +* Brett Mayen * Bryan Forbes * Caitlin Potter * Chris Bubernak @@ -17,11 +18,14 @@ TypeScript is authored by: * Dan Quirk * Daniel Rosenwasser * David Li -* Dick van den Brink -* Dirk Bäumer +* Denis Nedelyaev +* Dick van den Brink +* Dirk Bäumer +* Eyas Sharaiha * Frank Wallis * Gabriel Isenberg * Gilad Peleg +* Graeme Wicksted * Guillaume Salles * Harald Niesche * Ingvar Stepanyan @@ -31,30 +35,39 @@ TypeScript is authored by: * Jason Ramsay * Jed Mao * Johannes Rieken +* John Vilk * Jonathan Bond-Caron * Jonathan Park * Jonathan Turner * Josh Kalderimis +* Julian Williams * Kagami Sascha Rosylight * Keith Mashinter +* Ken Howard * Kenji Imamula * Lorant Pinter +* Martin VÅ¡etiÄka * Masahiro Wakame * Max Deepfield * Micah Zoltu * Mohamed Hegazy +* Nathan Shively-Sanders * Oleg Mihailik * Oleksandr Chekhovskyi * Paul van Brenk * Pedro Maltez * Philip Bulley * piloopin +* @progre +* Punya Biswal * Ron Buckton * Ryan Cavanaugh +* Ryohei Ikegami +* Sébastien Arod * Sheetal Nandi * Shengping Zhong * Shyyko Serhiy -* Simon Hürlimann +* Simon H�rlimann * Solal Pirelli * Stan Thomas * Steve Lucco @@ -63,8 +76,10 @@ TypeScript is authored by: * togru * Tomas Grubliauskas * TruongSinh Tran-Nguyen +* Viliv Vane * Vladimir Matveev * Wesley Wigham +* York Yao * Yui Tanglertsampan * Zev Spitz * Zhengbo Li \ No newline at end of file From f4929e7b1822f57abedd568edfe57d736fbaae13 Mon Sep 17 00:00:00 2001 From: mihailik Date: Thu, 12 Nov 2015 12:28:37 +0000 Subject: [PATCH 207/353] Encoding bug --- AUTHORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index a733520ff4fde..486a15bf47f6d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -67,7 +67,7 @@ TypeScript is authored by: * Sheetal Nandi * Shengping Zhong * Shyyko Serhiy -* Simon H�rlimann +* Simon Hürlimann * Solal Pirelli * Stan Thomas * Steve Lucco @@ -82,4 +82,4 @@ TypeScript is authored by: * York Yao * Yui Tanglertsampan * Zev Spitz -* Zhengbo Li \ No newline at end of file +* Zhengbo Li From ebd1b873f168dc742f1e4681e576b1e74ff91b14 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Thu, 12 Nov 2015 10:17:47 -0800 Subject: [PATCH 208/353] always check statements in case clause --- src/compiler/checker.ts | 12 +++---- .../checkSwitchStatementIfCaseTypeIsString.js | 27 +++++++++++++++ ...kSwitchStatementIfCaseTypeIsString.symbols | 29 ++++++++++++++++ ...eckSwitchStatementIfCaseTypeIsString.types | 33 +++++++++++++++++++ .../checkSwitchStatementIfCaseTypeIsString.ts | 11 +++++++ 5 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js create mode 100644 tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols create mode 100644 tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types create mode 100644 tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7856e3f4cda92..a215eda64c1e7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -12886,13 +12886,13 @@ namespace ts { // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression. const caseType = checkExpression(caseClause.expression); - // Permit 'number[] | "foo"' to be asserted to 'string'. - if (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, TypeFlags.StringLike)) { - return; - } + const expressionTypeIsAssignableToCaseType = + // Permit 'number[] | "foo"' to be asserted to 'string'. + (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, TypeFlags.StringLike)) || + isTypeAssignableTo(expressionType, caseType); - if (!isTypeAssignableTo(expressionType, caseType)) { - // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails + if (!expressionTypeIsAssignableToCaseType) { + // 'expressionType is not assignable to caseType', try the reversed check and report errors if it fails checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined); } } diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js new file mode 100644 index 0000000000000..64ea4e67fa8a7 --- /dev/null +++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js @@ -0,0 +1,27 @@ +//// [checkSwitchStatementIfCaseTypeIsString.ts] +declare function use(a: any): void; + +class A { + doIt(x: Array): void { + x.forEach((v) => { + switch(v) { + case "test": use(this); + } + }); + } +} + +//// [checkSwitchStatementIfCaseTypeIsString.js] +var A = (function () { + function A() { + } + A.prototype.doIt = function (x) { + var _this = this; + x.forEach(function (v) { + switch (v) { + case "test": use(_this); + } + }); + }; + return A; +})(); diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols new file mode 100644 index 0000000000000..6bc994f2a449f --- /dev/null +++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts === +declare function use(a: any): void; +>use : Symbol(use, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 0)) +>a : Symbol(a, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 21)) + +class A { +>A : Symbol(A, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 35)) + + doIt(x: Array): void { +>doIt : Symbol(doIt, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 2, 9)) +>x : Symbol(x, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 3, 9)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + x.forEach((v) => { +>x.forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 3, 9)) +>forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --)) +>v : Symbol(v, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 4, 19)) + + switch(v) { +>v : Symbol(v, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 4, 19)) + + case "test": use(this); +>use : Symbol(use, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 0)) +>this : Symbol(A, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 35)) + } + }); + } +} diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types new file mode 100644 index 0000000000000..fa394b4e0bd32 --- /dev/null +++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types @@ -0,0 +1,33 @@ +=== tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts === +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +class A { +>A : A + + doIt(x: Array): void { +>doIt : (x: string[]) => void +>x : string[] +>Array : T[] + + x.forEach((v) => { +>x.forEach((v) => { switch(v) { case "test": use(this); } }) : void +>x.forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void +>x : string[] +>forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void +>(v) => { switch(v) { case "test": use(this); } } : (v: string) => void +>v : string + + switch(v) { +>v : string + + case "test": use(this); +>"test" : string +>use(this) : void +>use : (a: any) => void +>this : this + } + }); + } +} diff --git a/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts b/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts new file mode 100644 index 0000000000000..931f64a4b2957 --- /dev/null +++ b/tests/cases/compiler/checkSwitchStatementIfCaseTypeIsString.ts @@ -0,0 +1,11 @@ +declare function use(a: any): void; + +class A { + doIt(x: Array): void { + x.forEach((v) => { + switch(v) { + case "test": use(this); + } + }); + } +} \ No newline at end of file From ea29793acd6a5e83d7177c41448b72da419bfe5f Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 12 Nov 2015 11:02:19 -0800 Subject: [PATCH 209/353] Quote only names that need to be quoted, not the reverse --- src/compiler/emitter.ts | 6 +-- .../getEmitOutputTsxFile_React.baseline | 4 +- .../reference/keywordInJsxIdentifier.js | 4 +- .../reference/tsxExternalModuleEmit2.js | 2 +- .../reference/tsxReactEmit7.errors.txt | 50 +++++++++++++++++++ tests/baselines/reference/tsxReactEmit7.js | 33 ++++++++++++ tests/cases/conformance/jsx/tsxReactEmit7.tsx | 22 ++++++++ 7 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 tests/baselines/reference/tsxReactEmit7.errors.txt create mode 100644 tests/baselines/reference/tsxReactEmit7.js create mode 100644 tests/cases/conformance/jsx/tsxReactEmit7.tsx diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d0314649b8884..372389f9c4a20 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1592,13 +1592,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi /// these emit into an object literal property name, we don't need to be worried /// about keywords, just non-identifier characters function emitAttributeName(name: Identifier) { - if (/[A-Za-z_]+[\w*]/.test(name.text)) { - write("\""); + if (/^[A-Za-z_]+[\w]*$/.test(name.text)) { emit(name); - write("\""); } else { + write("\""); emit(name); + write("\""); } } diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline index c796f8e78bc85..57b55c8a1f8e3 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline +++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline @@ -17,9 +17,9 @@ declare class Bar { EmitSkipped: false FileName : tests/cases/fourslash/inputFile2.js.map -{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,KAAC,IAAI,GAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js +{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,IAAC,IAAI,EAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js var y = "my div"; -var x = React.createElement("div", {"name": y}); +var x = React.createElement("div", {name: y}); //# sourceMappingURL=inputFile2.js.mapFileName : tests/cases/fourslash/inputFile2.d.ts declare var y: string; declare var x: any; diff --git a/tests/baselines/reference/keywordInJsxIdentifier.js b/tests/baselines/reference/keywordInJsxIdentifier.js index 677a79138e6ff..39f33449dadf3 100644 --- a/tests/baselines/reference/keywordInJsxIdentifier.js +++ b/tests/baselines/reference/keywordInJsxIdentifier.js @@ -9,6 +9,6 @@ declare var React: any; //// [keywordInJsxIdentifier.js] React.createElement("foo", {"class-id": true}); -React.createElement("foo", {"class": true}); +React.createElement("foo", {class: true}); React.createElement("foo", {"class-id": "1"}); -React.createElement("foo", {"class": "1"}); +React.createElement("foo", {class: "1"}); diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js index f8fe609609092..9968fa8d708e6 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.js +++ b/tests/baselines/reference/tsxExternalModuleEmit2.js @@ -20,6 +20,6 @@ declare var Foo, React; //// [app.js] var mod_1 = require('mod'); // Should see mod_1['default'] in emit here -React.createElement(Foo, {"handler": mod_1["default"]}); +React.createElement(Foo, {handler: mod_1["default"]}); // Should see mod_1['default'] in emit here React.createElement(Foo, React.__spread({}, mod_1["default"])); diff --git a/tests/baselines/reference/tsxReactEmit7.errors.txt b/tests/baselines/reference/tsxReactEmit7.errors.txt new file mode 100644 index 0000000000000..d2ab2f046e957 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit7.errors.txt @@ -0,0 +1,50 @@ +tests/cases/conformance/jsx/tsxReactEmit7.tsx(9,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(10,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(11,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(12,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(15,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(16,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(17,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(18,10): error TS2304: Cannot find name 'React'. +tests/cases/conformance/jsx/tsxReactEmit7.tsx(19,10): error TS2304: Cannot find name 'React'. + + +==== tests/cases/conformance/jsx/tsxReactEmit7.tsx (9 errors) ==== + + declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + + var m =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var n =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var o =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var p =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + + // Investigation + var a =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var b =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var c =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var d =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + var e =
; + ~~~ +!!! error TS2304: Cannot find name 'React'. + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit7.js b/tests/baselines/reference/tsxReactEmit7.js new file mode 100644 index 0000000000000..6340b321b9c1b --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit7.js @@ -0,0 +1,33 @@ +//// [tsxReactEmit7.tsx] + +declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } +} + +var m =
; +var n =
; +var o =
; +var p =
; + +// Investigation +var a =
; +var b =
; +var c =
; +var d =
; +var e =
; + + +//// [tsxReactEmit7.js] +var m = React.createElement("div", {"x-y": "val"}); +var n = React.createElement("div", {"xx-y": "val"}); +var o = React.createElement("div", {"x-yy": "val"}); +var p = React.createElement("div", {"xx-yy": "val"}); +// Investigation +var a = React.createElement("div", {x: "val"}); +var b = React.createElement("div", {xx: "val"}); +var c = React.createElement("div", {xxx: "val"}); +var d = React.createElement("div", {xxxx: "val"}); +var e = React.createElement("div", {xxxxx: "val"}); diff --git a/tests/cases/conformance/jsx/tsxReactEmit7.tsx b/tests/cases/conformance/jsx/tsxReactEmit7.tsx new file mode 100644 index 0000000000000..847a55d471947 --- /dev/null +++ b/tests/cases/conformance/jsx/tsxReactEmit7.tsx @@ -0,0 +1,22 @@ +//@jsx: react +//@module: commonjs + +//@filename: file.tsx +declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } +} + +var m =
; +var n =
; +var o =
; +var p =
; + +// Investigation +var a =
; +var b =
; +var c =
; +var d =
; +var e =
; From 3d9978f677162c22a0b4f5e94759e448c9b4199c Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Thu, 12 Nov 2015 10:38:04 -0500 Subject: [PATCH 210/353] Use https for badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e27e7a99fa7b1..13e1f3e4786c6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript) -[![npm version](https://badge.fury.io/js/typescript.svg)](http://badge.fury.io/js/typescript) -[![Downloads](http://img.shields.io/npm/dm/TypeScript.svg)](https://npmjs.org/package/typescript) +[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript) +[![Downloads](https://img.shields.io/npm/dm/TypeScript.svg)](https://www.npmjs.com/package/typescript) # TypeScript From 278b35b354913e81fd1ea6886684ecef6c5e99a1 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Thu, 12 Nov 2015 11:16:11 -0800 Subject: [PATCH 211/353] Adding test and comments. Override file content even if already opened. --- src/harness/fourslash.ts | 8 ++++---- src/harness/harnessLanguageService.ts | 8 ++++---- src/server/client.ts | 4 ++-- src/server/editorServices.ts | 3 +++ src/server/protocol.d.ts | 4 ++++ tests/cases/fourslash/fourslash.ts | 8 ++++---- tests/cases/fourslash/server/openFile.ts | 17 +++++++++++++++++ 7 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 tests/cases/fourslash/server/openFile.ts diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 1c8593a9e1294..545776ec08427 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -385,9 +385,9 @@ namespace FourSlash { } // Opens a file given its 0-based index or fileName - public openFile(index: number): void; - public openFile(name: string): void; - public openFile(indexOrName: any) { + public openFile(index: number, content?: string): void; + public openFile(name: string, content?: string): void; + public openFile(indexOrName: any, content?: string) { const fileToOpen: FourSlashFile = this.findFile(indexOrName); fileToOpen.fileName = ts.normalizeSlashes(fileToOpen.fileName); this.activeFile = fileToOpen; @@ -395,7 +395,7 @@ namespace FourSlash { this.scenarioActions.push(``); // Let the host know that this file is now open - this.languageServiceAdapterHost.openFile(fileToOpen.fileName); + this.languageServiceAdapterHost.openFile(fileToOpen.fileName, content); } public verifyErrorExistsBetweenMarkers(startMarkerName: string, endMarkerName: string, negative: boolean) { diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index faf0ad28eb526..0c267c38f14a6 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -153,7 +153,7 @@ namespace Harness.LanguageService { throw new Error("No script with name '" + fileName + "'"); } - public openFile(fileName: string): void { + public openFile(fileName: string, content?: string): void { } /** @@ -493,9 +493,9 @@ namespace Harness.LanguageService { this.client = client; } - openFile(fileName: string): void { - super.openFile(fileName); - this.client.openFile(fileName); + openFile(fileName: string, content?: string): void { + super.openFile(fileName, content); + this.client.openFile(fileName, content); } editScript(fileName: string, start: number, end: number, newText: string) { diff --git a/src/server/client.ts b/src/server/client.ts index ae234750d88da..08939b2b44aca 100644 --- a/src/server/client.ts +++ b/src/server/client.ts @@ -120,8 +120,8 @@ namespace ts.server { return response; } - openFile(fileName: string): void { - var args: protocol.FileRequestArgs = { file: fileName }; + openFile(fileName: string, content?: string): void { + var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content }; this.processRequest(CommandNames.Open, args); } diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 889c96b6c4ec8..795bd7db7321e 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1031,6 +1031,9 @@ namespace ts.server { } } if (info) { + if (fileContent) { + info.svc.reload(fileContent); + } if (openedByClient) { info.isOpen = true; } diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts index 6354a3a37aeb0..101c8207c9d33 100644 --- a/src/server/protocol.d.ts +++ b/src/server/protocol.d.ts @@ -513,6 +513,10 @@ declare namespace ts.server.protocol { * Information found in an "open" request. */ export interface OpenRequestArgs extends FileRequestArgs { + /** + * Used when a version of the file content is known to be more up to date than the one on disk. + * Then the known content will be used upon opening instead of the disk copy + */ fileContent?: string; } diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 41e8d9005f762..f6451e1f1c4cc 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -169,10 +169,10 @@ module FourSlashInterface { // Opens a file, given either its index as it // appears in the test source, or its filename // as specified in the test metadata - public file(index: number); - public file(name: string); - public file(indexOrName: any) { - FourSlash.currentTestState.openFile(indexOrName); + public file(index: number, content?: string); + public file(name: string, content?: string); + public file(indexOrName: any, content?: string) { + FourSlash.currentTestState.openFile(indexOrName, content); } } diff --git a/tests/cases/fourslash/server/openFile.ts b/tests/cases/fourslash/server/openFile.ts new file mode 100644 index 0000000000000..41d2bbe8e53dd --- /dev/null +++ b/tests/cases/fourslash/server/openFile.ts @@ -0,0 +1,17 @@ +/// + +// @Filename: test1.ts +////t. + +// @Filename: test.ts +////var t = '10'; + +// @Filename: tsconfig.json +////{ "files": ["test.ts", "test1.ts"] } + +var overridingContent = "var t = 10; t."; +debugger; +goTo.file("test.ts", overridingContent); +goTo.file("test1.ts"); +goTo.eof(); +verify.completionListContains("toExponential"); From a0549fa316d05bd79ab1bb97b32744b9748091a4 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Thu, 12 Nov 2015 11:33:44 -0800 Subject: [PATCH 212/353] Fix lint compliant --- src/server/protocol.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts index 101c8207c9d33..3a66975332382 100644 --- a/src/server/protocol.d.ts +++ b/src/server/protocol.d.ts @@ -516,7 +516,7 @@ declare namespace ts.server.protocol { /** * Used when a version of the file content is known to be more up to date than the one on disk. * Then the known content will be used upon opening instead of the disk copy - */ + */ fileContent?: string; } From fe9d73eb5bc08e752793f143c31c713c93ef85d0 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Thu, 12 Nov 2015 11:42:21 -0800 Subject: [PATCH 213/353] Remove debugger statement from test --- tests/cases/fourslash/server/openFile.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cases/fourslash/server/openFile.ts b/tests/cases/fourslash/server/openFile.ts index 41d2bbe8e53dd..320e52c9f5e1a 100644 --- a/tests/cases/fourslash/server/openFile.ts +++ b/tests/cases/fourslash/server/openFile.ts @@ -10,7 +10,6 @@ ////{ "files": ["test.ts", "test1.ts"] } var overridingContent = "var t = 10; t."; -debugger; goTo.file("test.ts", overridingContent); goTo.file("test1.ts"); goTo.eof(); From 1ed67f41ba568978ea66554810ca00b3e804198b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 12 Nov 2015 11:50:58 -0800 Subject: [PATCH 214/353] Removed the TODO as created bug for it --- src/compiler/program.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index efaeb825184fb..33a1267bf77a2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -932,7 +932,6 @@ namespace ts { diagnosticArgument = [fileName]; } else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd))) { - // (TODO: shkamat) Should this message be different given we support multiple extensions diagnostic = Diagnostics.File_0_not_found; fileName += ".ts"; diagnosticArgument = [fileName]; From 0b215404d107e64d5eda4628ef1f5f210cebf683 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 12 Nov 2015 13:23:53 -0800 Subject: [PATCH 215/353] Simplified logic of getting files if files werent suppplied in tscconfig.json Since we dont support arbitary list of extensions to treat as .js, it becomes easier to simplify code based on the assumptions --- src/compiler/commandLineParser.ts | 47 +++++++------------ src/compiler/core.ts | 4 +- ...eNameDtsNotSpecifiedWithAllowJs.errors.txt | 6 ++- ...ionSameNameDtsNotSpecifiedWithAllowJs.json | 3 +- ...eNameDtsNotSpecifiedWithAllowJs.errors.txt | 6 ++- ...ionSameNameDtsNotSpecifiedWithAllowJs.json | 3 +- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 3c3bb14174d37..5336b01bb1465 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -502,41 +502,30 @@ namespace ts { else { const filesSeen: Map = {}; const exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; - const extensionsByPriority = getSupportedExtensions(options); - for (let extensionsIndex = 0; extensionsIndex < extensionsByPriority.length; extensionsIndex++) { - const currentExtension = extensionsByPriority[extensionsIndex]; - const filesInDirWithExtension = host.readDirectory(basePath, currentExtension, exclude); - // Get list of conflicting extensions, conflicting extension is - // - extension that is lower priority than current extension and - // - extension also is current extension (ends with "." + currentExtension) - const conflictingExtensions: string[] = []; - for (let i = extensionsIndex + 1; i < extensionsByPriority.length; i++) { - const extension = extensionsByPriority[i]; // lower priority extension - if (fileExtensionIs(extension, currentExtension)) { // also has current extension - conflictingExtensions.push(extension); - } - } + const supportedExtensions = getSupportedExtensions(options); + Debug.assert(indexOf(supportedExtensions, ".ts") < indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick"); - // Add the files to fileNames list if the file is not any of conflicting extension + // Get files of supported extensions in their order of resolution + for (const extension of supportedExtensions) { + const filesInDirWithExtension = host.readDirectory(basePath, extension, exclude); for (const fileName of filesInDirWithExtension) { - let hasConflictingExtension = false; - for (const conflictingExtension of conflictingExtensions) { - // eg. 'f.d.ts' will match '.ts' extension but really should be process later with '.d.ts' files - if (fileExtensionIs(fileName, conflictingExtension)) { - hasConflictingExtension = true; - break; - } + // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension, + // lets pick them when its turn comes up + if (extension === ".ts" && fileExtensionIs(fileName, ".d.ts")) { + continue; } - if (!hasConflictingExtension) { - // Add the file only if there is no higher priority extension file already included - // eg. when a.d.ts and a.js are present in the folder, include only a.d.ts not a.js - const baseName = fileName.substr(0, fileName.length - currentExtension.length); - if (!hasProperty(filesSeen, baseName)) { - filesSeen[baseName] = true; - fileNames.push(fileName); + // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files) + // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation + if (extension === ".d.ts" || (options.allowJs && extension === ".js")) { + const baseName = fileName.substr(0, fileName.length - extension.length); + if (hasProperty(filesSeen, baseName + ".ts") || hasProperty(filesSeen, baseName + ".tsx")) { + continue; } } + + filesSeen[fileName] = true; + fileNames.push(fileName); } } } diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 5b0eedfc1f97d..b773cdfaf4537 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -297,8 +297,8 @@ namespace ts { return result; } - export function extend(first: Map, second: Map): Map { - const result: Map = {}; + export function extend, T2 extends Map<{}>>(first: T1 , second: T2): T1 & T2 { + const result: T1 & T2 = {}; for (const id in first) { (result as any)[id] = first[id]; } diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt index 8da5b629ca8c9..ac25edc1bd565 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -1,6 +1,10 @@ error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file. !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +!!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file. ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== - declare var a: number; \ No newline at end of file + declare var a: number; +==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ==== + var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json index 77e1f22703002..b4c3fb8f51bb6 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json @@ -6,7 +6,8 @@ "project": "SameNameDTsNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts" + "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts", + "SameNameDTsNotSpecifiedWithAllowJs/a.js" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt index 8da5b629ca8c9..ac25edc1bd565 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -1,6 +1,10 @@ error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file. !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. +!!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file. ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== - declare var a: number; \ No newline at end of file + declare var a: number; +==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ==== + var test1 = 10; // Shouldnt get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json index 77e1f22703002..b4c3fb8f51bb6 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.json @@ -6,7 +6,8 @@ "project": "SameNameDTsNotSpecifiedWithAllowJs", "resolvedInputFiles": [ "lib.d.ts", - "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts" + "SameNameDTsNotSpecifiedWithAllowJs/a.d.ts", + "SameNameDTsNotSpecifiedWithAllowJs/a.js" ], "emittedFiles": [] } \ No newline at end of file From f90ef92e7c566cb892dea28286f64177be8d2ab0 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 12 Nov 2015 13:37:03 -0800 Subject: [PATCH 216/353] Simplify regex a bit --- src/compiler/emitter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 372389f9c4a20..84d6f091039cc 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1592,7 +1592,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi /// these emit into an object literal property name, we don't need to be worried /// about keywords, just non-identifier characters function emitAttributeName(name: Identifier) { - if (/^[A-Za-z_]+[\w]*$/.test(name.text)) { + if (/^[A-Za-z_]\w*$/.test(name.text)) { emit(name); } else { From b24f8f35b762e6239454f4ab7431c2ab57086e43 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 14:09:51 -0800 Subject: [PATCH 217/353] go go go --- tests/cases/compiler/commonSourceDir3.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cases/compiler/commonSourceDir3.ts b/tests/cases/compiler/commonSourceDir3.ts index cc42eb8f26788..54b6e8c89b78a 100644 --- a/tests/cases/compiler/commonSourceDir3.ts +++ b/tests/cases/compiler/commonSourceDir3.ts @@ -1,3 +1,4 @@ +// @useCaseSensitiveFileNames: false // @outDir: A:/ // @Filename: A:/foo/bar.ts var x: number; From 986d8845029fa0eb9b52b61e270b7c87501ba25e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 12 Nov 2015 14:13:35 -0800 Subject: [PATCH 218/353] Test case for multiline spanning without return statement --- ...apValidationLambdaSpanningMultipleLines.js | 10 ++++ ...lidationLambdaSpanningMultipleLines.js.map | 2 + ...nLambdaSpanningMultipleLines.sourcemap.txt | 51 +++++++++++++++++++ ...idationLambdaSpanningMultipleLines.symbols | 8 +++ ...alidationLambdaSpanningMultipleLines.types | 10 ++++ ...apValidationLambdaSpanningMultipleLines.ts | 4 ++ 6 files changed, 85 insertions(+) create mode 100644 tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js create mode 100644 tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map create mode 100644 tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols create mode 100644 tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types create mode 100644 tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js new file mode 100644 index 0000000000000..ec6b5682edd62 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js @@ -0,0 +1,10 @@ +//// [sourceMapValidationLambdaSpanningMultipleLines.ts] +((item: string) => + item +) + +//// [sourceMapValidationLambdaSpanningMultipleLines.js] +(function (item) { + return item; +}); +//# sourceMappingURL=sourceMapValidationLambdaSpanningMultipleLines.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map new file mode 100644 index 0000000000000..4512ccf174833 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationLambdaSpanningMultipleLines.js.map] +{"version":3,"file":"sourceMapValidationLambdaSpanningMultipleLines.js","sourceRoot":"","sources":["sourceMapValidationLambdaSpanningMultipleLines.ts"],"names":[],"mappings":"AAAA,CAAC,UAAC,IAAY;WACV,IAAI;AAAJ,CAAI,CACP,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt new file mode 100644 index 0000000000000..0950e268b6e6a --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt @@ -0,0 +1,51 @@ +=================================================================== +JsFile: sourceMapValidationLambdaSpanningMultipleLines.js +mapUrl: sourceMapValidationLambdaSpanningMultipleLines.js.map +sourceRoot: +sources: sourceMapValidationLambdaSpanningMultipleLines.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.js +sourceFile:sourceMapValidationLambdaSpanningMultipleLines.ts +------------------------------------------------------------------- +>>>(function (item) { +1 > +2 >^ +3 > ^^^^^^^^^^ +4 > ^^^^ +5 > ^^-> +1 > +2 >( +3 > ( +4 > item: string +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 2) Source(1, 2) + SourceIndex(0) +3 >Emitted(1, 12) Source(1, 3) + SourceIndex(0) +4 >Emitted(1, 16) Source(1, 15) + SourceIndex(0) +--- +>>> return item; +1->^^^^^^^^^^^ +2 > ^^^^ +1->) => + > +2 > item +1->Emitted(2, 12) Source(2, 5) + SourceIndex(0) +2 >Emitted(2, 16) Source(2, 9) + SourceIndex(0) +--- +>>>}); +1 > +2 >^ +3 > ^ +4 > ^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >item +3 > + > ) +4 > +1 >Emitted(3, 1) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 2) Source(2, 9) + SourceIndex(0) +3 >Emitted(3, 3) Source(3, 2) + SourceIndex(0) +4 >Emitted(3, 4) Source(3, 2) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationLambdaSpanningMultipleLines.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols new file mode 100644 index 0000000000000..c7ff4ca9d9fb6 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.symbols @@ -0,0 +1,8 @@ +=== tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts === +((item: string) => +>item : Symbol(item, Decl(sourceMapValidationLambdaSpanningMultipleLines.ts, 0, 2)) + + item +>item : Symbol(item, Decl(sourceMapValidationLambdaSpanningMultipleLines.ts, 0, 2)) + +) diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types new file mode 100644 index 0000000000000..d39119cbd9126 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts === +((item: string) => +>((item: string) => item) : (item: string) => string +>(item: string) => item : (item: string) => string +>item : string + + item +>item : string + +) diff --git a/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts b/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts new file mode 100644 index 0000000000000..57ba843a69c23 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationLambdaSpanningMultipleLines.ts @@ -0,0 +1,4 @@ +// @sourcemap: true +((item: string) => + item +) \ No newline at end of file From 127a30e1517685cc6291bb1b83190393a146a7a7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 12 Nov 2015 14:15:33 -0800 Subject: [PATCH 219/353] Fix the sourcemap emit of lambda expression without return on another line Handles #5122 --- src/compiler/emitter.ts | 2 ++ ...eMapValidationLambdaSpanningMultipleLines.js.map | 2 +- ...idationLambdaSpanningMultipleLines.sourcemap.txt | 13 ++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d0314649b8884..a3c538c36aeb4 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5003,8 +5003,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi increaseIndent(); writeLine(); emitLeadingComments(node.body); + emitStart(body); write("return "); emit(body); + emitEnd(body); write(";"); emitTrailingComments(node.body); diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map index 4512ccf174833..c0151106e7c46 100644 --- a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationLambdaSpanningMultipleLines.js.map] -{"version":3,"file":"sourceMapValidationLambdaSpanningMultipleLines.js","sourceRoot":"","sources":["sourceMapValidationLambdaSpanningMultipleLines.ts"],"names":[],"mappings":"AAAA,CAAC,UAAC,IAAY;WACV,IAAI;AAAJ,CAAI,CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationLambdaSpanningMultipleLines.js","sourceRoot":"","sources":["sourceMapValidationLambdaSpanningMultipleLines.ts"],"names":[],"mappings":"AAAA,CAAC,UAAC,IAAY;IACV,OAAA,IAAI;AAAJ,CAAI,CACP,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt index 0950e268b6e6a..475aa1debeff2 100644 --- a/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationLambdaSpanningMultipleLines.sourcemap.txt @@ -24,13 +24,16 @@ sourceFile:sourceMapValidationLambdaSpanningMultipleLines.ts 4 >Emitted(1, 16) Source(1, 15) + SourceIndex(0) --- >>> return item; -1->^^^^^^^^^^^ -2 > ^^^^ +1->^^^^ +2 > ^^^^^^^ +3 > ^^^^ 1->) => > -2 > item -1->Emitted(2, 12) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 16) Source(2, 9) + SourceIndex(0) +2 > +3 > item +1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(2, 12) Source(2, 5) + SourceIndex(0) +3 >Emitted(2, 16) Source(2, 9) + SourceIndex(0) --- >>>}); 1 > From 3bdad8a6b04a181257818e37a4779a9bc3eb8031 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 12 Nov 2015 14:25:46 -0800 Subject: [PATCH 220/353] When excluding same base name file from compilation, check for all supported javascript extensions instead of just .js --- src/compiler/commandLineParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 5336b01bb1465..96b6bdeef9493 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -517,7 +517,7 @@ namespace ts { // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files) // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation - if (extension === ".d.ts" || (options.allowJs && extension === ".js")) { + if (extension === ".d.ts" || (options.allowJs && contains(supportedJavascriptExtensions, extension))) { const baseName = fileName.substr(0, fileName.length - extension.length); if (hasProperty(filesSeen, baseName + ".ts") || hasProperty(filesSeen, baseName + ".tsx")) { continue; From 5bcf8611210e5e988bb6317def16389a71b2074c Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 15:58:11 -0800 Subject: [PATCH 221/353] use relative path from current directory --- src/compiler/program.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 3981d5a2421f3..28c51ce2f3ad7 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -947,7 +947,9 @@ namespace ts { return currentDirectory; } - return getNormalizedPathFromPathComponents(commonPathComponents); + const path = getNormalizedPathFromPathComponents(commonPathComponents); + const relativePath = convertToRelativePath(path, currentDirectory, getCanonicalFileName); + return relativePath; } function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean { From ecd4435986be2e0e2ff9492ca524a2af7f2ebf02 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 16:22:35 -0800 Subject: [PATCH 222/353] Go all the way back to the original solution --- src/compiler/program.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 3fb432d9668b5..1f0096e7f6e30 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -910,7 +910,7 @@ namespace ts { return; } - const sourcePathComponents = getNormalizedPathComponents(getCanonicalFileName(sourceFile.fileName), currentDirectory); + const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory); sourcePathComponents.pop(); // The base file name is not part of the common directory path if (!commonPathComponents) { @@ -919,8 +919,9 @@ namespace ts { return; } + const caseSensitive = host.useCaseSensitiveFileNames(); for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) { - if (commonPathComponents[i] !== sourcePathComponents[i]) { + if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) { if (i === 0) { // Failed to find any common path component return true; @@ -947,9 +948,7 @@ namespace ts { return currentDirectory; } - const path = getNormalizedPathFromPathComponents(commonPathComponents); - const relativePath = convertToRelativePath(path, currentDirectory, getCanonicalFileName); - return relativePath; + return getNormalizedPathFromPathComponents(commonPathComponents); } function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean { From b31ac2e946ed661ac9e0ea0cf7a2ef43cfa30ac6 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 16:56:20 -0800 Subject: [PATCH 223/353] Add a handful of tests --- .../es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts | 3 +++ .../moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts | 3 +++ .../es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts | 3 +++ .../es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts create mode 100644 tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts create mode 100644 tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts create mode 100644 tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts diff --git a/tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts b/tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts new file mode 100644 index 0000000000000..ef0f2ffde177c --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts @@ -0,0 +1,3 @@ +// @target: ES6 +// @module: amd +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts b/tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts new file mode 100644 index 0000000000000..994f24df65879 --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts @@ -0,0 +1,3 @@ +// @target: ES6 +// @module: commonjs +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts b/tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts new file mode 100644 index 0000000000000..3764f2ec36c3d --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts @@ -0,0 +1,3 @@ +// @target: ES6 +// @module: system +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts b/tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts new file mode 100644 index 0000000000000..39784fc718823 --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts @@ -0,0 +1,3 @@ +// @target: ES6 +// @module: umd +export default class Foo {} From 57162e9b59c8126e4efc420f52b9666315086048 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 18:11:07 -0800 Subject: [PATCH 224/353] handful more tests --- .../decoratedDefaultExportsGetExportedAmd.ts | 7 +++++++ .../decoratedDefaultExportsGetExportedCommonjs.ts | 7 +++++++ .../decoratedDefaultExportsGetExportedSystem.ts | 7 +++++++ .../decoratedDefaultExportsGetExportedUmd.ts | 7 +++++++ 4 files changed, 28 insertions(+) create mode 100644 tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts create mode 100644 tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts create mode 100644 tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts create mode 100644 tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts diff --git a/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts b/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts new file mode 100644 index 0000000000000..3b51b80619ff8 --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts @@ -0,0 +1,7 @@ +// @target: ES6 +// @module: amd + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts b/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts new file mode 100644 index 0000000000000..3fc09a2eeb459 --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts @@ -0,0 +1,7 @@ +// @target: ES6 +// @module: commonjs + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts b/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts new file mode 100644 index 0000000000000..7957b78c805a5 --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts @@ -0,0 +1,7 @@ +// @target: ES6 +// @module: system + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} diff --git a/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts b/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts new file mode 100644 index 0000000000000..9dc63bec9c39a --- /dev/null +++ b/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts @@ -0,0 +1,7 @@ +// @target: ES6 +// @module: umd + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} From b5ac1eb0ae3bd240b297750ea32b6d5a2e9451c5 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 18:24:04 -0800 Subject: [PATCH 225/353] add decorator flag to tests --- .../moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts | 1 + .../decoratedDefaultExportsGetExportedCommonjs.ts | 1 + .../decoratedDefaultExportsGetExportedSystem.ts | 1 + .../moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts b/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts index 3b51b80619ff8..87fc8afd263b8 100644 --- a/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts +++ b/tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts @@ -1,4 +1,5 @@ // @target: ES6 +// @experimentalDecorators: true // @module: amd var decorator: ClassDecorator; diff --git a/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts b/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts index 3fc09a2eeb459..aefd07ffdb9bd 100644 --- a/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts +++ b/tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts @@ -1,4 +1,5 @@ // @target: ES6 +// @experimentalDecorators: true // @module: commonjs var decorator: ClassDecorator; diff --git a/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts b/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts index 7957b78c805a5..b871b3c7b35d9 100644 --- a/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts +++ b/tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts @@ -1,4 +1,5 @@ // @target: ES6 +// @experimentalDecorators: true // @module: system var decorator: ClassDecorator; diff --git a/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts b/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts index 9dc63bec9c39a..9b0a7d773ef88 100644 --- a/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts +++ b/tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts @@ -1,4 +1,5 @@ // @target: ES6 +// @experimentalDecorators: true // @module: umd var decorator: ClassDecorator; From e79253a07c2b913810d5042ed592c3cacaad2f69 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 18:27:47 -0800 Subject: [PATCH 226/353] fix handling of decorated default exports on es6 with nones6 modules --- src/compiler/emitter.ts | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 84d6f091039cc..ab9fe35b92fe5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5576,9 +5576,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitDecoratorsOfClass(node); } + if (!(node.flags & NodeFlags.Export)) { + return; + } // If this is an exported class, but not on the top level (i.e. on an internal // module), export it - if (!isES6ExportedDeclaration(node) && (node.flags & NodeFlags.Export)) { + if (node.parent.kind !== SyntaxKind.SourceFile) { writeLine(); emitStart(node); emitModuleMemberName(node); @@ -5587,12 +5590,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitEnd(node); write(";"); } - else if (isES6ExportedDeclaration(node) && (node.flags & NodeFlags.Default) && thisNodeIsDecorated) { + else if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default) && thisNodeIsDecorated) { // if this is a top level default export of decorated class, write the export after the declaration. - writeLine(); - write("export default "); - emitDeclarationName(node); - write(";"); + if (modulekind === ModuleKind.ES6) { + writeLine(); + write("export default "); + emitDeclarationName(node); + write(";"); + } + else if (modulekind === ModuleKind.System) { + writeLine(); + write(`${exportFunctionForFile}("default", `); + emitDeclarationName(node); + write(");"); + } + else { + writeLine(); + if (languageVersion === ScriptTarget.ES3) { + write(`exports["default"] = `); + } + else { + write(`exports.default = `); + } + emitDeclarationName(node); + write(";"); + } } } From 521a0a160c36eba85875817efb274c94dac58b87 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 19:03:52 -0800 Subject: [PATCH 227/353] Fix class exports with varrying module emits while targeting es6 --- src/compiler/emitter.ts | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ab9fe35b92fe5..323a5680ccce9 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5581,41 +5581,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } // If this is an exported class, but not on the top level (i.e. on an internal // module), export it - if (node.parent.kind !== SyntaxKind.SourceFile) { - writeLine(); - emitStart(node); - emitModuleMemberName(node); - write(" = "); - emitDeclarationName(node); - emitEnd(node); - write(";"); - } - else if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default) && thisNodeIsDecorated) { + if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default)) { // if this is a top level default export of decorated class, write the export after the declaration. - if (modulekind === ModuleKind.ES6) { - writeLine(); + writeLine(); + if (thisNodeIsDecorated && modulekind === ModuleKind.ES6) { write("export default "); emitDeclarationName(node); write(";"); } else if (modulekind === ModuleKind.System) { - writeLine(); write(`${exportFunctionForFile}("default", `); emitDeclarationName(node); write(");"); } - else { - writeLine(); - if (languageVersion === ScriptTarget.ES3) { - write(`exports["default"] = `); - } - else { - write(`exports.default = `); - } + else if (modulekind !== ModuleKind.ES6) { + write(`exports.default = `); emitDeclarationName(node); write(";"); } } + else if (node.parent.kind !== SyntaxKind.SourceFile || (modulekind !== ModuleKind.ES6 && !(node.flags & NodeFlags.Default))) { + writeLine(); + emitStart(node); + emitModuleMemberName(node); + write(" = "); + emitDeclarationName(node); + emitEnd(node); + write(";"); + } } function emitClassLikeDeclarationBelowES6(node: ClassLikeDeclaration) { From 36607b99b51a2d812ca96da24069756acce44375 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 12 Nov 2015 19:05:28 -0800 Subject: [PATCH 228/353] accept baselines for new tests --- .../decoratedDefaultExportsGetExportedAmd.js | 24 ++++++++++++++ ...oratedDefaultExportsGetExportedAmd.symbols | 12 +++++++ ...ecoratedDefaultExportsGetExportedAmd.types | 12 +++++++ ...oratedDefaultExportsGetExportedCommonjs.js | 22 +++++++++++++ ...dDefaultExportsGetExportedCommonjs.symbols | 12 +++++++ ...tedDefaultExportsGetExportedCommonjs.types | 12 +++++++ ...ecoratedDefaultExportsGetExportedSystem.js | 29 +++++++++++++++++ ...tedDefaultExportsGetExportedSystem.symbols | 12 +++++++ ...ratedDefaultExportsGetExportedSystem.types | 12 +++++++ .../decoratedDefaultExportsGetExportedUmd.js | 31 +++++++++++++++++++ ...oratedDefaultExportsGetExportedUmd.symbols | 12 +++++++ ...ecoratedDefaultExportsGetExportedUmd.types | 12 +++++++ .../reference/defaultExportsGetExportedAmd.js | 10 ++++++ .../defaultExportsGetExportedAmd.symbols | 4 +++ .../defaultExportsGetExportedAmd.types | 4 +++ .../defaultExportsGetExportedCommonjs.js | 8 +++++ .../defaultExportsGetExportedCommonjs.symbols | 4 +++ .../defaultExportsGetExportedCommonjs.types | 4 +++ .../defaultExportsGetExportedSystem.js | 16 ++++++++++ .../defaultExportsGetExportedSystem.symbols | 4 +++ .../defaultExportsGetExportedSystem.types | 4 +++ .../reference/defaultExportsGetExportedUmd.js | 17 ++++++++++ .../defaultExportsGetExportedUmd.symbols | 4 +++ .../defaultExportsGetExportedUmd.types | 4 +++ 24 files changed, 285 insertions(+) create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types create mode 100644 tests/baselines/reference/defaultExportsGetExportedAmd.js create mode 100644 tests/baselines/reference/defaultExportsGetExportedAmd.symbols create mode 100644 tests/baselines/reference/defaultExportsGetExportedAmd.types create mode 100644 tests/baselines/reference/defaultExportsGetExportedCommonjs.js create mode 100644 tests/baselines/reference/defaultExportsGetExportedCommonjs.symbols create mode 100644 tests/baselines/reference/defaultExportsGetExportedCommonjs.types create mode 100644 tests/baselines/reference/defaultExportsGetExportedSystem.js create mode 100644 tests/baselines/reference/defaultExportsGetExportedSystem.symbols create mode 100644 tests/baselines/reference/defaultExportsGetExportedSystem.types create mode 100644 tests/baselines/reference/defaultExportsGetExportedUmd.js create mode 100644 tests/baselines/reference/defaultExportsGetExportedUmd.symbols create mode 100644 tests/baselines/reference/defaultExportsGetExportedUmd.types diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js new file mode 100644 index 0000000000000..441d8b0d70a95 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -0,0 +1,24 @@ +//// [decoratedDefaultExportsGetExportedAmd.ts] + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} + + +//// [decoratedDefaultExportsGetExportedAmd.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +define(["require", "exports"], function (require, exports) { + var decorator; + let Foo = class { + }; + Foo = __decorate([ + decorator + ], Foo); + exports.default = Foo; +}); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols new file mode 100644 index 0000000000000..d8ff6716c38c5 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts === + +var decorator: ClassDecorator; +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedAmd.ts, 1, 3)) +>ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --)) + +@decorator +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedAmd.ts, 1, 3)) + +export default class Foo {} +>Foo : Symbol(Foo, Decl(decoratedDefaultExportsGetExportedAmd.ts, 1, 30)) + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types new file mode 100644 index 0000000000000..89df83ce76d05 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsAmd/decoratedDefaultExportsGetExportedAmd.ts === + +var decorator: ClassDecorator; +>decorator : (target: TFunction) => TFunction | void +>ClassDecorator : (target: TFunction) => TFunction | void + +@decorator +>decorator : (target: TFunction) => TFunction | void + +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js new file mode 100644 index 0000000000000..8818241c9b57f --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -0,0 +1,22 @@ +//// [decoratedDefaultExportsGetExportedCommonjs.ts] + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} + + +//// [decoratedDefaultExportsGetExportedCommonjs.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var decorator; +let Foo = class { +}; +Foo = __decorate([ + decorator +], Foo); +exports.default = Foo; diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols new file mode 100644 index 0000000000000..35131c1244e1b --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts === + +var decorator: ClassDecorator; +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedCommonjs.ts, 1, 3)) +>ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --)) + +@decorator +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedCommonjs.ts, 1, 3)) + +export default class Foo {} +>Foo : Symbol(Foo, Decl(decoratedDefaultExportsGetExportedCommonjs.ts, 1, 30)) + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types new file mode 100644 index 0000000000000..56c8926342a25 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsCommonjs/decoratedDefaultExportsGetExportedCommonjs.ts === + +var decorator: ClassDecorator; +>decorator : (target: TFunction) => TFunction | void +>ClassDecorator : (target: TFunction) => TFunction | void + +@decorator +>decorator : (target: TFunction) => TFunction | void + +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js new file mode 100644 index 0000000000000..1ae54560ae3a8 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js @@ -0,0 +1,29 @@ +//// [decoratedDefaultExportsGetExportedSystem.ts] + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} + + +//// [decoratedDefaultExportsGetExportedSystem.js] +System.register([], function(exports_1) { + var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; + }; + var decorator, Foo; + return { + setters:[], + execute: function() { + let Foo = class { + }; + Foo = __decorate([ + decorator + ], Foo); + exports_1("default", Foo); + } + } +}); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols new file mode 100644 index 0000000000000..106ea3cacd8a1 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts === + +var decorator: ClassDecorator; +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedSystem.ts, 1, 3)) +>ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --)) + +@decorator +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedSystem.ts, 1, 3)) + +export default class Foo {} +>Foo : Symbol(Foo, Decl(decoratedDefaultExportsGetExportedSystem.ts, 1, 30)) + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types new file mode 100644 index 0000000000000..c180f5fcf0940 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsSystem/decoratedDefaultExportsGetExportedSystem.ts === + +var decorator: ClassDecorator; +>decorator : (target: TFunction) => TFunction | void +>ClassDecorator : (target: TFunction) => TFunction | void + +@decorator +>decorator : (target: TFunction) => TFunction | void + +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js new file mode 100644 index 0000000000000..118af702fc11f --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -0,0 +1,31 @@ +//// [decoratedDefaultExportsGetExportedUmd.ts] + +var decorator: ClassDecorator; + +@decorator +export default class Foo {} + + +//// [decoratedDefaultExportsGetExportedUmd.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +(function (factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); if (v !== undefined) module.exports = v; + } + else if (typeof define === 'function' && define.amd) { + define(["require", "exports"], factory); + } +})(function (require, exports) { + var decorator; + let Foo = class { + }; + Foo = __decorate([ + decorator + ], Foo); + exports.default = Foo; +}); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols new file mode 100644 index 0000000000000..f4a8266cfa157 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts === + +var decorator: ClassDecorator; +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedUmd.ts, 1, 3)) +>ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --)) + +@decorator +>decorator : Symbol(decorator, Decl(decoratedDefaultExportsGetExportedUmd.ts, 1, 3)) + +export default class Foo {} +>Foo : Symbol(Foo, Decl(decoratedDefaultExportsGetExportedUmd.ts, 1, 30)) + diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types new file mode 100644 index 0000000000000..a258a600ba0f0 --- /dev/null +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/es6/moduleExportsUmd/decoratedDefaultExportsGetExportedUmd.ts === + +var decorator: ClassDecorator; +>decorator : (target: TFunction) => TFunction | void +>ClassDecorator : (target: TFunction) => TFunction | void + +@decorator +>decorator : (target: TFunction) => TFunction | void + +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js new file mode 100644 index 0000000000000..4eba3ba960039 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js @@ -0,0 +1,10 @@ +//// [defaultExportsGetExportedAmd.ts] +export default class Foo {} + + +//// [defaultExportsGetExportedAmd.js] +define(["require", "exports"], function (require, exports) { + class Foo { + } + exports.default = Foo; +}); diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.symbols b/tests/baselines/reference/defaultExportsGetExportedAmd.symbols new file mode 100644 index 0000000000000..22376f91b08f9 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts === +export default class Foo {} +>Foo : Symbol(Foo, Decl(defaultExportsGetExportedAmd.ts, 0, 0)) + diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.types b/tests/baselines/reference/defaultExportsGetExportedAmd.types new file mode 100644 index 0000000000000..94e511dbef682 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsAmd/defaultExportsGetExportedAmd.ts === +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js new file mode 100644 index 0000000000000..a19b99fe9d319 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js @@ -0,0 +1,8 @@ +//// [defaultExportsGetExportedCommonjs.ts] +export default class Foo {} + + +//// [defaultExportsGetExportedCommonjs.js] +class Foo { +} +exports.default = Foo; diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.symbols b/tests/baselines/reference/defaultExportsGetExportedCommonjs.symbols new file mode 100644 index 0000000000000..a5be95f1787c1 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts === +export default class Foo {} +>Foo : Symbol(Foo, Decl(defaultExportsGetExportedCommonjs.ts, 0, 0)) + diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.types b/tests/baselines/reference/defaultExportsGetExportedCommonjs.types new file mode 100644 index 0000000000000..d7034ffa03d46 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs.ts === +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.js b/tests/baselines/reference/defaultExportsGetExportedSystem.js new file mode 100644 index 0000000000000..1f1a7c9dea6fc --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedSystem.js @@ -0,0 +1,16 @@ +//// [defaultExportsGetExportedSystem.ts] +export default class Foo {} + + +//// [defaultExportsGetExportedSystem.js] +System.register([], function(exports_1) { + var Foo; + return { + setters:[], + execute: function() { + class Foo { + } + exports_1("default", Foo); + } + } +}); diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.symbols b/tests/baselines/reference/defaultExportsGetExportedSystem.symbols new file mode 100644 index 0000000000000..9050833680e51 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedSystem.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts === +export default class Foo {} +>Foo : Symbol(Foo, Decl(defaultExportsGetExportedSystem.ts, 0, 0)) + diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.types b/tests/baselines/reference/defaultExportsGetExportedSystem.types new file mode 100644 index 0000000000000..d1439f0f99d45 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedSystem.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsSystem/defaultExportsGetExportedSystem.ts === +export default class Foo {} +>Foo : Foo + diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js new file mode 100644 index 0000000000000..ed3639ace55d1 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js @@ -0,0 +1,17 @@ +//// [defaultExportsGetExportedUmd.ts] +export default class Foo {} + + +//// [defaultExportsGetExportedUmd.js] +(function (factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); if (v !== undefined) module.exports = v; + } + else if (typeof define === 'function' && define.amd) { + define(["require", "exports"], factory); + } +})(function (require, exports) { + class Foo { + } + exports.default = Foo; +}); diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.symbols b/tests/baselines/reference/defaultExportsGetExportedUmd.symbols new file mode 100644 index 0000000000000..9c59f10e6e04b --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts === +export default class Foo {} +>Foo : Symbol(Foo, Decl(defaultExportsGetExportedUmd.ts, 0, 0)) + diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.types b/tests/baselines/reference/defaultExportsGetExportedUmd.types new file mode 100644 index 0000000000000..ed5f4b7f709c0 --- /dev/null +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/es6/moduleExportsUmd/defaultExportsGetExportedUmd.ts === +export default class Foo {} +>Foo : Foo + From 346253a0d520e24083ab013d247b986cc9b63db9 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 11:13:10 -0800 Subject: [PATCH 229/353] test, first pass at a fix --- src/compiler/checker.ts | 4 +++ .../typeGuards/typeGuardTypeOfUndefined.ts | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ec91b255ae685..6f5a3e67d0a57 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -200,6 +200,10 @@ namespace ts { "symbol": { type: esSymbolType, flags: TypeFlags.ESSymbol + }, + "undefined": { + type: undefinedType, + flags: TypeFlags.ContainsUndefinedOrNull } }; diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts new file mode 100644 index 0000000000000..5061244914563 --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts @@ -0,0 +1,28 @@ +// undefined type guard adds no new type information +function test1(a: any) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + } +} + +function test2(a: any) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + } +} + +function test3(a: any) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } +} + +function test4(a: any) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } +} From b93feb87be769e0fed76b825e2df51b772ad115c Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 13 Nov 2015 11:14:51 -0800 Subject: [PATCH 230/353] cleanup test harness code --- src/harness/compilerRunner.ts | 41 ++++---- src/harness/fourslash.ts | 33 ++++-- src/harness/harness.ts | 182 +++++++++++++--------------------- src/harness/projectsRunner.ts | 2 +- src/harness/rwcRunner.ts | 24 +++-- src/harness/test262Runner.ts | 24 +++-- 6 files changed, 141 insertions(+), 165 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 848f229f109c0..d46d0bde08c18 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -49,7 +49,7 @@ class CompilerBaselineRunner extends RunnerBase { let testCaseContent: { settings: Harness.TestCaseParser.CompilerSettings; testUnitData: Harness.TestCaseParser.TestUnitData[]; }; let units: Harness.TestCaseParser.TestUnitData[]; - let tcSettings: Harness.TestCaseParser.CompilerSettings; + let harnessSettings: Harness.TestCaseParser.CompilerSettings; let lastUnit: Harness.TestCaseParser.TestUnitData; let rootDir: string; @@ -58,46 +58,43 @@ class CompilerBaselineRunner extends RunnerBase { let program: ts.Program; let options: ts.CompilerOptions; // equivalent to the files that will be passed on the command line - let toBeCompiled: { unitName: string; content: string }[]; + let toBeCompiled: Harness.Compiler.TestFile[]; // equivalent to other files on the file system not directly passed to the compiler (ie things that are referenced by other files) - let otherFiles: { unitName: string; content: string }[]; - let harnessCompiler: Harness.Compiler.HarnessCompiler; + let otherFiles: Harness.Compiler.TestFile[]; before(() => { justName = fileName.replace(/^.*[\\\/]/, ""); // strips the fileName from the path. content = Harness.IO.readFile(fileName); testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); units = testCaseContent.testUnitData; - tcSettings = testCaseContent.settings; + harnessSettings = testCaseContent.settings; lastUnit = units[units.length - 1]; rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; - harnessCompiler = Harness.Compiler.getCompiler(); // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test) // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references, // otherwise, assume all files are just meant to be in the same compilation session without explicit references to one another. toBeCompiled = []; otherFiles = []; if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) { - toBeCompiled.push({ unitName: rootDir + lastUnit.name, content: lastUnit.content }); + toBeCompiled.push({ unitName: ts.combinePaths(rootDir, lastUnit.name), content: lastUnit.content }); units.forEach(unit => { if (unit.name !== lastUnit.name) { - otherFiles.push({ unitName: rootDir + unit.name, content: unit.content }); + otherFiles.push({ unitName: ts.combinePaths(rootDir, unit.name), content: unit.content }); } }); } else { toBeCompiled = units.map(unit => { - return { unitName: rootDir + unit.name, content: unit.content }; + return { unitName: ts.combinePaths(rootDir, unit.name), content: unit.content }; }); } - options = harnessCompiler.compileFiles(toBeCompiled, otherFiles, function (compileResult, _program) { - result = compileResult; - // The program will be used by typeWriter - program = _program; - }, function (settings) { - harnessCompiler.setCompilerSettings(tcSettings); - }); + const output = Harness.Compiler.HarnessCompiler.compileFiles( + toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined); + + options = output.options; + result = output.result; + program = output.program; }); after(() => { @@ -107,7 +104,7 @@ class CompilerBaselineRunner extends RunnerBase { content = undefined; testCaseContent = undefined; units = undefined; - tcSettings = undefined; + harnessSettings = undefined; lastUnit = undefined; rootDir = undefined; result = undefined; @@ -115,14 +112,13 @@ class CompilerBaselineRunner extends RunnerBase { options = undefined; toBeCompiled = undefined; otherFiles = undefined; - harnessCompiler = undefined; }); function getByteOrderMarkText(file: Harness.Compiler.GeneratedFile): string { return file.writeByteOrderMark ? "\u00EF\u00BB\u00BF" : ""; } - function getErrorBaseline(toBeCompiled: { unitName: string; content: string }[], otherFiles: { unitName: string; content: string }[], result: Harness.Compiler.CompilerResult) { + function getErrorBaseline(toBeCompiled: Harness.Compiler.TestFile[], otherFiles: Harness.Compiler.TestFile[], result: Harness.Compiler.CompilerResult) { return Harness.Compiler.getErrorBaseline(toBeCompiled.concat(otherFiles), result.errors); } @@ -184,9 +180,9 @@ class CompilerBaselineRunner extends RunnerBase { } } - const declFileCompilationResult = harnessCompiler.compileDeclarationFiles(toBeCompiled, otherFiles, result, function (settings) { - harnessCompiler.setCompilerSettings(tcSettings); - }, options); + const declFileCompilationResult = + Harness.Compiler.HarnessCompiler.compileDeclarationFiles( + toBeCompiled, otherFiles, result, harnessSettings, options, /* currentDirectory */ undefined); if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) { jsCode += "\r\n\r\n//// [DtsFileErrors]\r\n"; @@ -367,7 +363,6 @@ class CompilerBaselineRunner extends RunnerBase { public initializeTests() { describe(this.testSuiteName + " tests", () => { describe("Setup compiler for compiler baselines", () => { - const harnessCompiler = Harness.Compiler.getCompiler(); this.parseOptions(); }); diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 1c8593a9e1294..23aadb532416f 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2383,10 +2383,16 @@ namespace FourSlash { // here we cache the JS output and reuse it for every test. let fourslashJsOutput: string; { - const host = Harness.Compiler.createCompilerHost([{ unitName: Harness.Compiler.fourslashFileName, content: undefined }], + const fourslashFile: Harness.Compiler.TestFileWithPath = { + unitName: Harness.Compiler.fourslashFileName, + content: undefined, + path: ts.toPath(Harness.Compiler.fourslashFileName, Harness.IO.getCurrentDirectory(), Harness.Compiler.getCanonicalFileName) + }; + const host = Harness.Compiler.createCompilerHost([fourslashFile], (fn, contents) => fourslashJsOutput = contents, ts.ScriptTarget.Latest, - Harness.IO.useCaseSensitiveFileNames()); + Harness.IO.useCaseSensitiveFileNames(), + Harness.IO.getCurrentDirectory()); const program = ts.createProgram([Harness.Compiler.fourslashFileName], { noResolve: true, target: ts.ScriptTarget.ES3 }, host); @@ -2400,15 +2406,28 @@ namespace FourSlash { currentTestState = new TestState(basePath, testType, testData); + const currentDirectory = Harness.IO.getCurrentDirectory(); + const useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames(); + const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); + let result = ""; + const fourslashFile: Harness.Compiler.TestFileWithPath = { + unitName: Harness.Compiler.fourslashFileName, + content: undefined, + path: ts.toPath(Harness.Compiler.fourslashFileName, currentDirectory, getCanonicalFileName) + }; + const testFile: Harness.Compiler.TestFileWithPath = { + unitName: fileName, + content: content, + path: ts.toPath(fileName, currentDirectory, getCanonicalFileName) + }; + const host = Harness.Compiler.createCompilerHost( - [ - { unitName: Harness.Compiler.fourslashFileName, content: undefined }, - { unitName: fileName, content: content } - ], + [ fourslashFile, testFile ], (fn, contents) => result = contents, ts.ScriptTarget.Latest, - Harness.IO.useCaseSensitiveFileNames()); + useCaseSensitiveFileNames, + currentDirectory); const program = ts.createProgram([Harness.Compiler.fourslashFileName, fileName], { outFile: "fourslashTestOutput.js", noResolve: true, target: ts.ScriptTarget.ES3 }, host); diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 16c3b2d34885f..468517b68f78c 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -903,41 +903,34 @@ namespace Harness { } export function createCompilerHost( - inputFiles: { unitName: string; content: string; }[], + inputFiles: TestFileWithPath[], writeFile: (fn: string, contents: string, writeByteOrderMark: boolean) => void, scriptTarget: ts.ScriptTarget, useCaseSensitiveFileNames: boolean, // the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host - currentDirectory?: string, + currentDirectory: string, newLineKind?: ts.NewLineKind): ts.CompilerHost { // Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames - function getCanonicalFileName(fileName: string): string { - return useCaseSensitiveFileNames ? fileName : fileName.toLowerCase(); - } + const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); - const filemap: { [fileName: string]: ts.SourceFile; } = {}; - const getCurrentDirectory = currentDirectory === undefined ? Harness.IO.getCurrentDirectory : () => currentDirectory; + const fileMap: ts.FileMap = ts.createFileMap(); // Register input files - function register(file: { unitName: string; content: string; }) { + function register(file: TestFileWithPath) { if (file.content !== undefined) { const fileName = ts.normalizePath(file.unitName); const sourceFile = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget); - filemap[getCanonicalFileName(fileName)] = sourceFile; - filemap[getCanonicalFileName(ts.getNormalizedAbsolutePath(fileName, getCurrentDirectory()))] = sourceFile; + fileMap.set(file.path, sourceFile); } }; inputFiles.forEach(register); function getSourceFile(fn: string, languageVersion: ts.ScriptTarget) { fn = ts.normalizePath(fn); - if (Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(fn))) { - return filemap[getCanonicalFileName(fn)]; - } - else if (currentDirectory) { - const canonicalAbsolutePath = getCanonicalFileName(ts.getNormalizedAbsolutePath(fn, currentDirectory)); - return Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(canonicalAbsolutePath)) ? filemap[canonicalAbsolutePath] : undefined; + const path = ts.toPath(fn, currentDirectory, getCanonicalFileName); + if (fileMap.contains(path)) { + return fileMap.get(path); } else if (fn === fourslashFileName) { const tsFn = "tests/cases/fourslash/" + fourslashFileName; @@ -959,7 +952,7 @@ namespace Harness { Harness.IO.newLine(); return { - getCurrentDirectory, + getCurrentDirectory: () => currentDirectory, getSourceFile, getDefaultLibFileName: options => defaultLibFileName, writeFile, @@ -1034,95 +1027,74 @@ namespace Harness { } } - export class HarnessCompiler { - private inputFiles: { unitName: string; content: string }[] = []; - private compileOptions: ts.CompilerOptions; - private settings: Harness.TestCaseParser.CompilerSettings = {}; - - private lastErrors: ts.Diagnostic[]; - - public reset() { - this.inputFiles = []; - this.settings = {}; - this.lastErrors = []; - } - - public reportCompilationErrors() { - return this.lastErrors; - } - - public setCompilerSettings(tcSettings: Harness.TestCaseParser.CompilerSettings) { - this.settings = tcSettings; - } - - public addInputFiles(files: { unitName: string; content: string }[]) { - files.forEach(file => this.addInputFile(file)); - } - - public addInputFile(file: { unitName: string; content: string }) { - this.inputFiles.push(file); - } - - public setCompilerOptions(options?: ts.CompilerOptions) { - this.compileOptions = options || { noResolve: false }; - } - - public emitAll(ioHost?: IEmitterIOHost) { - this.compileFiles(this.inputFiles, - /*otherFiles*/ [], - /*onComplete*/ result => { - result.files.forEach(writeFile); - result.declFilesCode.forEach(writeFile); - result.sourceMaps.forEach(writeFile); - }, - /*settingsCallback*/ () => { }, - this.compileOptions); + export interface TestFile { + unitName: string; + content: string; + } + export interface TestFileWithPath extends TestFile { + path: ts.Path; + } - function writeFile(file: GeneratedFile) { - ioHost.writeFile(file.fileName, file.code, false); - } - } + export interface CompilationOutput { + result: CompilerResult; + program: ts.Program; + options: ts.CompilerOptions & HarnessOptions; + } - public compileFiles(inputFiles: { unitName: string; content: string }[], - otherFiles: { unitName: string; content: string }[], - onComplete: (result: CompilerResult, program: ts.Program) => void, - settingsCallback?: (settings: ts.CompilerOptions) => void, - options?: ts.CompilerOptions & HarnessOptions, + export namespace HarnessCompiler { + export function compileFiles( + inputFiles: TestFile[], + otherFiles: TestFile[], + harnessSettings: TestCaseParser.CompilerSettings, + compilerOptions: ts.CompilerOptions, // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file - currentDirectory?: string) { + currentDirectory: string): CompilationOutput { - options = options || { noResolve: false }; + const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false }; options.target = options.target || ts.ScriptTarget.ES3; options.module = options.module || ts.ModuleKind.None; options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed; options.noErrorTruncation = true; options.skipDefaultLibCheck = true; - if (settingsCallback) { - settingsCallback(null); - } - const newLine = "\r\n"; + currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory(); // Parse settings - setCompilerOptionsFromHarnessSetting(this.settings, options); + let useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames(); + if (harnessSettings) { + setCompilerOptionsFromHarnessSetting(harnessSettings, options); + } + if (options.useCaseSensitiveFileNames !== undefined) { + useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; + } + const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); + const inputFilesWiithPath = inputFiles.map(f => { + return { unitName: f.unitName, content: f.content, path: ts.toPath(f.unitName, currentDirectory, getCanonicalFileName) }; + }); + const otherFilesWithPath = otherFiles.map(f => { + return { unitName: f.unitName, content: f.content, path: ts.toPath(f.unitName, currentDirectory, getCanonicalFileName) }; + }); // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. // Treat them as library files, so include them in build, but not in baselines. - const includeBuiltFiles: { unitName: string; content: string }[] = []; + const includeBuiltFiles: TestFileWithPath[] = []; if (options.includeBuiltFile) { const builtFileName = libFolder + options.includeBuiltFile; - includeBuiltFiles.push({ unitName: builtFileName, content: normalizeLineEndings(IO.readFile(builtFileName), newLine) }); + const builtFile: TestFileWithPath = { + unitName: builtFileName, + content: normalizeLineEndings(IO.readFile(builtFileName), newLine), + path: ts.toPath(builtFileName, currentDirectory, getCanonicalFileName) + }; + includeBuiltFiles.push(builtFile); } - const useCaseSensitiveFileNames = options.useCaseSensitiveFileNames !== undefined ? options.useCaseSensitiveFileNames : Harness.IO.useCaseSensitiveFileNames(); - const fileOutputs: GeneratedFile[] = []; const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName); const compilerHost = createCompilerHost( - inputFiles.concat(includeBuiltFiles).concat(otherFiles), + inputFilesWiithPath.concat(includeBuiltFiles).concat(otherFilesWithPath), (fn, contents, writeByteOrderMark) => fileOutputs.push({ fileName: fn, code: contents, writeByteOrderMark: writeByteOrderMark }), options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine); const program = ts.createProgram(programFiles, options, compilerHost); @@ -1130,40 +1102,35 @@ namespace Harness { const emitResult = program.emit(); const errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics); - this.lastErrors = errors; const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps); - onComplete(result, program); - - return options; + return { result, program, options }; } - public compileDeclarationFiles(inputFiles: { unitName: string; content: string; }[], - otherFiles: { unitName: string; content: string; }[], + export function compileDeclarationFiles(inputFiles: TestFile[], + otherFiles: TestFile[], result: CompilerResult, - settingsCallback?: (settings: ts.CompilerOptions) => void, - options?: ts.CompilerOptions, + harnessSettings: TestCaseParser.CompilerSettings & HarnessOptions, + options: ts.CompilerOptions, // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file - currentDirectory?: string) { + currentDirectory: string) { if (options.declaration && result.errors.length === 0 && result.declFilesCode.length !== result.files.length) { throw new Error("There were no errors and declFiles generated did not match number of js files generated"); } - const declInputFiles: { unitName: string; content: string }[] = []; - const declOtherFiles: { unitName: string; content: string }[] = []; - let declResult: Harness.Compiler.CompilerResult; + const declInputFiles: TestFile[] = []; + const declOtherFiles: TestFile[] = []; // if the .d.ts is non-empty, confirm it compiles correctly as well if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) { ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles)); ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles)); - this.compileFiles(declInputFiles, declOtherFiles, function (compileResult) { declResult = compileResult; }, - settingsCallback, options, currentDirectory); + const output = this.compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory); - return { declInputFiles, declOtherFiles, declResult }; + return { declInputFiles, declOtherFiles, declResult: output.result }; } - function addDtsFile(file: { unitName: string; content: string }, dtsFiles: { unitName: string; content: string }[]) { + function addDtsFile(file: TestFile, dtsFiles: TestFile[]) { if (isDTS(file.unitName)) { dtsFiles.push(file); } @@ -1200,7 +1167,7 @@ namespace Harness { return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); } - function findUnit(fileName: string, units: { unitName: string; content: string; }[]) { + function findUnit(fileName: string, units: TestFile[]) { return ts.forEach(units, unit => unit.unitName === fileName ? unit : undefined); } } @@ -1230,7 +1197,7 @@ namespace Harness { return errorOutput; } - export function getErrorBaseline(inputFiles: { unitName: string; content: string }[], diagnostics: ts.Diagnostic[]) { + export function getErrorBaseline(inputFiles: TestFile[], diagnostics: ts.Diagnostic[]) { diagnostics.sort(ts.compareDiagnostics); const outputLines: string[] = []; // Count up all errors that were found in files other than lib.d.ts so we don't miss any @@ -1371,16 +1338,6 @@ namespace Harness { } } - /** The harness' compiler instance used when tests are actually run. Reseting or changing settings of this compiler instance must be done within a test case (i.e., describe/it) */ - let harnessCompiler: HarnessCompiler; - - /** Returns the singleton harness compiler instance for generating and running tests. - If required a fresh compiler instance will be created, otherwise the existing singleton will be re-used. - */ - export function getCompiler() { - return harnessCompiler = harnessCompiler || new HarnessCompiler(); - } - // This does not need to exist strictly speaking, but many tests will need to be updated if it's removed export function compileString(code: string, unitName: string, callback: (result: CompilerResult) => void) { // NEWTODO: Re-implement 'compileString' @@ -1711,12 +1668,9 @@ namespace Harness { return filePath.indexOf(Harness.libFolder) === 0; } - export function getDefaultLibraryFile(io: Harness.IO): { unitName: string, content: string } { + export function getDefaultLibraryFile(io: Harness.IO): Harness.Compiler.TestFile { const libFile = Harness.userSpecifiedRoot + Harness.libFolder + "lib.d.ts"; - return { - unitName: libFile, - content: io.readFile(libFile) - }; + return { unitName: libFile, content: io.readFile(libFile) }; } if (Error) (Error).stackTraceLimit = 1; diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index f48822f122024..dc6cbfac646af 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -349,7 +349,7 @@ class ProjectRunner extends RunnerBase { const inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(), sourceFile => sourceFile.fileName !== "lib.d.ts"), sourceFile => { - return { unitName: RunnerBase.removeFullPaths(sourceFile.fileName), content: sourceFile.text }; + return { unitName: RunnerBase.removeFullPaths(sourceFile.fileName), content: sourceFile.text, }; }); return Harness.Compiler.getErrorBaseline(inputFiles, compilerResult.errors); diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts index a350eda08f327..fc1397b294c70 100644 --- a/src/harness/rwcRunner.ts +++ b/src/harness/rwcRunner.ts @@ -27,8 +27,8 @@ namespace RWC { export function runRWCTest(jsonPath: string) { describe("Testing a RWC project: " + jsonPath, () => { - let inputFiles: { unitName: string; content: string; }[] = []; - let otherFiles: { unitName: string; content: string; }[] = []; + let inputFiles: Harness.Compiler.TestFile[] = []; + let otherFiles: Harness.Compiler.TestFile[] = []; let compilerResult: Harness.Compiler.CompilerResult; let compilerOptions: ts.CompilerOptions; let baselineOpts: Harness.Baseline.BaselineOptions = { @@ -55,7 +55,6 @@ namespace RWC { }); it("can compile", () => { - const harnessCompiler = Harness.Compiler.getCompiler(); let opts: ts.ParsedCommandLine; const ioLog: IOLog = JSON.parse(Harness.IO.readFile(jsonPath)); @@ -71,8 +70,6 @@ namespace RWC { }); runWithIOLog(ioLog, oldIO => { - harnessCompiler.reset(); - let fileNames = opts.fileNames; const tsconfigFile = ts.forEach(ioLog.filesRead, f => isTsConfigFile(f) ? f : undefined); @@ -128,17 +125,21 @@ namespace RWC { opts.options.noLib = true; // Emit the results - compilerOptions = harnessCompiler.compileFiles( + compilerOptions = null; + const output = Harness.Compiler.HarnessCompiler.compileFiles( inputFiles, otherFiles, - newCompilerResults => { compilerResult = newCompilerResults; }, - /*settingsCallback*/ undefined, opts.options, + /* harnessOptions */ undefined, + opts.options, // Since each RWC json file specifies its current directory in its json file, we need // to pass this information in explicitly instead of acquiring it from the process. currentDirectory); + + compilerOptions = output.options; + compilerResult = output.result; }); - function getHarnessCompilerInputUnit(fileName: string) { + function getHarnessCompilerInputUnit(fileName: string): Harness.Compiler.TestFile { const unitName = ts.normalizeSlashes(Harness.IO.resolvePath(fileName)); let content: string = null; try { @@ -201,8 +202,9 @@ namespace RWC { it("has the expected errors in generated declaration files", () => { if (compilerOptions.declaration && !compilerResult.errors.length) { Harness.Baseline.runBaseline("has the expected errors in generated declaration files", baseName + ".dts.errors.txt", () => { - const declFileCompilationResult = Harness.Compiler.getCompiler().compileDeclarationFiles(inputFiles, otherFiles, compilerResult, - /*settingscallback*/ undefined, compilerOptions, currentDirectory); + const declFileCompilationResult = Harness.Compiler.HarnessCompiler.compileDeclarationFiles( + inputFiles, otherFiles, compilerResult, /*harnessSettings*/ undefined, compilerOptions, currentDirectory); + if (declFileCompilationResult.declResult.errors.length === 0) { return null; } diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts index f25e0c79b63c9..859f10dc4cc9b 100644 --- a/src/harness/test262Runner.ts +++ b/src/harness/test262Runner.ts @@ -5,9 +5,9 @@ class Test262BaselineRunner extends RunnerBase { private static basePath = "internal/cases/test262"; private static helpersFilePath = "tests/cases/test262-harness/helpers.d.ts"; - private static helperFile = { + private static helperFile: Harness.Compiler.TestFile = { unitName: Test262BaselineRunner.helpersFilePath, - content: Harness.IO.readFile(Test262BaselineRunner.helpersFilePath) + content: Harness.IO.readFile(Test262BaselineRunner.helpersFilePath), }; private static testFileExtensionRegex = /\.js$/; private static options: ts.CompilerOptions = { @@ -31,7 +31,7 @@ class Test262BaselineRunner extends RunnerBase { let testState: { filename: string; compilerResult: Harness.Compiler.CompilerResult; - inputFiles: { unitName: string; content: string }[]; + inputFiles: Harness.Compiler.TestFile[]; program: ts.Program; }; @@ -40,8 +40,9 @@ class Test262BaselineRunner extends RunnerBase { const testFilename = ts.removeFileExtension(filePath).replace(/\//g, "_") + ".test"; const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, testFilename); - const inputFiles = testCaseContent.testUnitData.map(unit => { - return { unitName: Test262BaselineRunner.getTestFilePath(unit.name), content: unit.content }; + const inputFiles: Harness.Compiler.TestFile[] = testCaseContent.testUnitData.map(unit => { + const unitName = Test262BaselineRunner.getTestFilePath(unit.name); + return { unitName, content: unit.content }; }); // Emit the results @@ -52,10 +53,15 @@ class Test262BaselineRunner extends RunnerBase { program: undefined, }; - Harness.Compiler.getCompiler().compileFiles([Test262BaselineRunner.helperFile].concat(inputFiles), /*otherFiles*/ [], (compilerResult, program) => { - testState.compilerResult = compilerResult; - testState.program = program; - }, /*settingsCallback*/ undefined, Test262BaselineRunner.options); + const output = Harness.Compiler.HarnessCompiler.compileFiles( + [Test262BaselineRunner.helperFile].concat(inputFiles), + /*otherFiles*/ [], + /* harnessOptions */ undefined, + Test262BaselineRunner.options, + /* currentDirectory */ undefined + ); + testState.compilerResult = output.result; + testState.program = output.program; }); after(() => { From 581f52a7ea72fbce77adfa432cf4cd2a3f983729 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 13:33:54 -0800 Subject: [PATCH 231/353] exhaustive tests --- .../typeGuards/typeGuardTypeOfUndefined.ts | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts index 5061244914563..766c5ed8ca21f 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts @@ -4,6 +4,12 @@ function test1(a: any) { if (typeof a === "boolean") { a; } + else { + a; + } + } + else { + a; } } @@ -12,6 +18,12 @@ function test2(a: any) { if (typeof a === "boolean") { a; } + else { + a; + } + } + else { + a; } } @@ -19,10 +31,154 @@ function test3(a: any) { if (typeof a === "undefined" || typeof a === "boolean") { a; } + else { + a; + } } function test4(a: any) { if (typeof a !== "undefined" && typeof a === "boolean") { a; } + else { + a; + } +} + +function test5(a: boolean | void) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test6(a: boolean | void) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test7(a: boolean | void) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test8(a: boolean | void) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test9(a: boolean | number) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test10(a: boolean | number) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test11(a: boolean | number) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test12(a: boolean | number) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test13(a: boolean | number | void) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test14(a: boolean | number | void) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test15(a: boolean | number | void) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test16(a: boolean | number | void) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } } From 16d80ebe715e06e20b226d083b492a973e52c4cb Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 14:08:26 -0800 Subject: [PATCH 232/353] ignore undefined type guards --- src/compiler/checker.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6f5a3e67d0a57..0a5525edaafb1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6479,6 +6479,10 @@ namespace ts { assumeTrue = !assumeTrue; } const typeInfo = primitiveTypeInfo[right.text]; + // Don't narrow `undefined` + if (typeInfo && typeInfo.type === undefinedType) { + return type; + } // If the type to be narrowed is any and we're checking a primitive with assumeTrue=true, return the primitive if (!!(type.flags & TypeFlags.Any) && typeInfo && assumeTrue) { return typeInfo.type; From d7ddcc47563aa8f2024b8a81b0bd5f830c42483d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 14:09:13 -0800 Subject: [PATCH 233/353] accept baselines for new test --- .../reference/typeGuardTypeOfUndefined.js | 357 ++++++++++++++ .../typeGuardTypeOfUndefined.symbols | 330 +++++++++++++ .../reference/typeGuardTypeOfUndefined.types | 434 ++++++++++++++++++ 3 files changed, 1121 insertions(+) create mode 100644 tests/baselines/reference/typeGuardTypeOfUndefined.js create mode 100644 tests/baselines/reference/typeGuardTypeOfUndefined.symbols create mode 100644 tests/baselines/reference/typeGuardTypeOfUndefined.types diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.js b/tests/baselines/reference/typeGuardTypeOfUndefined.js new file mode 100644 index 0000000000000..a24ff2ec0dc01 --- /dev/null +++ b/tests/baselines/reference/typeGuardTypeOfUndefined.js @@ -0,0 +1,357 @@ +//// [typeGuardTypeOfUndefined.ts] +// undefined type guard adds no new type information +function test1(a: any) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test2(a: any) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test3(a: any) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test4(a: any) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test5(a: boolean | void) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test6(a: boolean | void) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test7(a: boolean | void) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test8(a: boolean | void) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test9(a: boolean | number) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test10(a: boolean | number) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test11(a: boolean | number) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test12(a: boolean | number) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test13(a: boolean | number | void) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test14(a: boolean | number | void) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} + +function test15(a: boolean | number | void) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} + +function test16(a: boolean | number | void) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} + + +//// [typeGuardTypeOfUndefined.js] +// undefined type guard adds no new type information +function test1(a) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test2(a) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test3(a) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} +function test4(a) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} +function test5(a) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test6(a) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test7(a) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} +function test8(a) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} +function test9(a) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test10(a) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test11(a) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} +function test12(a) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} +function test13(a) { + if (typeof a !== "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test14(a) { + if (typeof a === "undefined") { + if (typeof a === "boolean") { + a; + } + else { + a; + } + } + else { + a; + } +} +function test15(a) { + if (typeof a === "undefined" || typeof a === "boolean") { + a; + } + else { + a; + } +} +function test16(a) { + if (typeof a !== "undefined" && typeof a === "boolean") { + a; + } + else { + a; + } +} diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.symbols b/tests/baselines/reference/typeGuardTypeOfUndefined.symbols new file mode 100644 index 0000000000000..d6d36223fe462 --- /dev/null +++ b/tests/baselines/reference/typeGuardTypeOfUndefined.symbols @@ -0,0 +1,330 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts === +// undefined type guard adds no new type information +function test1(a: any) { +>test1 : Symbol(test1, Decl(typeGuardTypeOfUndefined.ts, 0, 0)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + + if (typeof a !== "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 1, 15)) + } +} + +function test2(a: any) { +>test2 : Symbol(test2, Decl(typeGuardTypeOfUndefined.ts, 13, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + + if (typeof a === "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 15, 15)) + } +} + +function test3(a: any) { +>test3 : Symbol(test3, Decl(typeGuardTypeOfUndefined.ts, 27, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15)) + + if (typeof a === "undefined" || typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 29, 15)) + } +} + +function test4(a: any) { +>test4 : Symbol(test4, Decl(typeGuardTypeOfUndefined.ts, 36, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15)) + + if (typeof a !== "undefined" && typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 38, 15)) + } +} + +function test5(a: boolean | void) { +>test5 : Symbol(test5, Decl(typeGuardTypeOfUndefined.ts, 45, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + + if (typeof a !== "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 47, 15)) + } +} + +function test6(a: boolean | void) { +>test6 : Symbol(test6, Decl(typeGuardTypeOfUndefined.ts, 59, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + + if (typeof a === "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 61, 15)) + } +} + +function test7(a: boolean | void) { +>test7 : Symbol(test7, Decl(typeGuardTypeOfUndefined.ts, 73, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15)) + + if (typeof a === "undefined" || typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 75, 15)) + } +} + +function test8(a: boolean | void) { +>test8 : Symbol(test8, Decl(typeGuardTypeOfUndefined.ts, 82, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15)) + + if (typeof a !== "undefined" && typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 84, 15)) + } +} + +function test9(a: boolean | number) { +>test9 : Symbol(test9, Decl(typeGuardTypeOfUndefined.ts, 91, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + + if (typeof a !== "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 93, 15)) + } +} + +function test10(a: boolean | number) { +>test10 : Symbol(test10, Decl(typeGuardTypeOfUndefined.ts, 105, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + + if (typeof a === "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 107, 16)) + } +} + +function test11(a: boolean | number) { +>test11 : Symbol(test11, Decl(typeGuardTypeOfUndefined.ts, 119, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16)) + + if (typeof a === "undefined" || typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 121, 16)) + } +} + +function test12(a: boolean | number) { +>test12 : Symbol(test12, Decl(typeGuardTypeOfUndefined.ts, 128, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16)) + + if (typeof a !== "undefined" && typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 130, 16)) + } +} + +function test13(a: boolean | number | void) { +>test13 : Symbol(test13, Decl(typeGuardTypeOfUndefined.ts, 137, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + + if (typeof a !== "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 139, 16)) + } +} + +function test14(a: boolean | number | void) { +>test14 : Symbol(test14, Decl(typeGuardTypeOfUndefined.ts, 151, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + + if (typeof a === "undefined") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + + if (typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + } + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 153, 16)) + } +} + +function test15(a: boolean | number | void) { +>test15 : Symbol(test15, Decl(typeGuardTypeOfUndefined.ts, 165, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16)) + + if (typeof a === "undefined" || typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 167, 16)) + } +} + +function test16(a: boolean | number | void) { +>test16 : Symbol(test16, Decl(typeGuardTypeOfUndefined.ts, 174, 1)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16)) + + if (typeof a !== "undefined" && typeof a === "boolean") { +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16)) +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16)) + + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16)) + } + else { + a; +>a : Symbol(a, Decl(typeGuardTypeOfUndefined.ts, 176, 16)) + } +} + diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.types b/tests/baselines/reference/typeGuardTypeOfUndefined.types new file mode 100644 index 0000000000000..6cf57e1a1ddce --- /dev/null +++ b/tests/baselines/reference/typeGuardTypeOfUndefined.types @@ -0,0 +1,434 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardTypeOfUndefined.ts === +// undefined type guard adds no new type information +function test1(a: any) { +>test1 : (a: any) => void +>a : any + + if (typeof a !== "undefined") { +>typeof a !== "undefined" : boolean +>typeof a : string +>a : any +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : any +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : any + } + } + else { + a; +>a : any + } +} + +function test2(a: any) { +>test2 : (a: any) => void +>a : any + + if (typeof a === "undefined") { +>typeof a === "undefined" : boolean +>typeof a : string +>a : any +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : any +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : any + } + } + else { + a; +>a : any + } +} + +function test3(a: any) { +>test3 : (a: any) => void +>a : any + + if (typeof a === "undefined" || typeof a === "boolean") { +>typeof a === "undefined" || typeof a === "boolean" : boolean +>typeof a === "undefined" : boolean +>typeof a : string +>a : any +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : any +>"boolean" : string + + a; +>a : any + } + else { + a; +>a : any + } +} + +function test4(a: any) { +>test4 : (a: any) => void +>a : any + + if (typeof a !== "undefined" && typeof a === "boolean") { +>typeof a !== "undefined" && typeof a === "boolean" : boolean +>typeof a !== "undefined" : boolean +>typeof a : string +>a : any +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : any +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : any + } +} + +function test5(a: boolean | void) { +>test5 : (a: boolean | void) => void +>a : boolean | void + + if (typeof a !== "undefined") { +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | void +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : void + } + } + else { + a; +>a : boolean | void + } +} + +function test6(a: boolean | void) { +>test6 : (a: boolean | void) => void +>a : boolean | void + + if (typeof a === "undefined") { +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | void +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : void + } + } + else { + a; +>a : boolean | void + } +} + +function test7(a: boolean | void) { +>test7 : (a: boolean | void) => void +>a : boolean | void + + if (typeof a === "undefined" || typeof a === "boolean") { +>typeof a === "undefined" || typeof a === "boolean" : boolean +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | void +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | void +>"boolean" : string + + a; +>a : boolean | void + } + else { + a; +>a : void + } +} + +function test8(a: boolean | void) { +>test8 : (a: boolean | void) => void +>a : boolean | void + + if (typeof a !== "undefined" && typeof a === "boolean") { +>typeof a !== "undefined" && typeof a === "boolean" : boolean +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | void +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : boolean | void + } +} + +function test9(a: boolean | number) { +>test9 : (a: boolean | number) => void +>a : boolean | number + + if (typeof a !== "undefined") { +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | number +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : number + } + } + else { + a; +>a : boolean | number + } +} + +function test10(a: boolean | number) { +>test10 : (a: boolean | number) => void +>a : boolean | number + + if (typeof a === "undefined") { +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | number +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : number + } + } + else { + a; +>a : boolean | number + } +} + +function test11(a: boolean | number) { +>test11 : (a: boolean | number) => void +>a : boolean | number + + if (typeof a === "undefined" || typeof a === "boolean") { +>typeof a === "undefined" || typeof a === "boolean" : boolean +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | number +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number +>"boolean" : string + + a; +>a : boolean | number + } + else { + a; +>a : number + } +} + +function test12(a: boolean | number) { +>test12 : (a: boolean | number) => void +>a : boolean | number + + if (typeof a !== "undefined" && typeof a === "boolean") { +>typeof a !== "undefined" && typeof a === "boolean" : boolean +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | number +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : boolean | number + } +} + +function test13(a: boolean | number | void) { +>test13 : (a: boolean | number | void) => void +>a : boolean | number | void + + if (typeof a !== "undefined") { +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | number | void +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : number | void + } + } + else { + a; +>a : boolean | number | void + } +} + +function test14(a: boolean | number | void) { +>test14 : (a: boolean | number | void) => void +>a : boolean | number | void + + if (typeof a === "undefined") { +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | number | void +>"undefined" : string + + if (typeof a === "boolean") { +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : number | void + } + } + else { + a; +>a : boolean | number | void + } +} + +function test15(a: boolean | number | void) { +>test15 : (a: boolean | number | void) => void +>a : boolean | number | void + + if (typeof a === "undefined" || typeof a === "boolean") { +>typeof a === "undefined" || typeof a === "boolean" : boolean +>typeof a === "undefined" : boolean +>typeof a : string +>a : boolean | number | void +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number | void +>"boolean" : string + + a; +>a : boolean | number | void + } + else { + a; +>a : number | void + } +} + +function test16(a: boolean | number | void) { +>test16 : (a: boolean | number | void) => void +>a : boolean | number | void + + if (typeof a !== "undefined" && typeof a === "boolean") { +>typeof a !== "undefined" && typeof a === "boolean" : boolean +>typeof a !== "undefined" : boolean +>typeof a : string +>a : boolean | number | void +>"undefined" : string +>typeof a === "boolean" : boolean +>typeof a : string +>a : boolean | number | void +>"boolean" : string + + a; +>a : boolean + } + else { + a; +>a : boolean | number | void + } +} + From 732fff225bd988fdaa3c6b420bfdd12041141f4f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 14:12:11 -0800 Subject: [PATCH 234/353] use common source directory for module paths --- src/compiler/utilities.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index ed7242a785ec3..1fffaf79332b3 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1867,7 +1867,7 @@ namespace ts { * Resolves a local path to a path which is absolute to the base of the emit */ export function getExternalModuleNameFromPath(host: EmitHost, fileName: string): string { - const dir = host.getCurrentDirectory(); + const dir = host.getCommonSourceDirectory(); const relativePath = getRelativePathToDirectoryOrUrl(dir, fileName, dir, f => host.getCanonicalFileName(f), /*isAbsolutePathAnUrl*/ false); return removeFileExtension(relativePath); } From 07626cbe895308c6154d44352fe3b26cf01248fc Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 13 Nov 2015 14:26:48 -0800 Subject: [PATCH 235/353] do not crash if overloads cannot be merged under one symbol --- src/compiler/checker.ts | 12 ++++--- ...edStaticAndInstanceClassMembers.errors.txt | 27 +++++++++++++++ .../mixedStaticAndInstanceClassMembers.js | 34 +++++++++++++++++++ ...nMergedDeclarationsAndOverloads.errors.txt | 23 +++++++++++++ .../nonMergedDeclarationsAndOverloads.js | 19 +++++++++++ .../mixedStaticAndInstanceClassMembers.ts | 15 ++++++++ .../nonMergedDeclarationsAndOverloads.ts | 8 +++++ 7 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt create mode 100644 tests/baselines/reference/mixedStaticAndInstanceClassMembers.js create mode 100644 tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt create mode 100644 tests/baselines/reference/nonMergedDeclarationsAndOverloads.js create mode 100644 tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts create mode 100644 tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ec91b255ae685..ec62d80ed59c1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11352,11 +11352,15 @@ namespace ts { const errorNode: Node = (subsequentNode).name || subsequentNode; // TODO(jfreeman): These are methods, so handle computed name case if (node.name && (subsequentNode).name && (node.name).text === ((subsequentNode).name).text) { - // the only situation when this is possible (same kind\same name but different symbol) - mixed static and instance class members Debug.assert(node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature); - Debug.assert((node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static)); - const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; - error(errorNode, diagnostic); + // we can get here in two cases + // 1. mixed static and instance class members + // 2. something with the same name was defined before the set of overloads that prevents them from merging + // here we'll report error only for the first case since for second we should already report error in binder + if ((node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static)) { + const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; + error(errorNode, diagnostic); + } return; } else if (nodeIsPresent((subsequentNode).body)) { diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt new file mode 100644 index 0000000000000..d52b17a58a034 --- /dev/null +++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.errors.txt @@ -0,0 +1,27 @@ +tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(4,5): error TS2387: Function overload must be static. +tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(12,12): error TS2388: Function overload must not be static. +tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts(13,5): error TS2387: Function overload must be static. + + +==== tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts (3 errors) ==== + class A { + f() {} + static m1 (a: string): void; + m1 (a: number): void; + ~~ +!!! error TS2387: Function overload must be static. + m1 (a: any): void { + } + } + + class B { + f() {} + m1 (a: string): void; + static m1 (a: number): void; + ~~ +!!! error TS2388: Function overload must not be static. + m1 (a: any): void { + ~~ +!!! error TS2387: Function overload must be static. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js new file mode 100644 index 0000000000000..427bbf65aa19b --- /dev/null +++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js @@ -0,0 +1,34 @@ +//// [mixedStaticAndInstanceClassMembers.ts] +class A { + f() {} + static m1 (a: string): void; + m1 (a: number): void; + m1 (a: any): void { + } +} + +class B { + f() {} + m1 (a: string): void; + static m1 (a: number): void; + m1 (a: any): void { + } +} + +//// [mixedStaticAndInstanceClassMembers.js] +var A = (function () { + function A() { + } + A.prototype.f = function () { }; + A.prototype.m1 = function (a) { + }; + return A; +})(); +var B = (function () { + function B() { + } + B.prototype.f = function () { }; + B.prototype.m1 = function (a) { + }; + return B; +})(); diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt new file mode 100644 index 0000000000000..252cd6880d47c --- /dev/null +++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(2,5): error TS2300: Duplicate identifier 'm1'. +tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(4,5): error TS2300: Duplicate identifier 'm1'. +tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(5,5): error TS2300: Duplicate identifier 'm1'. +tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts(6,5): error TS2300: Duplicate identifier 'm1'. + + +==== tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts (4 errors) ==== + class A { + m1: string; + ~~ +!!! error TS2300: Duplicate identifier 'm1'. + f() {} + m1 (a: string): void; + ~~ +!!! error TS2300: Duplicate identifier 'm1'. + m1 (a: number): void; + ~~ +!!! error TS2300: Duplicate identifier 'm1'. + m1 (a: any): void { + ~~ +!!! error TS2300: Duplicate identifier 'm1'. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js new file mode 100644 index 0000000000000..3ca6a96351523 --- /dev/null +++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js @@ -0,0 +1,19 @@ +//// [nonMergedDeclarationsAndOverloads.ts] +class A { + m1: string; + f() {} + m1 (a: string): void; + m1 (a: number): void; + m1 (a: any): void { + } +} + +//// [nonMergedDeclarationsAndOverloads.js] +var A = (function () { + function A() { + } + A.prototype.f = function () { }; + A.prototype.m1 = function (a) { + }; + return A; +})(); diff --git a/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts b/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts new file mode 100644 index 0000000000000..6395813b65892 --- /dev/null +++ b/tests/cases/compiler/mixedStaticAndInstanceClassMembers.ts @@ -0,0 +1,15 @@ +class A { + f() {} + static m1 (a: string): void; + m1 (a: number): void; + m1 (a: any): void { + } +} + +class B { + f() {} + m1 (a: string): void; + static m1 (a: number): void; + m1 (a: any): void { + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts b/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts new file mode 100644 index 0000000000000..6ec4c6076f22a --- /dev/null +++ b/tests/cases/compiler/nonMergedDeclarationsAndOverloads.ts @@ -0,0 +1,8 @@ +class A { + m1: string; + f() {} + m1 (a: string): void; + m1 (a: number): void; + m1 (a: any): void { + } +} \ No newline at end of file From 0482afdc1ecb70e981a9d81fac2321bf8174a500 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 13 Nov 2015 14:28:40 -0800 Subject: [PATCH 236/353] Load only typescript files if resolving from node modules --- src/compiler/program.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 459252a9a8fe1..1d3894ee186e7 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -65,7 +65,7 @@ namespace ts { : { resolvedModule: undefined, failedLookupLocations }; } else { - return loadModuleFromNodeModules(moduleName, containingDirectory, supportedExtensions, host); + return loadModuleFromNodeModules(moduleName, containingDirectory, host); } } @@ -114,7 +114,7 @@ namespace ts { return loadNodeModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host); } - function loadModuleFromNodeModules(moduleName: string, directory: string, supportedExtensions: string[], host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const failedLookupLocations: string[] = []; directory = normalizeSlashes(directory); while (true) { @@ -122,12 +122,13 @@ namespace ts { if (baseName !== "node_modules") { const nodeModulesFolder = combinePaths(directory, "node_modules"); const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName)); - let result = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + // Load only typescript files irrespective of allowJs option if loading from node modules + let result = loadNodeModuleFromFile(supportedTypeScriptExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } - result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } From 7e69f014f37c9c9d807ba492baf85f26fcabbe5d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 14:41:09 -0800 Subject: [PATCH 237/353] Always compute a common source directory for a program --- src/compiler/program.ts | 19 ++++++++----------- src/compiler/utilities.ts | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index ca0c7d9adaa77..7074dbd45c18d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -329,7 +329,6 @@ namespace ts { let fileProcessingDiagnostics = createDiagnosticCollection(); const programDiagnostics = createDiagnosticCollection(); - let commonSourceDirectory: string; let diagnosticsProducingTypeChecker: TypeChecker; let noDiagnosticsTypeChecker: TypeChecker; let classifiableNames: Map; @@ -374,6 +373,8 @@ namespace ts { } } + // _Always_ compute a common source directory + let commonSourceDirectory = computeCommonSourceDirectory(files); verifyCompilerOptions(); // unconditionally set oldProgram to undefined to prevent it from being captured in closure @@ -1056,17 +1057,13 @@ namespace ts { // If a rootDir is specified and is valid use it as the commonSourceDirectory commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory); } - else { - // Compute the commonSourceDirectory from the input files - commonSourceDirectory = computeCommonSourceDirectory(files); - } + } - if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { - // Make sure directory path ends with directory separator so this string can directly - // used to replace with "" to get the relative path of the source file and the relative path doesn't - // start with / making it rooted path - commonSourceDirectory += directorySeparator; - } + if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { + // Make sure directory path ends with directory separator so this string can directly + // used to replace with "" to get the relative path of the source file and the relative path doesn't + // start with / making it rooted path + commonSourceDirectory += directorySeparator; } if (options.noEmit) { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 1fffaf79332b3..dc5d9db30bcf0 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1867,7 +1867,7 @@ namespace ts { * Resolves a local path to a path which is absolute to the base of the emit */ export function getExternalModuleNameFromPath(host: EmitHost, fileName: string): string { - const dir = host.getCommonSourceDirectory(); + const dir = toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), f => host.getCanonicalFileName(f)); const relativePath = getRelativePathToDirectoryOrUrl(dir, fileName, dir, f => host.getCanonicalFileName(f), /*isAbsolutePathAnUrl*/ false); return removeFileExtension(relativePath); } From 5b29a7e9d9d0d2c82cf980b2c4a4befaa7010ea8 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 14:41:49 -0800 Subject: [PATCH 238/353] accept corrected projects baselines --- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 ------------------- .../amd/bin/test.js | 6 ++-- ...MultifolderSpecifyOutputFile.sourcemap.txt | 6 ++-- .../node/bin/test.d.ts | 4 +-- 35 files changed, 69 insertions(+), 321 deletions(-) delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 25cd156c4ab29..e76de4f44f70e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 4462b142d9804..a6e6ece1e9e02 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 8b1094335619f..bd620fe66b895 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 47e1835365a19..98e1a2211cb94 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: ../projects/outputdir_module_multifolder/ref/m1.ts,../projects/outputdi emittedFile:bin/test.js sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 0734d350e1117..0b83e26b91f17 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 5805c876be804..1a2de1cd877c5 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts,fil emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 0734d350e1117..0b83e26b91f17 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 20a9789039979..e9f5746232cfe 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 0814424ca390d..be6fc11314610 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 994e21ca0326d..052e4455dba29 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 8c710d9c4da3e..631f29953c1c9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 994e21ca0326d..052e4455dba29 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 43c4340ba370b..2499da34f4f1f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 994e21ca0326d..052e4455dba29 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6c8bdf4da742c..8ea4710f7ffde 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 994e21ca0326d..052e4455dba29 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,4 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,7 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { } exports.m1_f1 = m1_f1; }); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -26,7 +26,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio } exports.m2_f1 = m2_f1; }); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index d2331ef357941..36c3893e3a42f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- ->>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -174,7 +174,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); ->>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>>define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); ->>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>>define("test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index 9b6af66589aff..b4be78a74af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -1,4 +1,4 @@ -declare module "ref/m1" { +declare module "outputdir_module_multifolder/ref/m1" { export var m1_a1: number; export class m1_c1 { m1_c1_p1: number; @@ -6,7 +6,7 @@ declare module "ref/m1" { export var m1_instance1: m1_c1; export function m1_f1(): m1_c1; } -declare module "../outputdir_module_multifolder_ref/m2" { +declare module "outputdir_module_multifolder_ref/m2" { export var m2_a1: number; export class m2_c1 { m2_c1_p1: number; From 50aab7a05fc79ba29116b19311bca10e112675dd Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 13 Nov 2015 15:10:16 -0800 Subject: [PATCH 239/353] fix typo --- src/harness/harness.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 468517b68f78c..aa70087ea3118 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1069,7 +1069,7 @@ namespace Harness { useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; } const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); - const inputFilesWiithPath = inputFiles.map(f => { + const inputFilesWithPath = inputFiles.map(f => { return { unitName: f.unitName, content: f.content, path: ts.toPath(f.unitName, currentDirectory, getCanonicalFileName) }; }); const otherFilesWithPath = otherFiles.map(f => { @@ -1094,7 +1094,7 @@ namespace Harness { const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName); const compilerHost = createCompilerHost( - inputFilesWiithPath.concat(includeBuiltFiles).concat(otherFilesWithPath), + inputFilesWithPath.concat(includeBuiltFiles).concat(otherFilesWithPath), (fn, contents, writeByteOrderMark) => fileOutputs.push({ fileName: fn, code: contents, writeByteOrderMark: writeByteOrderMark }), options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine); const program = ts.createProgram(programFiles, options, compilerHost); From cb1724bd44a0f1e8b9200547297bc1837a35f8bf Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 15:26:38 -0800 Subject: [PATCH 240/353] in declaration emit, handle = require (again) --- src/compiler/declarationEmitter.ts | 2 +- src/compiler/emitter.ts | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 669cbcbcf0cde..b531302d01b17 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -680,7 +680,7 @@ namespace ts { } else { write("require("); - writeTextOfNode(currentText, getExternalModuleImportEqualsDeclarationExpression(node)); + emitExternalModuleSpecifier(getExternalModuleImportEqualsDeclarationExpression(node)); write(");"); } writer.writeLine(); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 2ea8c81c7e241..a483fe29cff3e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6804,7 +6804,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function getExternalModuleNameText(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string { + function getExternalModuleNameText(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, emitRelativePathAsModuleName: boolean): string { + if (emitRelativePathAsModuleName) { + const name = getExternalModuleNameFromDeclaration(host, resolver, importNode); + if (name) { + return `"${name}"`; + } + } const moduleName = getExternalModuleName(importNode); if (moduleName.kind === SyntaxKind.StringLiteral) { return tryRenameExternalModule(moduleName) || getLiteralText(moduleName); @@ -7364,7 +7370,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi const dependencyGroups: DependencyGroup[] = []; for (let i = 0; i < externalImports.length; ++i) { - let text = getExternalModuleNameText(externalImports[i]); + const text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName); if (hasProperty(groupIndices, text)) { // deduplicate/group entries in dependency list by the dependency name const groupIndex = groupIndices[text]; @@ -7380,12 +7386,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(", "); } - if (emitRelativePathAsModuleName) { - const name = getExternalModuleNameFromDeclaration(host, resolver, externalImports[i]); - if (name) { - text = `"${name}"`; - } - } write(text); } write(`], function(${exportFunctionForFile}) {`); @@ -7428,14 +7428,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi for (const importNode of externalImports) { // Find the name of the external module - let externalModuleName = getExternalModuleNameText(importNode); - - if (emitRelativePathAsModuleName) { - const name = getExternalModuleNameFromDeclaration(host, resolver, importNode); - if (name) { - externalModuleName = `"${name}"`; - } - } + const externalModuleName = getExternalModuleNameText(importNode, emitRelativePathAsModuleName); // Find the name of the module alias, if there is one const importAliasName = getLocalNameForExternalImport(importNode); From 78e7804668a6d6f442eca0b113deb30695a8fef8 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 15:46:48 -0800 Subject: [PATCH 241/353] handle things more rightly --- src/compiler/declarationEmitter.ts | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index b531302d01b17..79bee2a3b750b 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -680,7 +680,7 @@ namespace ts { } else { write("require("); - emitExternalModuleSpecifier(getExternalModuleImportEqualsDeclarationExpression(node)); + emitExternalModuleSpecifier(node); write(");"); } writer.writeLine(); @@ -737,14 +737,23 @@ namespace ts { } write(" from "); } - emitExternalModuleSpecifier(node.moduleSpecifier); + emitExternalModuleSpecifier(node); write(";"); writer.writeLine(); } - function emitExternalModuleSpecifier(moduleSpecifier: Expression) { + function emitExternalModuleSpecifier(parent: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration) { + let moduleSpecifier: Node; + if (parent.kind === SyntaxKind.ImportEqualsDeclaration) { + const node = parent as ImportEqualsDeclaration; + moduleSpecifier = getExternalModuleImportEqualsDeclarationExpression(node); + } + else { + const node = parent as (ImportDeclaration | ExportDeclaration); + moduleSpecifier = node.moduleSpecifier; + } if (moduleSpecifier.kind === SyntaxKind.StringLiteral && (!root) && (compilerOptions.out || compilerOptions.outFile)) { - const moduleName = getExternalModuleNameFromDeclaration(host, resolver, moduleSpecifier.parent as (ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration)); + const moduleName = getExternalModuleNameFromDeclaration(host, resolver, parent); if (moduleName) { write("\""); write(moduleName); @@ -787,7 +796,7 @@ namespace ts { } if (node.moduleSpecifier) { write(" from "); - emitExternalModuleSpecifier(node.moduleSpecifier); + emitExternalModuleSpecifier(node); } write(";"); writer.writeLine(); From 13faf2ccf415963b0d86c42f7a55c9a44a160039 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 15:47:19 -0800 Subject: [PATCH 242/353] get projects dts back --- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../node/bin/test.d.ts | 4 +-- 18 files changed, 270 insertions(+), 18 deletions(-) create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts index b4be78a74af23..d42fc1cd136e8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts @@ -15,8 +15,8 @@ declare module "outputdir_module_multifolder_ref/m2" { export function m2_f1(): m2_c1; } declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); export var a1: number; export class c1 { p1: number; From ff95731507bcf831f7339d25f72c37cc6c12fdd4 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 16:49:16 -0800 Subject: [PATCH 243/353] :S --- src/harness/compilerRunner.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 0785faccdf215..16616505c4e3b 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -50,9 +50,8 @@ class CompilerBaselineRunner extends RunnerBase { // Everything declared here should be cleared out in the "after" callback. let justName: string; - let tcSettings: Harness.TestCaseParser.CompilerSettings; - let lastUnit: Harness.TestCaseParser.TestUnitData; + let tcSettings: Harness.TestCaseParser.CompilerSettings; let result: Harness.Compiler.CompilerResult; let program: ts.Program; @@ -67,7 +66,7 @@ class CompilerBaselineRunner extends RunnerBase { const content = Harness.IO.readFile(fileName); const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); const units = testCaseContent.testUnitData; - harnessSettings = testCaseContent.settings; + const tcSettings = testCaseContent.settings; lastUnit = units[units.length - 1]; const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test) @@ -90,7 +89,7 @@ class CompilerBaselineRunner extends RunnerBase { } const output = Harness.Compiler.HarnessCompiler.compileFiles( - toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined); + toBeCompiled, otherFiles, tcSettings, /* options */ undefined, /* currentDirectory */ undefined); options = output.options; result = output.result; @@ -101,7 +100,6 @@ class CompilerBaselineRunner extends RunnerBase { // Mocha holds onto the closure environment of the describe callback even after the test is done. // Therefore we have to clean out large objects after the test is done. justName = undefined; - harnessSettings = undefined; lastUnit = undefined; result = undefined; program = undefined; @@ -178,7 +176,7 @@ class CompilerBaselineRunner extends RunnerBase { const declFileCompilationResult = Harness.Compiler.HarnessCompiler.compileDeclarationFiles( - toBeCompiled, otherFiles, result, harnessSettings, options, /* currentDirectory */ undefined); + toBeCompiled, otherFiles, result, tcSettings, options, /* currentDirectory */ undefined); if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) { jsCode += "\r\n\r\n//// [DtsFileErrors]\r\n"; From bfdb2d0fc98a2966b3564dde62860f93d87f0dac Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 16:57:17 -0800 Subject: [PATCH 244/353] and somehow all that caused was a lint error --- src/harness/compilerRunner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 16616505c4e3b..dbe22beabcfb6 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -66,7 +66,7 @@ class CompilerBaselineRunner extends RunnerBase { const content = Harness.IO.readFile(fileName); const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); const units = testCaseContent.testUnitData; - const tcSettings = testCaseContent.settings; + tcSettings = testCaseContent.settings; lastUnit = units[units.length - 1]; const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test) From e41bfd1ccc753957b94b252ef62b98b011a99d0e Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Nov 2015 17:43:53 -0800 Subject: [PATCH 245/353] fix many lints --- src/compiler/checker.ts | 18 +++++----- src/compiler/core.ts | 2 +- src/compiler/emitter.ts | 56 ++++++++++++++++---------------- src/compiler/parser.ts | 44 ++++++++++++------------- src/compiler/program.ts | 14 ++++---- src/compiler/scanner.ts | 4 +-- src/harness/compilerRunner.ts | 10 +++--- src/harness/fourslash.ts | 16 ++++----- src/harness/harness.ts | 6 ++-- src/harness/loggedIO.ts | 2 +- src/harness/sourceMapRecorder.ts | 2 +- src/server/editorServices.ts | 6 ++-- src/server/session.ts | 2 +- 13 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6d9efda2003de..7f5f73a58db0f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -122,8 +122,8 @@ namespace ts { const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false); - const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false); + const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const globals: SymbolTable = {}; @@ -2276,7 +2276,7 @@ namespace ts { return false; } resolutionTargets.push(target); - resolutionResults.push(true); + resolutionResults.push(/*items*/ true); resolutionPropertyNames.push(propertyName); return true; } @@ -3348,7 +3348,7 @@ namespace ts { function getDefaultConstructSignatures(classType: InterfaceType): Signature[] { if (!hasClassBaseType(classType)) { - return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)]; + return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)]; } const baseConstructorType = getBaseConstructorTypeOfClass(classType); const baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct); @@ -3973,7 +3973,7 @@ namespace ts { } function getSignatureInstantiation(signature: Signature, typeArguments: Type[]): Signature { - return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), true); + return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true); } function getErasedSignature(signature: Signature): Signature { @@ -3983,7 +3983,7 @@ namespace ts { signature.erasedSignatureCache = instantiateSignature(getErasedSignature(signature.target), signature.mapper); } else { - signature.erasedSignatureCache = instantiateSignature(signature, createTypeEraser(signature.typeParameters), true); + signature.erasedSignatureCache = instantiateSignature(signature, createTypeEraser(signature.typeParameters), /*eraseTypeParameters*/ true); } } return signature.erasedSignatureCache; @@ -5099,7 +5099,7 @@ namespace ts { let result = Ternary.True; const sourceTypes = source.types; for (const sourceType of sourceTypes) { - const related = typeRelatedToSomeType(sourceType, target, false); + const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false); if (!related) { return Ternary.False; } @@ -5497,7 +5497,7 @@ namespace ts { const saveErrorInfo = errorInfo; let related = isRelatedTo(s, t, reportErrors); if (!related) { - related = isRelatedTo(t, s, false); + related = isRelatedTo(t, s, /*reportErrors*/ false); if (!related) { if (reportErrors) { reportError(Diagnostics.Types_of_parameters_0_and_1_are_incompatible, @@ -5624,7 +5624,7 @@ namespace ts { let related: Ternary; if (sourceStringType && sourceNumberType) { // If we know for sure we're testing both string and numeric index types then only report errors from the second one - related = isRelatedTo(sourceStringType, targetType, false) || isRelatedTo(sourceNumberType, targetType, reportErrors); + related = isRelatedTo(sourceStringType, targetType, /*reportErrors*/ false) || isRelatedTo(sourceNumberType, targetType, reportErrors); } else { related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors); diff --git a/src/compiler/core.ts b/src/compiler/core.ts index c866cf41a928a..2092a59a545db 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -842,7 +842,7 @@ namespace ts { } export function fail(message?: string): void { - Debug.assert(false, message); + Debug.assert(/*expression*/ false, message); } } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 2ea8c81c7e241..e4cd57542a7a0 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1292,7 +1292,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitCommaList(nodes: Node[]) { if (nodes) { - emitList(nodes, 0, nodes.length, /*multiline*/ false, /*trailingComma*/ false); + emitList(nodes, 0, nodes.length, /*multiLine*/ false, /*trailingComma*/ false); } } @@ -2191,7 +2191,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else if (languageVersion >= ScriptTarget.ES6 || !forEach(elements, isSpreadElementExpression)) { write("["); - emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces:*/ false); + emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces*/ false); write("]"); } else { @@ -2215,7 +2215,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // then try to preserve the original shape of the object literal. // Otherwise just try to preserve the formatting. if (numElements === properties.length) { - emitLinePreservingList(node, properties, /* allowTrailingComma */ languageVersion >= ScriptTarget.ES5, /* spacesBetweenBraces */ true); + emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces*/ true); } else { const multiLine = (node.flags & NodeFlags.MultiLine) !== 0; @@ -2765,7 +2765,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(".bind.apply("); emit(target); write(", [void 0].concat("); - emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiline*/ false, /*trailingComma*/ false, /*useConcat*/ false); + emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ false); write(")))"); write("()"); } @@ -2982,7 +2982,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi synthesizedLHS = createSynthesizedNode(SyntaxKind.ElementAccessExpression, /*startsOnNewLine*/ false); - const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefinedTempVariablesInPlaces*/ false, /*shouldEmitCommaBeforeAssignment*/ false); + const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false); synthesizedLHS.expression = identifier; if (leftHandSideExpression.argumentExpression.kind !== SyntaxKind.NumericLiteral && @@ -3001,7 +3001,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write("("); synthesizedLHS = createSynthesizedNode(SyntaxKind.PropertyAccessExpression, /*startsOnNewLine*/ false); - const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefinedTempVariablesInPlaces*/ false, /*shouldemitCommaBeforeAssignment*/ false); + const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false); synthesizedLHS.expression = identifier; (synthesizedLHS).dotToken = leftHandSideExpression.dotToken; @@ -3181,10 +3181,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitDoStatementWorker(node: DoStatement, loop: ConvertedLoop) { write("do"); if (loop) { - emitConvertedLoopCall(loop, /* emitAsBlock */ true); + emitConvertedLoopCall(loop, /*emitAsBlock*/ true); } else { - emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true); + emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true); } if (node.statement.kind === SyntaxKind.Block) { write(" "); @@ -3207,10 +3207,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(")"); if (loop) { - emitConvertedLoopCall(loop, /* emitAsBlock */ true); + emitConvertedLoopCall(loop, /*emitAsBlock*/ true); } else { - emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true); + emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true); } } @@ -3532,8 +3532,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(`switch(${loopResultVariable}) {`); increaseIndent(); - emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /* isBreak */ true, loopResultVariable, outerLoop); - emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /* isBreak */ false, loopResultVariable, outerLoop); + emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /*isBreak*/ true, loopResultVariable, outerLoop); + emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /*isBreak*/ false, loopResultVariable, outerLoop); decreaseIndent(); writeLine(); @@ -3597,10 +3597,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(")"); if (loop) { - emitConvertedLoopCall(loop, /* emitAsBlock */ true); + emitConvertedLoopCall(loop, /*emitAsBlock*/ true); } else { - emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true); + emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true); } } @@ -3638,10 +3638,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitToken(SyntaxKind.CloseParenToken, node.expression.end); if (loop) { - emitConvertedLoopCall(loop, /* emitAsBlock */ true); + emitConvertedLoopCall(loop, /*emitAsBlock*/ true); } else { - emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ true); + emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true); } } @@ -3781,10 +3781,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if (loop) { writeLine(); - emitConvertedLoopCall(loop, /* emitAsBlock */ false); + emitConvertedLoopCall(loop, /*emitAsBlock*/ false); } else { - emitNormalLoopBody(node, /* emitAsEmbeddedStatement */ false); + emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ false); } writeLine(); @@ -3818,11 +3818,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let labelMarker: string; if (node.kind === SyntaxKind.BreakStatement) { labelMarker = `break-${node.label.text}`; - setLabeledJump(convertedLoopState, /* isBreak */ true, node.label.text, labelMarker); + setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker); } else { labelMarker = `continue-${node.label.text}`; - setLabeledJump(convertedLoopState, /* isBreak */ false, node.label.text, labelMarker); + setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker); } write(`return "${labelMarker}";`); } @@ -4248,7 +4248,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let index: Expression; const nameIsComputed = propName.kind === SyntaxKind.ComputedPropertyName; if (nameIsComputed) { - index = ensureIdentifier((propName).expression, /* reuseIdentifierExpression */ false); + index = ensureIdentifier((propName).expression, /*reuseIdentifierExpressions*/ false); } else { // We create a synthetic copy of the identifier in order to avoid the rewriting that might @@ -5380,7 +5380,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitEnd(baseTypeElement); } } - emitPropertyDeclarations(node, getInitializedProperties(node, /*static:*/ false)); + emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ false)); if (ctor) { let statements: Node[] = (ctor.body).statements; if (superCall) { @@ -5502,7 +5502,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // // This keeps the expression as an expression, while ensuring that the static parts // of it have been initialized by the time it is used. - const staticProperties = getInitializedProperties(node, /*static:*/ true); + const staticProperties = getInitializedProperties(node, /*isStatic*/ true); const isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === SyntaxKind.ClassExpression; let tempVariable: Identifier; @@ -5564,7 +5564,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi for (var property of staticProperties) { write(","); writeLine(); - emitPropertyDeclaration(node, property, /*receiver:*/ tempVariable, /*isExpression:*/ true); + emitPropertyDeclaration(node, property, /*receiver*/ tempVariable, /*isExpression*/ true); } write(","); writeLine(); @@ -5638,7 +5638,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); emitConstructor(node, baseTypeNode); emitMemberFunctionsForES5AndLower(node); - emitPropertyDeclarations(node, getInitializedProperties(node, /*static:*/ true)); + emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true)); writeLine(); emitDecoratorsOfClass(node); writeLine(); @@ -8094,11 +8094,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi * Emit comments associated with node that will not be emitted into JS file */ function emitCommentsOnNotEmittedNode(node: Node) { - emitLeadingCommentsWorker(node, /*isEmittedNode:*/ false); + emitLeadingCommentsWorker(node, /*isEmittedNode*/ false); } function emitLeadingComments(node: Node) { - return emitLeadingCommentsWorker(node, /*isEmittedNode:*/ true); + return emitLeadingCommentsWorker(node, /*isEmittedNode*/ true); } function emitLeadingCommentsWorker(node: Node, isEmittedNode: boolean) { @@ -8127,7 +8127,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments); // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space - emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator:*/ true, newLine, writeComment); + emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment); } function emitTrailingComments(node: Node) { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index ac37f608417e9..9a72593d3b0ab 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -722,10 +722,10 @@ namespace ts { const contextFlagsToClear = context & contextFlags; if (contextFlagsToClear) { // clear the requested context flags - setContextFlag(false, contextFlagsToClear); + setContextFlag(/*val*/ false, contextFlagsToClear); const result = func(); // restore the context flags we just cleared - setContextFlag(true, contextFlagsToClear); + setContextFlag(/*val*/ true, contextFlagsToClear); return result; } @@ -743,10 +743,10 @@ namespace ts { const contextFlagsToSet = context & ~contextFlags; if (contextFlagsToSet) { // set the requested context flags - setContextFlag(true, contextFlagsToSet); + setContextFlag(/*val*/ true, contextFlagsToSet); const result = func(); // reset the context flags we just set - setContextFlag(false, contextFlagsToSet); + setContextFlag(/*val*/ false, contextFlagsToSet); return result; } @@ -1098,11 +1098,11 @@ namespace ts { } function parsePropertyName(): PropertyName { - return parsePropertyNameWorker(/*allowComputedPropertyNames:*/ true); + return parsePropertyNameWorker(/*allowComputedPropertyNames*/ true); } function parseSimplePropertyName(): Identifier | LiteralExpression { - return parsePropertyNameWorker(/*allowComputedPropertyNames:*/ false); + return parsePropertyNameWorker(/*allowComputedPropertyNames*/ false); } function isSimplePropertyName() { @@ -1385,7 +1385,7 @@ namespace ts { function isInSomeParsingContext(): boolean { for (let kind = 0; kind < ParsingContext.Count; kind++) { if (parsingContext & (1 << kind)) { - if (isListElement(kind, /* inErrorRecovery */ true) || isListTerminator(kind)) { + if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) { return true; } } @@ -1402,7 +1402,7 @@ namespace ts { result.pos = getNodePos(); while (!isListTerminator(kind)) { - if (isListElement(kind, /* inErrorRecovery */ false)) { + if (isListElement(kind, /*inErrorRecovery*/ false)) { const element = parseListElement(kind, parseElement); result.push(element); @@ -1751,7 +1751,7 @@ namespace ts { let commaStart = -1; // Meaning the previous token was not a comma while (true) { - if (isListElement(kind, /* inErrorRecovery */ false)) { + if (isListElement(kind, /*inErrorRecovery*/ false)) { result.push(parseListElement(kind, parseElement)); commaStart = scanner.getTokenPos(); if (parseOptional(SyntaxKind.CommaToken)) { @@ -1859,7 +1859,7 @@ namespace ts { // Report that we need an identifier. However, report it right after the dot, // and not on the next token. This is because the next token might actually // be an identifier and the error would be quite confusing. - return createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentToken*/ true, Diagnostics.Identifier_expected); + return createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.Identifier_expected); } } @@ -2609,7 +2609,7 @@ namespace ts { // clear the decorator context when parsing Expression, as it should be unambiguous when parsing a decorator const saveDecoratorContext = inDecoratorContext(); if (saveDecoratorContext) { - setDecoratorContext(false); + setDecoratorContext(/*val*/ false); } let expr = parseAssignmentExpressionOrHigher(); @@ -2619,7 +2619,7 @@ namespace ts { } if (saveDecoratorContext) { - setDecoratorContext(true); + setDecoratorContext(/*val*/ true); } return expr; } @@ -2773,7 +2773,7 @@ namespace ts { node.parameters.pos = parameter.pos; node.parameters.end = parameter.end; - node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>"); + node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, "=>"); node.body = parseArrowFunctionExpressionBody(/*isAsync*/ false); return finishNode(node); @@ -3573,7 +3573,7 @@ namespace ts { parseExpected(SyntaxKind.GreaterThanToken); } else { - parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*advance*/ false); + parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } node = createNode(SyntaxKind.JsxSelfClosingElement, fullStart); @@ -3609,7 +3609,7 @@ namespace ts { parseExpected(SyntaxKind.CloseBraceToken); } else { - parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*advance*/ false); + parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } @@ -3654,7 +3654,7 @@ namespace ts { parseExpected(SyntaxKind.GreaterThanToken); } else { - parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*advance*/ false); + parseExpected(SyntaxKind.GreaterThanToken, /*diagnostic*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } return finishNode(node); @@ -3973,7 +3973,7 @@ namespace ts { // function BindingIdentifier[opt](FormalParameters){ FunctionBody } const saveDecoratorContext = inDecoratorContext(); if (saveDecoratorContext) { - setDecoratorContext(false); + setDecoratorContext(/*val*/ false); } const node = createNode(SyntaxKind.FunctionExpression); @@ -3993,7 +3993,7 @@ namespace ts { node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false); if (saveDecoratorContext) { - setDecoratorContext(true); + setDecoratorContext(/*val*/ true); } return finishNode(node); @@ -4039,13 +4039,13 @@ namespace ts { // arrow function. The body of the function is not in [Decorator] context. const saveDecoratorContext = inDecoratorContext(); if (saveDecoratorContext) { - setDecoratorContext(false); + setDecoratorContext(/*val*/ false); } const block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage); if (saveDecoratorContext) { - setDecoratorContext(true); + setDecoratorContext(/*val*/ true); } setYieldContext(savedYieldContext); @@ -6162,7 +6162,7 @@ namespace ts { if (sourceFile.statements.length === 0) { // If we don't have any statements in the current source file, then there's no real // way to incrementally parse. So just do a full parse instead. - return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setNodeParents*/ true); + return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true); } // Make sure we're not trying to incrementally update a source file more than once. Once @@ -6226,7 +6226,7 @@ namespace ts { // inconsistent tree. Setting the parents on the new tree should be very fast. We // will immediately bail out of walking any subtrees when we can see that their parents // are already correct. - const result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true); + const result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true); return result; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index ca0c7d9adaa77..86fbc2e62591c 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -364,13 +364,13 @@ namespace ts { } if (!tryReuseStructureFromOldProgram()) { - forEach(rootNames, name => processRootFile(name, false)); + forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false)); // Do not process the default library if: // - The '--noLib' flag is used. // - A 'no-default-lib' reference comment is encountered in // processing the root files. if (!skipDefaultLib) { - processRootFile(host.getDefaultLibFileName(options), true); + processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true); } } @@ -693,7 +693,7 @@ namespace ts { let imports: LiteralExpression[]; for (const node of file.statements) { - collect(node, /* allowRelativeModuleNames */ true, /* collectOnlyRequireCalls */ false); + collect(node, /*allowRelativeModuleNames*/ true, /*collectOnlyRequireCalls*/ false); } file.imports = imports || emptyArray; @@ -729,7 +729,7 @@ namespace ts { // TypeScript 1.0 spec (April 2014): 12.1.6 // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules // only through top - level external module names. Relative external module names are not permitted. - collect(node, /* allowRelativeModuleNames */ false, collectOnlyRequireCalls); + collect(node, /*allowRelativeModuleNames*/ false, collectOnlyRequireCalls); }); } break; @@ -741,7 +741,7 @@ namespace ts { (imports || (imports = [])).push((node).arguments[0]); } else { - forEachChild(node, node => collect(node, allowRelativeModuleNames, /* collectOnlyRequireCalls */ true)); + forEachChild(node, node => collect(node, allowRelativeModuleNames, /*collectOnlyRequireCalls*/ true)); } } } @@ -862,7 +862,7 @@ namespace ts { function processReferencedFiles(file: SourceFile, basePath: string) { forEach(file.referencedFiles, ref => { const referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, /* isDefaultLib */ false, file, ref.pos, ref.end); + processSourceFile(referencedFileName, /*isDefaultLib*/ false, file, ref.pos, ref.end); }); } @@ -880,7 +880,7 @@ namespace ts { const resolution = resolutions[i]; setResolvedModule(file, moduleNames[i], resolution); if (resolution && !options.noResolve) { - const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end); + const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end); if (importedFile && resolution.isExternalLibraryImport) { if (!isExternalModule(importedFile)) { diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 9703ef8517b7b..4289d910608a9 100644 --- a/src/compiler/scanner.ts +++ b/src/compiler/scanner.ts @@ -1634,11 +1634,11 @@ namespace ts { } function lookAhead(callback: () => T): T { - return speculationHelper(callback, /*isLookahead:*/ true); + return speculationHelper(callback, /*isLookahead*/ true); } function tryScan(callback: () => T): T { - return speculationHelper(callback, /*isLookahead:*/ false); + return speculationHelper(callback, /*isLookahead*/ false); } function setText(newText: string, start: number, length: number) { diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index d46d0bde08c18..fd8b248dfe273 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -182,7 +182,7 @@ class CompilerBaselineRunner extends RunnerBase { const declFileCompilationResult = Harness.Compiler.HarnessCompiler.compileDeclarationFiles( - toBeCompiled, otherFiles, result, harnessSettings, options, /* currentDirectory */ undefined); + toBeCompiled, otherFiles, result, harnessSettings, options, /*currentDirectory*/ undefined); if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) { jsCode += "\r\n\r\n//// [DtsFileErrors]\r\n"; @@ -255,8 +255,8 @@ class CompilerBaselineRunner extends RunnerBase { const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName)); - const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck:*/ true); - const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck:*/ false); + const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true); + const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false); const fullResults: ts.Map = {}; const pullResults: ts.Map = {}; @@ -270,14 +270,14 @@ class CompilerBaselineRunner extends RunnerBase { // The second gives symbols for all identifiers. let e1: Error, e2: Error; try { - checkBaseLines(/*isSymbolBaseLine:*/ false); + checkBaseLines(/*isSymbolBaseLine*/ false); } catch (e) { e1 = e; } try { - checkBaseLines(/*isSymbolBaseLine:*/ true); + checkBaseLines(/*isSymbolBaseLine*/ true); } catch (e) { e2 = e; diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 839a4521a297a..ebc58096d6f7d 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -514,7 +514,7 @@ namespace FourSlash { this.scenarioActions.push(``); if (actual !== expected) { - this.printErrorLog(false, errors); + this.printErrorLog(/*expectErrors*/ false, errors); const errorMsg = "Actual number of errors (" + actual + ") does not match expected number (" + expected + ")"; Harness.IO.log(errorMsg); this.raiseError(errorMsg); @@ -567,7 +567,7 @@ namespace FourSlash { public verifyMemberListCount(expectedCount: number, negative: boolean) { if (expectedCount === 0) { if (negative) { - this.verifyMemberListIsEmpty(false); + this.verifyMemberListIsEmpty(/*negative*/ false); return; } else { @@ -1347,7 +1347,7 @@ namespace FourSlash { if (this.enableFormatting) { const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions); if (edits.length) { - offset += this.applyEdits(this.activeFile.fileName, edits, true); + offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); // this.checkPostEditInletiants(); } } @@ -1389,7 +1389,7 @@ namespace FourSlash { if (this.enableFormatting) { const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions); if (edits.length) { - offset += this.applyEdits(this.activeFile.fileName, edits, true); + offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); } } } @@ -1449,7 +1449,7 @@ namespace FourSlash { if (this.enableFormatting) { const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions); if (edits.length) { - offset += this.applyEdits(this.activeFile.fileName, edits, true); + offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); // this.checkPostEditInletiants(); } } @@ -1477,7 +1477,7 @@ namespace FourSlash { if (this.enableFormatting) { const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, offset, this.formatCodeOptions); if (edits.length) { - offset += this.applyEdits(this.activeFile.fileName, edits, true); + offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); this.checkPostEditInletiants(); } } @@ -1563,7 +1563,7 @@ namespace FourSlash { this.scenarioActions.push(""); const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeOptions); - this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, true); + this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); this.fixCaretPosition(); } @@ -1571,7 +1571,7 @@ namespace FourSlash { this.taoInvalidReason = "formatSelection NYI"; const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeOptions); - this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, true); + this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); this.fixCaretPosition(); } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index aa70087ea3118..9bc36e257ad89 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -628,7 +628,7 @@ namespace Harness { function getResolvedPathFromServer(path: string) { const xhr = new XMLHttpRequest(); try { - xhr.open("GET", path + "?resolve", false); + xhr.open("GET", path + "?resolve", /*async*/ false); xhr.send(); } catch (e) { @@ -647,7 +647,7 @@ namespace Harness { export function getFileFromServerSync(url: string): XHRResponse { const xhr = new XMLHttpRequest(); try { - xhr.open("GET", url, false); + xhr.open("GET", url, /*async*/ false); xhr.send(); } catch (e) { @@ -662,7 +662,7 @@ namespace Harness { const xhr = new XMLHttpRequest(); try { const actionMsg = "?action=" + action; - xhr.open("POST", url + actionMsg, false); + xhr.open("POST", url + actionMsg, /*async*/ false); xhr.setRequestHeader("Access-Control-Allow-Origin", "*"); xhr.send(contents); } diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts index bf56f1aa3eafd..0bae91f7976fc 100644 --- a/src/harness/loggedIO.ts +++ b/src/harness/loggedIO.ts @@ -174,7 +174,7 @@ namespace Playback { return true; } else { - return findResultByFields(replayLog.fileExists, { path }, false); + return findResultByFields(replayLog.fileExists, { path }, /*defaultValue*/ false); } }) ); diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts index ce0a6a6528e29..75246a9a26694 100644 --- a/src/harness/sourceMapRecorder.ts +++ b/src/harness/sourceMapRecorder.ts @@ -190,7 +190,7 @@ namespace Harness.SourceMapRecoder { return { error: errorDecodeOfEncodedMapping, sourceMapSpan: decodeOfEncodedMapping }; } - createErrorIfCondition(true, "No encoded entry found"); + createErrorIfCondition(/*condition*/ true, "No encoded entry found"); } export function hasCompletedDecoding() { diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 795bd7db7321e..c3cd65e857bb2 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -388,7 +388,7 @@ namespace ts.server { } openReferencedFile(filename: string) { - return this.projectService.openFile(filename, false); + return this.projectService.openFile(filename, /*openedByClient*/ false); } getRootFiles() { @@ -1068,7 +1068,7 @@ namespace ts.server { */ openClientFile(fileName: string, fileContent?: string) { this.openOrUpdateConfiguredProjectForFile(fileName); - const info = this.openFile(fileName, true, fileContent); + const info = this.openFile(fileName, /*openedByClient*/ true, fileContent); this.addOpenFile(info); this.printProjects(); return info; @@ -1277,7 +1277,7 @@ namespace ts.server { for (const fileName of fileNamesToAdd) { let info = this.getScriptInfo(fileName); if (!info) { - info = this.openFile(fileName, false); + info = this.openFile(fileName, /*openedByClient*/ false); } else { // if the root file was opened by client, it would belong to either diff --git a/src/server/session.ts b/src/server/session.ts index f04f73f644cba..dae2384ce546d 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -901,7 +901,7 @@ namespace ts.server { } getDiagnosticsForProject(delay: number, fileName: string) { - const { configFileName, fileNames } = this.getProjectInfo(fileName, true); + const { configFileName, fileNames } = this.getProjectInfo(fileName, /*needFileNameList*/ true); // No need to analyze lib.d.ts let fileNamesInProject = fileNames.filter((value, index, array) => value.indexOf("lib.d.ts") < 0); From e49e55287a3b205ffa263b6fc58fa59fa8395e7b Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 14 Nov 2015 12:08:47 -0800 Subject: [PATCH 246/353] do not crash when variable and function declarations collide --- src/compiler/checker.ts | 6 ++++-- .../reference/nonMergedOverloads.errors.txt | 20 +++++++++++++++++++ .../baselines/reference/nonMergedOverloads.js | 12 +++++++++++ tests/cases/compiler/nonMergedOverloads.ts | 5 +++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/nonMergedOverloads.errors.txt create mode 100644 tests/baselines/reference/nonMergedOverloads.js create mode 100644 tests/cases/compiler/nonMergedOverloads.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7f5f73a58db0f..f975c110b0311 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11360,12 +11360,14 @@ namespace ts { const errorNode: Node = (subsequentNode).name || subsequentNode; // TODO(jfreeman): These are methods, so handle computed name case if (node.name && (subsequentNode).name && (node.name).text === ((subsequentNode).name).text) { - Debug.assert(node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature); + const reportError = + (node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) && + (node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static); // we can get here in two cases // 1. mixed static and instance class members // 2. something with the same name was defined before the set of overloads that prevents them from merging // here we'll report error only for the first case since for second we should already report error in binder - if ((node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static)) { + if (reportError) { const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; error(errorNode, diagnostic); } diff --git a/tests/baselines/reference/nonMergedOverloads.errors.txt b/tests/baselines/reference/nonMergedOverloads.errors.txt new file mode 100644 index 0000000000000..9a38ebdc3b311 --- /dev/null +++ b/tests/baselines/reference/nonMergedOverloads.errors.txt @@ -0,0 +1,20 @@ +tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2300: Duplicate identifier 'f'. +tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. +tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2300: Duplicate identifier 'f'. +tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2300: Duplicate identifier 'f'. + + +==== tests/cases/compiler/nonMergedOverloads.ts (4 errors) ==== + var f = 10; + ~ +!!! error TS2300: Duplicate identifier 'f'. + + export function f(); + ~ +!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. + ~ +!!! error TS2300: Duplicate identifier 'f'. + export function f() { + ~ +!!! error TS2300: Duplicate identifier 'f'. + } \ No newline at end of file diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js new file mode 100644 index 0000000000000..2e7f7f67ee67d --- /dev/null +++ b/tests/baselines/reference/nonMergedOverloads.js @@ -0,0 +1,12 @@ +//// [nonMergedOverloads.ts] +var f = 10; + +export function f(); +export function f() { +} + +//// [nonMergedOverloads.js] +var f = 10; +function f() { +} +exports.f = f; diff --git a/tests/cases/compiler/nonMergedOverloads.ts b/tests/cases/compiler/nonMergedOverloads.ts new file mode 100644 index 0000000000000..582cd72e1f4c1 --- /dev/null +++ b/tests/cases/compiler/nonMergedOverloads.ts @@ -0,0 +1,5 @@ +var f = 10; + +export function f(); +export function f() { +} \ No newline at end of file From 762e1eb0a886a13de3b62b771c1778ae506ccbd0 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 14 Nov 2015 13:57:11 -0800 Subject: [PATCH 247/353] cleanup harness code --- src/harness/compilerRunner.ts | 13 +- src/harness/fourslash.ts | 36 ++- src/harness/harness.ts | 308 ++++++++++---------------- src/harness/harnessLanguageService.ts | 10 +- src/harness/rwcRunner.ts | 4 +- src/harness/test262Runner.ts | 11 +- 6 files changed, 150 insertions(+), 232 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index fd8b248dfe273..85a51b8f2a4fa 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -55,7 +55,6 @@ class CompilerBaselineRunner extends RunnerBase { let rootDir: string; let result: Harness.Compiler.CompilerResult; - let program: ts.Program; let options: ts.CompilerOptions; // equivalent to the files that will be passed on the command line let toBeCompiled: Harness.Compiler.TestFile[]; @@ -89,12 +88,11 @@ class CompilerBaselineRunner extends RunnerBase { }); } - const output = Harness.Compiler.HarnessCompiler.compileFiles( + const output = Harness.Compiler.compileFiles( toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined); options = output.options; result = output.result; - program = output.program; }); after(() => { @@ -108,7 +106,6 @@ class CompilerBaselineRunner extends RunnerBase { lastUnit = undefined; rootDir = undefined; result = undefined; - program = undefined; options = undefined; toBeCompiled = undefined; otherFiles = undefined; @@ -181,7 +178,7 @@ class CompilerBaselineRunner extends RunnerBase { } const declFileCompilationResult = - Harness.Compiler.HarnessCompiler.compileDeclarationFiles( + Harness.Compiler.compileDeclarationFiles( toBeCompiled, otherFiles, result, harnessSettings, options, /*currentDirectory*/ undefined); if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) { @@ -253,10 +250,10 @@ class CompilerBaselineRunner extends RunnerBase { // These types are equivalent, but depend on what order the compiler observed // certain parts of the program. - const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName)); + const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!result.program.getSourceFile(file.unitName)); - const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true); - const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false); + const fullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ true); + const pullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ false); const fullResults: ts.Map = {}; const pullResults: ts.Map = {}; diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index ebc58096d6f7d..f62e1c5841267 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2383,10 +2383,9 @@ namespace FourSlash { // here we cache the JS output and reuse it for every test. let fourslashJsOutput: string; { - const fourslashFile: Harness.Compiler.TestFileWithPath = { + const fourslashFile: Harness.Compiler.TestFile = { unitName: Harness.Compiler.fourslashFileName, - content: undefined, - path: ts.toPath(Harness.Compiler.fourslashFileName, Harness.IO.getCurrentDirectory(), Harness.Compiler.getCanonicalFileName) + content: undefined }; const host = Harness.Compiler.createCompilerHost([fourslashFile], (fn, contents) => fourslashJsOutput = contents, @@ -2399,35 +2398,28 @@ namespace FourSlash { program.emit(host.getSourceFile(Harness.Compiler.fourslashFileName, ts.ScriptTarget.ES3)); } - export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): TestXmlData { // Parse out the files and their metadata const testData = parseTestData(basePath, content, fileName); currentTestState = new TestState(basePath, testType, testData); - const currentDirectory = Harness.IO.getCurrentDirectory(); - const useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames(); - const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); - let result = ""; - const fourslashFile: Harness.Compiler.TestFileWithPath = { + const fourslashFile: Harness.Compiler.TestFile = { unitName: Harness.Compiler.fourslashFileName, content: undefined, - path: ts.toPath(Harness.Compiler.fourslashFileName, currentDirectory, getCanonicalFileName) }; - const testFile: Harness.Compiler.TestFileWithPath = { + const testFile: Harness.Compiler.TestFile = { unitName: fileName, - content: content, - path: ts.toPath(fileName, currentDirectory, getCanonicalFileName) + content: content }; const host = Harness.Compiler.createCompilerHost( [ fourslashFile, testFile ], (fn, contents) => result = contents, ts.ScriptTarget.Latest, - useCaseSensitiveFileNames, - currentDirectory); + Harness.IO.useCaseSensitiveFileNames(), + Harness.IO.getCurrentDirectory()); const program = ts.createProgram([Harness.Compiler.fourslashFileName, fileName], { outFile: "fourslashTestOutput.js", noResolve: true, target: ts.ScriptTarget.ES3 }, host); @@ -2444,18 +2436,22 @@ namespace FourSlash { result = fourslashJsOutput + "\r\n" + result; + runCode(result); + + const xmlData = currentTestState.getTestXmlData(); + xmlData.originalName = fileName; + return xmlData; + } + + function runCode(code: string): void { // Compile and execute the test try { - eval(result); + eval(code); } catch (err) { // Debugging: FourSlash.currentTestState.printCurrentFileState(); throw err; } - - const xmlData = currentTestState.getTestXmlData(); - xmlData.originalName = fileName; - return xmlData; } function chompLeadingSpace(content: string) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 9bc36e257ad89..e58e66354345f 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -767,25 +767,8 @@ namespace Harness { } namespace Harness { - let tcServicesFileName = "typescriptServices.js"; - - export let libFolder: string; - switch (Utils.getExecutionEnvironment()) { - case Utils.ExecutionEnvironment.CScript: - libFolder = "built/local/"; - tcServicesFileName = "built/local/typescriptServices.js"; - break; - case Utils.ExecutionEnvironment.Node: - libFolder = "built/local/"; - tcServicesFileName = "built/local/typescriptServices.js"; - break; - case Utils.ExecutionEnvironment.Browser: - libFolder = "built/local/"; - tcServicesFileName = "built/local/typescriptServices.js"; - break; - default: - throw new Error("Unknown context"); - } + const tcServicesFileName = "built/local/typescriptServices.js"; + export const libFolder = "built/local/"; export let tcServicesFile = IO.readFile(tcServicesFileName); export interface SourceMapEmitterCallback { @@ -827,57 +810,14 @@ namespace Harness { } } - export interface IEmitterIOHost { - writeFile(path: string, contents: string, writeByteOrderMark: boolean): void; - resolvePath(path: string): string; - } - - /** Mimics having multiple files, later concatenated to a single file. */ - export class EmitterIOHost implements IEmitterIOHost { - private fileCollection: any = {}; - - /** create file gets the whole path to create, so this works as expected with the --out parameter */ - public writeFile(s: string, contents: string, writeByteOrderMark: boolean): void { - let writer: ITextWriter; - if (this.fileCollection[s]) { - writer = this.fileCollection[s]; - } - else { - writer = new Harness.Compiler.WriterAggregator(); - this.fileCollection[s] = writer; - } - - writer.Write(contents); - writer.Close(); - } - - public resolvePath(s: string) { return s; } - - public reset() { this.fileCollection = {}; } - - public toArray(): { fileName: string; file: WriterAggregator; }[] { - const result: { fileName: string; file: WriterAggregator; }[] = []; - for (const p in this.fileCollection) { - if (this.fileCollection.hasOwnProperty(p)) { - const current = this.fileCollection[p]; - if (current.lines.length > 0) { - if (p.indexOf(".d.ts") !== -1) { current.lines.unshift(["////[", Path.getFileName(p), "]"].join("")); } - result.push({ fileName: p, file: this.fileCollection[p] }); - } - } - } - return result; - } - } - export function createSourceFileAndAssertInvariants( fileName: string, sourceText: string, languageVersion: ts.ScriptTarget) { - // We'll only assert inletiants outside of light mode. + // We'll only assert invariants outside of light mode. const shouldAssertInvariants = !Harness.lightMode; - // Only set the parent nodes if we're asserting inletiants. We don't need them otherwise. + // Only set the parent nodes if we're asserting invariants. We don't need them otherwise. const result = ts.createSourceFile(fileName, sourceText, languageVersion, /*setParentNodes:*/ shouldAssertInvariants); if (shouldAssertInvariants) { @@ -890,12 +830,12 @@ namespace Harness { const carriageReturnLineFeed = "\r\n"; const lineFeed = "\n"; - export let defaultLibFileName = "lib.d.ts"; - export let defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest); - export let defaultES6LibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.es6.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest); + export const defaultLibFileName = "lib.d.ts"; + export const defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest); + export const defaultES6LibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.es6.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest); // Cache these between executions so we don't have to re-parse them for every test - export let fourslashFileName = "fourslash.ts"; + export const fourslashFileName = "fourslash.ts"; export let fourslashSourceFile: ts.SourceFile; export function getCanonicalFileName(fileName: string): string { @@ -903,7 +843,7 @@ namespace Harness { } export function createCompilerHost( - inputFiles: TestFileWithPath[], + inputFiles: TestFile[], writeFile: (fn: string, contents: string, writeByteOrderMark: boolean) => void, scriptTarget: ts.ScriptTarget, useCaseSensitiveFileNames: boolean, @@ -915,16 +855,14 @@ namespace Harness { const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); const fileMap: ts.FileMap = ts.createFileMap(); - - // Register input files - function register(file: TestFileWithPath) { + for (const file of inputFiles) { if (file.content !== undefined) { const fileName = ts.normalizePath(file.unitName); const sourceFile = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget); - fileMap.set(file.path, sourceFile); + const path = ts.toPath(file.unitName, currentDirectory, getCanonicalFileName); + fileMap.set(path, sourceFile); } - }; - inputFiles.forEach(register); + } function getSourceFile(fn: string, languageVersion: ts.ScriptTarget) { fn = ts.normalizePath(fn); @@ -1031,146 +969,132 @@ namespace Harness { unitName: string; content: string; } - export interface TestFileWithPath extends TestFile { - path: ts.Path; - } export interface CompilationOutput { result: CompilerResult; - program: ts.Program; options: ts.CompilerOptions & HarnessOptions; } - export namespace HarnessCompiler { - export function compileFiles( - inputFiles: TestFile[], - otherFiles: TestFile[], - harnessSettings: TestCaseParser.CompilerSettings, - compilerOptions: ts.CompilerOptions, - // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file - currentDirectory: string): CompilationOutput { - - const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false }; - options.target = options.target || ts.ScriptTarget.ES3; - options.module = options.module || ts.ModuleKind.None; - options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed; - options.noErrorTruncation = true; - options.skipDefaultLibCheck = true; - - const newLine = "\r\n"; - currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory(); - - // Parse settings - let useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames(); - if (harnessSettings) { - setCompilerOptionsFromHarnessSetting(harnessSettings, options); - } - if (options.useCaseSensitiveFileNames !== undefined) { - useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; - } - const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); - const inputFilesWithPath = inputFiles.map(f => { - return { unitName: f.unitName, content: f.content, path: ts.toPath(f.unitName, currentDirectory, getCanonicalFileName) }; - }); - const otherFilesWithPath = otherFiles.map(f => { - return { unitName: f.unitName, content: f.content, path: ts.toPath(f.unitName, currentDirectory, getCanonicalFileName) }; - }); + export function compileFiles( + inputFiles: TestFile[], + otherFiles: TestFile[], + harnessSettings: TestCaseParser.CompilerSettings, + compilerOptions: ts.CompilerOptions, + // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file + currentDirectory: string): CompilationOutput { - // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. - // Treat them as library files, so include them in build, but not in baselines. - const includeBuiltFiles: TestFileWithPath[] = []; - if (options.includeBuiltFile) { - const builtFileName = libFolder + options.includeBuiltFile; - const builtFile: TestFileWithPath = { - unitName: builtFileName, - content: normalizeLineEndings(IO.readFile(builtFileName), newLine), - path: ts.toPath(builtFileName, currentDirectory, getCanonicalFileName) - }; - includeBuiltFiles.push(builtFile); - } + const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false }; + options.target = options.target || ts.ScriptTarget.ES3; + options.module = options.module || ts.ModuleKind.None; + options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed; + options.noErrorTruncation = true; + options.skipDefaultLibCheck = true; - const fileOutputs: GeneratedFile[] = []; + const newLine = "\r\n"; + currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory(); - const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName); + // Parse settings + let useCaseSensitiveFileNames = Harness.IO.useCaseSensitiveFileNames(); + if (harnessSettings) { + setCompilerOptionsFromHarnessSetting(harnessSettings, options); + } + if (options.useCaseSensitiveFileNames !== undefined) { + useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; + } - const compilerHost = createCompilerHost( - inputFilesWithPath.concat(includeBuiltFiles).concat(otherFilesWithPath), - (fn, contents, writeByteOrderMark) => fileOutputs.push({ fileName: fn, code: contents, writeByteOrderMark: writeByteOrderMark }), - options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine); - const program = ts.createProgram(programFiles, options, compilerHost); + // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. + // Treat them as library files, so include them in build, but not in baselines. + const includeBuiltFiles: TestFile[] = []; + if (options.includeBuiltFile) { + const builtFileName = libFolder + options.includeBuiltFile; + const builtFile: TestFile = { + unitName: builtFileName, + content: normalizeLineEndings(IO.readFile(builtFileName), newLine), + }; + includeBuiltFiles.push(builtFile); + } - const emitResult = program.emit(); + const fileOutputs: GeneratedFile[] = []; - const errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics); + const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName); - const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps); - return { result, program, options }; - } + const compilerHost = createCompilerHost( + inputFiles.concat(includeBuiltFiles).concat(otherFiles), + (fileName, code, writeByteOrderMark) => fileOutputs.push({ fileName, code, writeByteOrderMark }), + options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine); + const program = ts.createProgram(programFiles, options, compilerHost); - export function compileDeclarationFiles(inputFiles: TestFile[], - otherFiles: TestFile[], - result: CompilerResult, - harnessSettings: TestCaseParser.CompilerSettings & HarnessOptions, - options: ts.CompilerOptions, - // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file - currentDirectory: string) { - if (options.declaration && result.errors.length === 0 && result.declFilesCode.length !== result.files.length) { - throw new Error("There were no errors and declFiles generated did not match number of js files generated"); - } + const emitResult = program.emit(); - const declInputFiles: TestFile[] = []; - const declOtherFiles: TestFile[] = []; + const errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics); - // if the .d.ts is non-empty, confirm it compiles correctly as well - if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) { - ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles)); - ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles)); - const output = this.compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory); + const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps); + return { result, options }; + } - return { declInputFiles, declOtherFiles, declResult: output.result }; - } + export function compileDeclarationFiles(inputFiles: TestFile[], + otherFiles: TestFile[], + result: CompilerResult, + harnessSettings: TestCaseParser.CompilerSettings & HarnessOptions, + options: ts.CompilerOptions, + // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file + currentDirectory: string) { + if (options.declaration && result.errors.length === 0 && result.declFilesCode.length !== result.files.length) { + throw new Error("There were no errors and declFiles generated did not match number of js files generated"); + } - function addDtsFile(file: TestFile, dtsFiles: TestFile[]) { - if (isDTS(file.unitName)) { - dtsFiles.push(file); - } - else if (isTS(file.unitName)) { - const declFile = findResultCodeFile(file.unitName); - if (declFile && !findUnit(declFile.fileName, declInputFiles) && !findUnit(declFile.fileName, declOtherFiles)) { - dtsFiles.push({ unitName: declFile.fileName, content: declFile.code }); - } - } + const declInputFiles: TestFile[] = []; + const declOtherFiles: TestFile[] = []; - function findResultCodeFile(fileName: string) { - const sourceFile = result.program.getSourceFile(fileName); - assert(sourceFile, "Program has no source file with name '" + fileName + "'"); - // Is this file going to be emitted separately - let sourceFileName: string; - const outFile = options.outFile || options.out; - if (ts.isExternalModule(sourceFile) || !outFile) { - if (options.outDir) { - let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, result.currentDirectoryForProgram); - sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), ""); - sourceFileName = ts.combinePaths(options.outDir, sourceFilePath); - } - else { - sourceFileName = sourceFile.fileName; - } - } - else { - // Goes to single --out file - sourceFileName = outFile; - } + // if the .d.ts is non-empty, confirm it compiles correctly as well + if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) { + ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles)); + ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles)); + const output = compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory); - const dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts"; + return { declInputFiles, declOtherFiles, declResult: output.result }; + } - return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); + function addDtsFile(file: TestFile, dtsFiles: TestFile[]) { + if (isDTS(file.unitName)) { + dtsFiles.push(file); + } + else if (isTS(file.unitName)) { + const declFile = findResultCodeFile(file.unitName); + if (declFile && !findUnit(declFile.fileName, declInputFiles) && !findUnit(declFile.fileName, declOtherFiles)) { + dtsFiles.push({ unitName: declFile.fileName, content: declFile.code }); } + } + } - function findUnit(fileName: string, units: TestFile[]) { - return ts.forEach(units, unit => unit.unitName === fileName ? unit : undefined); + function findResultCodeFile(fileName: string) { + const sourceFile = result.program.getSourceFile(fileName); + assert(sourceFile, "Program has no source file with name '" + fileName + "'"); + // Is this file going to be emitted separately + let sourceFileName: string; + const outFile = options.outFile || options.out; + if (ts.isExternalModule(sourceFile) || !outFile) { + if (options.outDir) { + let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, result.currentDirectoryForProgram); + sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), ""); + sourceFileName = ts.combinePaths(options.outDir, sourceFilePath); + } + else { + sourceFileName = sourceFile.fileName; } } + else { + // Goes to single --out file + sourceFileName = outFile; + } + + const dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts"; + + return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); + } + + function findUnit(fileName: string, units: TestFile[]) { + return ts.forEach(units, unit => unit.unitName === fileName ? unit : undefined); } } @@ -1388,7 +1312,7 @@ namespace Harness { constructor(fileResults: GeneratedFile[], errors: ts.Diagnostic[], public program: ts.Program, public currentDirectoryForProgram: string, private sourceMapData: ts.SourceMapData[]) { - fileResults.forEach(emittedFile => { + for (const emittedFile of fileResults) { if (isDTS(emittedFile.fileName)) { // .d.ts file, add to declFiles emit this.declFilesCode.push(emittedFile); @@ -1403,7 +1327,7 @@ namespace Harness { else { throw new Error("Unrecognized file extension for file " + emittedFile.fileName); } - }); + } this.errors = errors; } diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 0c267c38f14a6..3c7814df56258 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -7,7 +7,7 @@ namespace Harness.LanguageService { export class ScriptInfo { public version: number = 1; public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = []; - public lineMap: number[] = undefined; + private lineMap: number[] = undefined; constructor(public fileName: string, public content: string) { this.setContent(content); @@ -15,7 +15,11 @@ namespace Harness.LanguageService { private setContent(content: string): void { this.content = content; - this.lineMap = ts.computeLineStarts(content); + this.lineMap = undefined; + } + + public getLineMap(): number[] { + return this.lineMap || (this.lineMap = ts.computeLineStarts(this.content)); } public updateContent(content: string): void { @@ -164,7 +168,7 @@ namespace Harness.LanguageService { const script: ScriptInfo = this.fileNameToScript[fileName]; assert.isNotNull(script); - return ts.computeLineAndCharacterOfPosition(script.lineMap, position); + return ts.computeLineAndCharacterOfPosition(script.getLineMap(), position); } } diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts index fc1397b294c70..ce570a7d6ad01 100644 --- a/src/harness/rwcRunner.ts +++ b/src/harness/rwcRunner.ts @@ -126,7 +126,7 @@ namespace RWC { // Emit the results compilerOptions = null; - const output = Harness.Compiler.HarnessCompiler.compileFiles( + const output = Harness.Compiler.compileFiles( inputFiles, otherFiles, /* harnessOptions */ undefined, @@ -202,7 +202,7 @@ namespace RWC { it("has the expected errors in generated declaration files", () => { if (compilerOptions.declaration && !compilerResult.errors.length) { Harness.Baseline.runBaseline("has the expected errors in generated declaration files", baseName + ".dts.errors.txt", () => { - const declFileCompilationResult = Harness.Compiler.HarnessCompiler.compileDeclarationFiles( + const declFileCompilationResult = Harness.Compiler.compileDeclarationFiles( inputFiles, otherFiles, compilerResult, /*harnessSettings*/ undefined, compilerOptions, currentDirectory); if (declFileCompilationResult.declResult.errors.length === 0) { diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts index 859f10dc4cc9b..262145b476405 100644 --- a/src/harness/test262Runner.ts +++ b/src/harness/test262Runner.ts @@ -32,7 +32,6 @@ class Test262BaselineRunner extends RunnerBase { filename: string; compilerResult: Harness.Compiler.CompilerResult; inputFiles: Harness.Compiler.TestFile[]; - program: ts.Program; }; before(() => { @@ -50,10 +49,9 @@ class Test262BaselineRunner extends RunnerBase { filename: testFilename, inputFiles: inputFiles, compilerResult: undefined, - program: undefined, }; - const output = Harness.Compiler.HarnessCompiler.compileFiles( + const output = Harness.Compiler.compileFiles( [Test262BaselineRunner.helperFile].concat(inputFiles), /*otherFiles*/ [], /* harnessOptions */ undefined, @@ -61,7 +59,6 @@ class Test262BaselineRunner extends RunnerBase { /* currentDirectory */ undefined ); testState.compilerResult = output.result; - testState.program = output.program; }); after(() => { @@ -86,14 +83,14 @@ class Test262BaselineRunner extends RunnerBase { }, false, Test262BaselineRunner.baselineOptions); }); - it("satisfies inletiants", () => { - const sourceFile = testState.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename)); + it("satisfies invariants", () => { + const sourceFile = testState.compilerResult.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename)); Utils.assertInvariants(sourceFile, /*parent:*/ undefined); }); it("has the expected AST", () => { Harness.Baseline.runBaseline("has the expected AST", testState.filename + ".AST.txt", () => { - const sourceFile = testState.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename)); + const sourceFile = testState.compilerResult.program.getSourceFile(Test262BaselineRunner.getTestFilePath(testState.filename)); return Utils.sourceFileToJSON(sourceFile); }, false, Test262BaselineRunner.baselineOptions); }); From eda75fbfd528875bb23d3eb07cb3afb689d51829 Mon Sep 17 00:00:00 2001 From: tobisek Date: Sun, 15 Nov 2015 15:03:43 +0200 Subject: [PATCH 248/353] added default chrome path for Mac OS X --- tests/webTestServer.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts index 6bd15359e3f6b..dab552e26194e 100644 --- a/tests/webTestServer.ts +++ b/tests/webTestServer.ts @@ -269,6 +269,9 @@ if ((browser && browser === 'chrome')) { case "win64": defaultChromePath = "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe"; break; + case "darwin": + defaultChromePath = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"; + break; case "linux": defaultChromePath = "/opt/google/chrome/chrome" break; From 078ed3f4856c527cd4cfcfc23166d1f74c041ea8 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 09:49:58 -0800 Subject: [PATCH 249/353] use normalized absolute file names when doing consistency check --- src/compiler/program.ts | 16 +++++++-------- tests/cases/unittests/moduleResolution.ts | 25 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 86fbc2e62591c..57207d0564a25 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -800,12 +800,12 @@ namespace ts { } // Get source file from normalized fileName - function findSourceFile(fileName: string, normalizedAbsolutePath: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { - if (filesByName.contains(normalizedAbsolutePath)) { - const file = filesByName.get(normalizedAbsolutePath); + function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile { + if (filesByName.contains(path)) { + const file = filesByName.get(path); // try to check if we've already seen this file but with a different casing in path // NOTE: this only makes sense for case-insensitive file systems - if (file && options.forceConsistentCasingInFileNames && getNormalizedAbsolutePath(file.fileName, currentDirectory) !== normalizedAbsolutePath) { + if (file && options.forceConsistentCasingInFileNames && getNormalizedAbsolutePath(file.fileName, currentDirectory) !== getNormalizedAbsolutePath(fileName, currentDirectory)) { reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd); } @@ -823,18 +823,18 @@ namespace ts { } }); - filesByName.set(normalizedAbsolutePath, file); + filesByName.set(path, file); if (file) { - file.path = normalizedAbsolutePath; + file.path = path; if (host.useCaseSensitiveFileNames()) { // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case - const existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath); + const existingFile = filesByNameIgnoreCase.get(path); if (existingFile) { reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd); } else { - filesByNameIgnoreCase.set(normalizedAbsolutePath, file); + filesByNameIgnoreCase.set(path, file); } } diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index c53cad5725abc..9e316266bf689 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -354,6 +354,31 @@ export = C; "moduleC.ts": "export var x" }; test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true }, "", /* useCaseSensitiveFileNames */ false, ["moduleA.ts", "moduleB.ts", "moduleC.ts"], [1149, 1149]); + }); + + it("should fail when module names in 'require' calls has inconsistent casing and current directory has uppercase chars", () => { + const files: Map = { + "/a/B/c/moduleA.ts": `import a = require("./ModuleC")`, + "/a/B/c/moduleB.ts": `import a = require("./moduleC")`, + "/a/B/c/moduleC.ts": "export var x", + "/a/B/c/moduleD.ts": ` +import a = require("./moduleA.ts"); +import b = require("./moduleB.ts"); + ` + }; + test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true }, "/a/B/c", /* useCaseSensitiveFileNames */ false, ["moduleD.ts"], [1149]); + }); + it("should not fail when module names in 'require' calls has consistent casing and current directory has uppercase chars", () => { + const files: Map = { + "/a/B/c/moduleA.ts": `import a = require("./moduleC")`, + "/a/B/c/moduleB.ts": `import a = require("./moduleC")`, + "/a/B/c/moduleC.ts": "export var x", + "/a/B/c/moduleD.ts": ` +import a = require("./moduleA.ts"); +import b = require("./moduleB.ts"); + ` + }; + test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true }, "/a/B/c", /* useCaseSensitiveFileNames */ false, ["moduleD.ts"], []); }) }); } \ No newline at end of file From 8039909913be85531b09cef6cc31a61542cc5408 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 10:36:13 -0800 Subject: [PATCH 250/353] remove Tao generation --- src/harness/fourslash.ts | 282 +++++---------------------------- src/harness/fourslashRunner.ts | 50 ------ 2 files changed, 37 insertions(+), 295 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index f62e1c5841267..88458beaba4b8 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -48,12 +48,6 @@ namespace FourSlash { ranges: Range[]; } - export interface TestXmlData { - invalidReason: string; - originalName: string; - actions: string[]; - } - interface MemberListData { result: { maybeInaccurate: boolean; @@ -84,14 +78,14 @@ namespace FourSlash { marker?: Marker; } - interface ILocationInformation { + interface LocationInformation { position: number; sourcePosition: number; sourceLine: number; sourceColumn: number; } - interface IRangeLocationInformation extends ILocationInformation { + interface RangeLocationInformation extends LocationInformation { marker?: Marker; } @@ -134,11 +128,6 @@ namespace FourSlash { return settings; } - export let currentTestState: TestState = null; - function assertionMessage(msg: string) { - return "\nMarker: " + currentTestState.lastKnownMarker + "\nChecking: " + msg + "\n\n"; - } - export class TestCancellationToken implements ts.HostCancellationToken { // 0 - cancelled // >0 - not cancelled @@ -216,9 +205,6 @@ namespace FourSlash { public formatCodeOptions: ts.FormatCodeOptions; - private scenarioActions: string[] = []; - private taoInvalidReason: string = null; - private inputFiles: ts.Map = {}; // Map between inputFile's fileName and its content for easily looking up when resolving references // Add input file which has matched file name with the given reference-file path. @@ -338,7 +324,6 @@ namespace FourSlash { this.testData.files.forEach(file => { const fileName = file.fileName.replace(Harness.IO.directoryName(file.fileName), "").substr(1); const fileNameWithoutExtension = fileName.substr(0, fileName.lastIndexOf(".")); - this.scenarioActions.push(""); }); // Open the first file by default @@ -367,21 +352,11 @@ namespace FourSlash { public goToPosition(pos: number) { this.currentCaretPosition = pos; - - const lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName)); - const lineCharPos = ts.computeLineAndCharacterOfPosition(lineStarts, pos); - this.scenarioActions.push(``); } public moveCaretRight(count = 1) { this.currentCaretPosition += count; this.currentCaretPosition = Math.min(this.currentCaretPosition, this.getFileContent(this.activeFile.fileName).length); - if (count > 0) { - this.scenarioActions.push(``); - } - else { - this.scenarioActions.push(``); - } } // Opens a file given its 0-based index or fileName @@ -391,9 +366,6 @@ namespace FourSlash { const fileToOpen: FourSlashFile = this.findFile(indexOrName); fileToOpen.fileName = ts.normalizeSlashes(fileToOpen.fileName); this.activeFile = fileToOpen; - const fileName = fileToOpen.fileName.replace(Harness.IO.directoryName(fileToOpen.fileName), "").substr(1); - this.scenarioActions.push(``); - // Let the host know that this file is now open this.languageServiceAdapterHost.openFile(fileToOpen.fileName, content); } @@ -407,8 +379,6 @@ namespace FourSlash { const exists = this.anyErrorInRange(predicate, startMarker, endMarker); - this.taoInvalidReason = "verifyErrorExistsBetweenMarkers NYI"; - if (exists !== negative) { this.printErrorLog(negative, this.getAllDiagnostics()); throw new Error("Failure between markers: " + startMarkerName + ", " + endMarkerName); @@ -421,7 +391,11 @@ namespace FourSlash { } private messageAtLastKnownMarker(message: string) { - return "Marker: " + currentTestState.lastKnownMarker + "\n" + message; + return "Marker: " + this.lastKnownMarker + "\n" + message; + } + + private assertionMessageAtLastKnownMarker(msg: string) { + return "\nMarker: " + this.lastKnownMarker + "\nChecking: " + msg + "\n\n"; } private getDiagnostics(fileName: string): ts.Diagnostic[] { @@ -461,8 +435,6 @@ namespace FourSlash { }; } - this.taoInvalidReason = "verifyErrorExistsAfterMarker NYI"; - const exists = this.anyErrorInRange(predicate, marker); const diagnostics = this.getAllDiagnostics(); @@ -511,8 +483,6 @@ namespace FourSlash { const errors = this.getDiagnostics(this.activeFile.fileName); const actual = errors.length; - this.scenarioActions.push(``); - if (actual !== expected) { this.printErrorLog(/*expectErrors*/ false, errors); const errorMsg = "Actual number of errors (" + actual + ") does not match expected number (" + expected + ")"; @@ -527,8 +497,6 @@ namespace FourSlash { throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName); } - this.taoInvalidReason = "verifyEval impossible"; - const evaluation = new Function(`${emit.outputFiles[0].text};\r\nreturn (${expr});`)(); if (evaluation !== value) { this.raiseError(`Expected evaluation of expression "${expr}" to equal "${value}", but got "${evaluation}"`); @@ -540,7 +508,6 @@ namespace FourSlash { if (emit.outputFiles.length !== 1) { throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName); } - this.taoInvalidReason = "verifyGetEmitOutputForCurrentFile impossible"; const actual = emit.outputFiles[0].text; if (actual !== expected) { this.raiseError(`Expected emit output to be "${expected}", but got "${actual}"`); @@ -548,13 +515,6 @@ namespace FourSlash { } public verifyMemberListContains(symbol: string, text?: string, documentation?: string, kind?: string) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); - - if (text || documentation || kind) { - this.taoInvalidReason = "verifyMemberListContains only supports the \"symbol\" parameter"; - } - const members = this.getMemberListAtCaret(); if (members) { this.assertItemInCompletionList(members.entries, symbol, text, documentation, kind); @@ -565,18 +525,9 @@ namespace FourSlash { } public verifyMemberListCount(expectedCount: number, negative: boolean) { - if (expectedCount === 0) { - if (negative) { - this.verifyMemberListIsEmpty(/*negative*/ false); - return; - } - else { - this.scenarioActions.push(""); - } - } - else { - this.scenarioActions.push(""); - this.scenarioActions.push(``); + if (expectedCount === 0 && negative) { + this.verifyMemberListIsEmpty(/*negative*/ false); + return; } const members = this.getMemberListAtCaret(); @@ -594,9 +545,6 @@ namespace FourSlash { } public verifyMemberListDoesNotContain(symbol: string) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); - const members = this.getMemberListAtCaret(); if (members && members.entries.filter(e => e.name === symbol).length !== 0) { this.raiseError(`Member list did contain ${symbol}`); @@ -604,8 +552,6 @@ namespace FourSlash { } public verifyCompletionListItemsCountIsGreaterThan(count: number, negative: boolean) { - this.taoInvalidReason = "verifyCompletionListItemsCountIsGreaterThan NYI"; - const completions = this.getCompletionListAtCaret(); const itemsCount = completions.entries.length; @@ -622,13 +568,6 @@ namespace FourSlash { } public verifyMemberListIsEmpty(negative: boolean) { - if (negative) { - this.scenarioActions.push(""); - } - else { - this.scenarioActions.push(""); - } - const members = this.getMemberListAtCaret(); if ((!members || members.entries.length === 0) && negative) { this.raiseError("Member list is empty at Caret"); @@ -647,8 +586,6 @@ namespace FourSlash { } public verifyCompletionListIsEmpty(negative: boolean) { - this.scenarioActions.push(""); - const completions = this.getCompletionListAtCaret(); if ((!completions || completions.entries.length === 0) && negative) { this.raiseError("Completion list is empty at caret at position " + this.activeFile.fileName + " " + this.currentCaretPosition); @@ -716,8 +653,6 @@ namespace FourSlash { // and keep it in the list of filtered entry. return true; } - this.scenarioActions.push(""); - this.scenarioActions.push(``); const completions = this.getCompletionListAtCaret(); if (completions) { @@ -745,24 +680,20 @@ namespace FourSlash { } public verifyCompletionEntryDetails(entryName: string, expectedText: string, expectedDocumentation?: string, kind?: string) { - this.taoInvalidReason = "verifyCompletionEntryDetails NYI"; - const details = this.getCompletionEntryDetails(entryName); - assert.equal(ts.displayPartsToString(details.displayParts), expectedText, assertionMessage("completion entry details text")); + assert.equal(ts.displayPartsToString(details.displayParts), expectedText, this.assertionMessageAtLastKnownMarker("completion entry details text")); if (expectedDocumentation !== undefined) { - assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation, assertionMessage("completion entry documentation")); + assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation, this.assertionMessageAtLastKnownMarker("completion entry documentation")); } if (kind !== undefined) { - assert.equal(details.kind, kind, assertionMessage("completion entry kind")); + assert.equal(details.kind, kind, this.assertionMessageAtLastKnownMarker("completion entry kind")); } } public verifyReferencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) { - this.taoInvalidReason = "verifyReferencesAtPositionListContains NYI"; - const references = this.getReferencesAtCaret(); if (!references || references.length === 0) { @@ -784,8 +715,6 @@ namespace FourSlash { } public verifyReferencesCountIs(count: number, localFilesOnly = true) { - this.taoInvalidReason = "verifyReferences NYI"; - const references = this.getReferencesAtCaret(); let referencesCount = 0; @@ -845,13 +774,6 @@ namespace FourSlash { } public verifyQuickInfoString(negative: boolean, expectedText?: string, expectedDocumentation?: string) { - [expectedText, expectedDocumentation].forEach(str => { - if (str) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); - } - }); - const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition); const actualQuickInfoText = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.displayParts) : ""; const actualQuickInfoDocumentation = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.documentation) : ""; @@ -871,7 +793,7 @@ namespace FourSlash { } // TODO: should be '==='? if (expectedDocumentation != undefined) { - assert.equal(actualQuickInfoDocumentation, expectedDocumentation, assertionMessage("quick info doc")); + assert.equal(actualQuickInfoDocumentation, expectedDocumentation, this.assertionMessageAtLastKnownMarker("quick info doc")); } } } @@ -879,8 +801,6 @@ namespace FourSlash { public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); function getDisplayPartsJson(displayParts: ts.SymbolDisplayPart[]) { let result = ""; @@ -947,8 +867,6 @@ namespace FourSlash { } public verifyQuickInfoExists(negative: boolean) { - this.taoInvalidReason = "verifyQuickInfoExists NYI"; - const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition); if (negative) { if (actualQuickInfo) { @@ -963,8 +881,6 @@ namespace FourSlash { } public verifyCurrentSignatureHelpIs(expected: string) { - this.taoInvalidReason = "verifyCurrentSignatureHelpIs NYI"; - const help = this.getActiveSignatureHelpItem(); assert.equal( ts.displayPartsToString(help.prefixDisplayParts) + @@ -973,75 +889,51 @@ namespace FourSlash { } public verifyCurrentParameterIsletiable(isVariable: boolean) { - this.taoInvalidReason = "verifyCurrentParameterIsletiable NYI"; - const signature = this.getActiveSignatureHelpItem(); assert.isNotNull(signature); assert.equal(isVariable, signature.isVariadic); } public verifyCurrentParameterHelpName(name: string) { - this.taoInvalidReason = "verifyCurrentParameterHelpName NYI"; - const activeParameter = this.getActiveParameter(); const activeParameterName = activeParameter.name; assert.equal(activeParameterName, name); } public verifyCurrentParameterSpanIs(parameter: string) { - this.taoInvalidReason = "verifyCurrentParameterSpanIs NYI"; - const activeSignature = this.getActiveSignatureHelpItem(); const activeParameter = this.getActiveParameter(); assert.equal(ts.displayPartsToString(activeParameter.displayParts), parameter); } public verifyCurrentParameterHelpDocComment(docComment: string) { - this.taoInvalidReason = "verifyCurrentParameterHelpDocComment NYI"; - const activeParameter = this.getActiveParameter(); const activeParameterDocComment = activeParameter.documentation; - assert.equal(ts.displayPartsToString(activeParameterDocComment), docComment, assertionMessage("current parameter Help DocComment")); + assert.equal(ts.displayPartsToString(activeParameterDocComment), docComment, this.assertionMessageAtLastKnownMarker("current parameter Help DocComment")); } public verifyCurrentSignatureHelpParameterCount(expectedCount: number) { - this.taoInvalidReason = "verifyCurrentSignatureHelpParameterCount NYI"; - assert.equal(this.getActiveSignatureHelpItem().parameters.length, expectedCount); } - public verifyCurrentSignatureHelpTypeParameterCount(expectedCount: number) { - this.taoInvalidReason = "verifyCurrentSignatureHelpTypeParameterCount NYI"; - - // assert.equal(this.getActiveSignatureHelpItem().typeParameters.length, expectedCount); - } - public verifyCurrentSignatureHelpDocComment(docComment: string) { - this.taoInvalidReason = "verifyCurrentSignatureHelpDocComment NYI"; - const actualDocComment = this.getActiveSignatureHelpItem().documentation; - assert.equal(ts.displayPartsToString(actualDocComment), docComment, assertionMessage("current signature help doc comment")); + assert.equal(ts.displayPartsToString(actualDocComment), docComment, this.assertionMessageAtLastKnownMarker("current signature help doc comment")); } public verifySignatureHelpCount(expected: number) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); - const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition); const actual = help && help.items ? help.items.length : 0; assert.equal(actual, expected); } public verifySignatureHelpArgumentCount(expected: number) { - this.taoInvalidReason = "verifySignatureHelpArgumentCount NYI"; const signatureHelpItems = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition); const actual = signatureHelpItems.argumentCount; assert.equal(actual, expected); } public verifySignatureHelpPresent(shouldBePresent = true) { - this.taoInvalidReason = "verifySignatureHelpPresent NYI"; - const actual = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition); if (shouldBePresent) { if (!actual) { @@ -1184,13 +1076,10 @@ namespace FourSlash { } public getBreakpointStatementLocation(pos: number) { - this.taoInvalidReason = "getBreakpointStatementLocation NYI"; return this.languageService.getBreakpointStatementAtPosition(this.activeFile.fileName, pos); } public baselineCurrentFileBreakpointLocations() { - this.taoInvalidReason = "baselineCurrentFileBreakpointLocations impossible"; - Harness.Baseline.runBaseline( "Breakpoint Locations for " + this.activeFile.fileName, this.testData.globalOptions[metadataOptionNames.baselineFile], @@ -1201,7 +1090,6 @@ namespace FourSlash { } public baselineGetEmitOutput() { - this.taoInvalidReason = "baselineGetEmitOutput impossible"; // Find file to be emitted const emitFiles: FourSlashFile[] = []; // List of FourSlashFile that has emitThisFile flag on @@ -1327,8 +1215,6 @@ namespace FourSlash { } public deleteChar(count = 1) { - this.scenarioActions.push(``); - let offset = this.currentCaretPosition; const ch = ""; @@ -1340,7 +1226,7 @@ namespace FourSlash { this.updateMarkersForEdit(this.activeFile.fileName, offset, offset + 1, ch); if (i % checkCadence === 0) { - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } // Handle post-keystroke formatting @@ -1357,20 +1243,16 @@ namespace FourSlash { this.currentCaretPosition = offset; this.fixCaretPosition(); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } public replace(start: number, length: number, text: string) { - this.taoInvalidReason = "replace NYI"; - this.languageServiceAdapterHost.editScript(this.activeFile.fileName, start, start + length, text); this.updateMarkersForEdit(this.activeFile.fileName, start, start + length, text); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } public deleteCharBehindMarker(count = 1) { - this.scenarioActions.push(``); - let offset = this.currentCaretPosition; const ch = ""; const checkCadence = (count >> 2) + 1; @@ -1382,7 +1264,7 @@ namespace FourSlash { this.updateMarkersForEdit(this.activeFile.fileName, offset, offset + 1, ch); if (i % checkCadence === 0) { - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } // Handle post-keystroke formatting @@ -1398,18 +1280,11 @@ namespace FourSlash { this.currentCaretPosition = offset; this.fixCaretPosition(); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } // Enters lines of text at the current caret position public type(text: string) { - if (text === "") { - this.taoInvalidReason = "Test used empty-insert workaround."; - } - else { - this.scenarioActions.push(``); - } - return this.typeHighFidelity(text); } @@ -1440,7 +1315,7 @@ namespace FourSlash { } if (i % checkCadence === 0) { - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); // this.languageService.getSyntacticDiagnostics(this.activeFile.fileName); // this.languageService.getSemanticDiagnostics(this.activeFile.fileName); } @@ -1459,18 +1334,16 @@ namespace FourSlash { this.currentCaretPosition = offset; this.fixCaretPosition(); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } // Enters text as if the user had pasted it public paste(text: string) { - this.scenarioActions.push(``); - const start = this.currentCaretPosition; let offset = this.currentCaretPosition; this.languageServiceAdapterHost.editScript(this.activeFile.fileName, offset, offset, text); this.updateMarkersForEdit(this.activeFile.fileName, offset, offset, text); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); offset += text.length; // Handle formatting @@ -1478,7 +1351,7 @@ namespace FourSlash { const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, offset, this.formatCodeOptions); if (edits.length) { offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } } @@ -1486,10 +1359,10 @@ namespace FourSlash { this.currentCaretPosition = offset; this.fixCaretPosition(); - this.checkPostEditInletiants(); + this.checkPostEditInvariants(); } - private checkPostEditInletiants() { + private checkPostEditInvariants() { if (this.testType !== FourSlashTestType.Native) { // getSourcefile() results can not be serialized. Only perform these verifications // if running against a native LS object. @@ -1560,16 +1433,12 @@ namespace FourSlash { } public formatDocument() { - this.scenarioActions.push(""); - const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeOptions); this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); this.fixCaretPosition(); } public formatSelection(start: number, end: number) { - this.taoInvalidReason = "formatSelection NYI"; - const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeOptions); this.currentCaretPosition += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true); this.fixCaretPosition(); @@ -1603,13 +1472,6 @@ namespace FourSlash { } public goToDefinition(definitionIndex: number) { - if (definitionIndex === 0) { - this.scenarioActions.push(""); - } - else { - this.taoInvalidReason = "GoToDefinition not supported for non-zero definition indices"; - } - const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition); if (!definitions || !definitions.length) { this.raiseError("goToDefinition failed - expected to at least one definition location but got 0"); @@ -1625,13 +1487,6 @@ namespace FourSlash { } public goToTypeDefinition(definitionIndex: number) { - if (definitionIndex === 0) { - this.scenarioActions.push(""); - } - else { - this.taoInvalidReason = "GoToTypeDefinition not supported for non-zero definition indices"; - } - const definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition); if (!definitions || !definitions.length) { this.raiseError("goToTypeDefinition failed - expected to at least one definition location but got 0"); @@ -1647,8 +1502,6 @@ namespace FourSlash { } public verifyDefinitionLocationExists(negative: boolean) { - this.taoInvalidReason = "verifyDefinitionLocationExists NYI"; - const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition); const foundDefinitions = definitions && definitions.length; @@ -1680,8 +1533,6 @@ namespace FourSlash { } public verifyDefinitionsName(negative: boolean, expectedName: string, expectedContainerName: string) { - this.taoInvalidReason = "verifyDefinititionsInfo NYI"; - const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition); const actualDefinitionName = definitions && definitions.length ? definitions[0].name : ""; const actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : ""; @@ -1706,8 +1557,6 @@ namespace FourSlash { } public verifyCaretAtMarker(markerName = "") { - this.taoInvalidReason = "verifyCaretAtMarker NYI"; - const pos = this.getMarkerByName(markerName); if (pos.fileName !== this.activeFile.fileName) { throw new Error(`verifyCaretAtMarker failed - expected to be in file "${pos.fileName}", but was in file "${this.activeFile.fileName}"`); @@ -1726,8 +1575,6 @@ namespace FourSlash { } public verifyIndentationAtCurrentPosition(numberOfSpaces: number, indentStyle: ts.IndentStyle = ts.IndentStyle.Smart) { - this.taoInvalidReason = "verifyIndentationAtCurrentPosition NYI"; - const actual = this.getIndentation(this.activeFile.fileName, this.currentCaretPosition, indentStyle); const lineCol = this.getLineColStringAtPosition(this.currentCaretPosition); if (actual !== numberOfSpaces) { @@ -1736,8 +1583,6 @@ namespace FourSlash { } public verifyIndentationAtPosition(fileName: string, position: number, numberOfSpaces: number, indentStyle: ts.IndentStyle = ts.IndentStyle.Smart) { - this.taoInvalidReason = "verifyIndentationAtPosition NYI"; - const actual = this.getIndentation(fileName, position, indentStyle); const lineCol = this.getLineColStringAtPosition(position); if (actual !== numberOfSpaces) { @@ -1746,8 +1591,6 @@ namespace FourSlash { } public verifyCurrentLineContent(text: string) { - this.taoInvalidReason = "verifyCurrentLineContent NYI"; - const actual = this.getCurrentLineContent(); if (actual !== text) { throw new Error("verifyCurrentLineContent\n" + @@ -1757,8 +1600,6 @@ namespace FourSlash { } public verifyCurrentFileContent(text: string) { - this.taoInvalidReason = "verifyCurrentFileContent NYI"; - const actual = this.getFileContent(this.activeFile.fileName); const replaceNewlines = (str: string) => str.replace(/\r\n/g, "\n"); if (replaceNewlines(actual) !== replaceNewlines(text)) { @@ -1769,8 +1610,6 @@ namespace FourSlash { } public verifyTextAtCaretIs(text: string) { - this.taoInvalidReason = "verifyCurrentFileContent NYI"; - const actual = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition, this.currentCaretPosition + text.length); if (actual !== text) { throw new Error("verifyTextAtCaretIs\n" + @@ -1780,8 +1619,6 @@ namespace FourSlash { } public verifyCurrentNameOrDottedNameSpanText(text: string) { - this.taoInvalidReason = "verifyCurrentNameOrDottedNameSpanText NYI"; - const span = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, this.currentCaretPosition, this.currentCaretPosition); if (!span) { this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" + @@ -1798,13 +1635,10 @@ namespace FourSlash { } private getNameOrDottedNameSpan(pos: number) { - this.taoInvalidReason = "getNameOrDottedNameSpan NYI"; return this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, pos, pos); } public baselineCurrentFileNameOrDottedNameSpans() { - this.taoInvalidReason = "baselineCurrentFileNameOrDottedNameSpans impossible"; - Harness.Baseline.runBaseline( "Name OrDottedNameSpans for " + this.activeFile.fileName, this.testData.globalOptions[metadataOptionNames.baselineFile], @@ -1898,8 +1732,6 @@ namespace FourSlash { } public verifyOutliningSpans(spans: TextSpan[]) { - this.taoInvalidReason = "verifyOutliningSpans NYI"; - const actual = this.languageService.getOutliningSpans(this.activeFile.fileName); if (actual.length !== spans.length) { @@ -1968,8 +1800,6 @@ namespace FourSlash { } public verifyMatchingBracePosition(bracePosition: number, expectedMatchPosition: number) { - this.taoInvalidReason = "verifyMatchingBracePosition NYI"; - const actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition); if (actual.length !== 2) { @@ -1993,8 +1823,6 @@ namespace FourSlash { } public verifyNoMatchingBracePosition(bracePosition: number) { - this.taoInvalidReason = "verifyNoMatchingBracePosition NYI"; - const actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition); if (actual.length !== 0) { @@ -2007,8 +1835,6 @@ namespace FourSlash { Report an error if expected value and actual value do not match. */ public verifyNavigationItemsCount(expected: number, searchValue: string, matchKind?: string) { - this.taoInvalidReason = "verifyNavigationItemsCount NYI"; - const items = this.languageService.getNavigateToItems(searchValue); let actual = 0; let item: ts.NavigateToItem = null; @@ -2037,8 +1863,6 @@ namespace FourSlash { matchKind: string, fileName?: string, parentName?: string) { - this.taoInvalidReason = "verifyNavigationItemsListContains NYI"; - const items = this.languageService.getNavigateToItems(searchValue); if (!items || items.length === 0) { @@ -2063,8 +1887,6 @@ namespace FourSlash { } public verifyGetScriptLexicalStructureListCount(expected: number) { - this.taoInvalidReason = "verifyNavigationItemsListContains impossible"; - const items = this.languageService.getNavigationBarItems(this.activeFile.fileName); const actual = this.getNavigationBarItemsCount(items); @@ -2086,8 +1908,6 @@ namespace FourSlash { } public verifyGetScriptLexicalStructureListContains(name: string, kind: string) { - this.taoInvalidReason = "verifyGetScriptLexicalStructureListContains impossible"; - const items = this.languageService.getNavigationBarItems(this.activeFile.fileName); if (!items || items.length === 0) { @@ -2148,8 +1968,6 @@ namespace FourSlash { } public verifyOccurrencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) { - this.taoInvalidReason = "verifyOccurrencesAtPositionListContains NYI"; - const occurrences = this.getOccurrencesAtCurrentPosition(); if (!occurrences || occurrences.length === 0) { @@ -2170,8 +1988,6 @@ namespace FourSlash { } public verifyOccurrencesAtPositionListCount(expectedCount: number) { - this.taoInvalidReason = "verifyOccurrencesAtPositionListCount NYI"; - const occurrences = this.getOccurrencesAtCurrentPosition(); const actualCount = occurrences ? occurrences.length : 0; if (expectedCount !== actualCount) { @@ -2185,8 +2001,6 @@ namespace FourSlash { } public verifyDocumentHighlightsAtPositionListContains(fileName: string, start: number, end: number, fileNamesToSearch: string[], kind?: string) { - this.taoInvalidReason = "verifyDocumentHighlightsAtPositionListContains NYI"; - const documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch); if (!documentHighlights || documentHighlights.length === 0) { @@ -2213,8 +2027,6 @@ namespace FourSlash { } public verifyDocumentHighlightsAtPositionListCount(expectedCount: number, fileNamesToSearch: string[]) { - this.taoInvalidReason = "verifyDocumentHighlightsAtPositionListCount NYI"; - const documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNamesToSearch); const actualCount = documentHighlights ? documentHighlights.reduce((currentCount, { highlightSpans }) => currentCount + highlightSpans.length, 0) @@ -2255,13 +2067,6 @@ namespace FourSlash { } private assertItemInCompletionList(items: ts.CompletionEntry[], name: string, text?: string, documentation?: string, kind?: string) { - this.scenarioActions.push(""); - this.scenarioActions.push(``); - - if (text || documentation || kind) { - this.taoInvalidReason = "assertItemInCompletionList only supports the \"name\" parameter"; - } - for (let i = 0; i < items.length; i++) { const item = items[i]; if (item.name === name) { @@ -2269,15 +2074,15 @@ namespace FourSlash { const details = this.getCompletionEntryDetails(item.name); if (documentation !== undefined) { - assert.equal(ts.displayPartsToString(details.documentation), documentation, assertionMessage("completion item documentation for " + name)); + assert.equal(ts.displayPartsToString(details.documentation), documentation, this.assertionMessageAtLastKnownMarker("completion item documentation for " + name)); } if (text !== undefined) { - assert.equal(ts.displayPartsToString(details.displayParts), text, assertionMessage("completion item detail text for " + name)); + assert.equal(ts.displayPartsToString(details.displayParts), text, this.assertionMessageAtLastKnownMarker("completion item detail text for " + name)); } } if (kind !== undefined) { - assert.equal(item.kind, kind, assertionMessage("completion item kind for " + name)); + assert.equal(item.kind, kind, this.assertionMessageAtLastKnownMarker("completion item kind for " + name)); } return; @@ -2352,14 +2157,6 @@ namespace FourSlash { return text.replace(/ /g, "\u00B7").replace(/\r/g, "\u00B6").replace(/\n/g, "\u2193\n").replace(/\t/g, "\u2192\ "); } - public getTestXmlData(): TestXmlData { - return { - actions: this.scenarioActions, - invalidReason: this.taoInvalidReason, - originalName: "" - }; - } - public setCancelled(numberOfCalls: number): void { this.cancellationToken.setCancelled(numberOfCalls); } @@ -2372,11 +2169,9 @@ namespace FourSlash { // TOOD: should these just use the Harness's stdout/stderr? const fsOutput = new Harness.Compiler.WriterAggregator(); const fsErrors = new Harness.Compiler.WriterAggregator(); - export let xmlData: TestXmlData[] = []; export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) { const content = Harness.IO.readFile(fileName); - const xml = runFourSlashTestContent(basePath, testType, content, fileName); - xmlData.push(xml); + runFourSlashTestContent(basePath, testType, content, fileName); } // We don't want to recompile 'fourslash.ts' for every test, so @@ -2398,7 +2193,8 @@ namespace FourSlash { program.emit(host.getSourceFile(Harness.Compiler.fourslashFileName, ts.ScriptTarget.ES3)); } - export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): TestXmlData { + export let currentTestState: TestState; + export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): void { // Parse out the files and their metadata const testData = parseTestData(basePath, content, fileName); @@ -2437,10 +2233,6 @@ namespace FourSlash { result = fourslashJsOutput + "\r\n" + result; runCode(result); - - const xmlData = currentTestState.getTestXmlData(); - xmlData.originalName = fileName; - return xmlData; } function runCode(code: string): void { @@ -2619,7 +2411,7 @@ namespace FourSlash { throw new Error(errorMessage); } - function recordObjectMarker(fileName: string, location: ILocationInformation, text: string, markerMap: MarkerMap, markers: Marker[]): Marker { + function recordObjectMarker(fileName: string, location: LocationInformation, text: string, markerMap: MarkerMap, markers: Marker[]): Marker { let markerValue: any = undefined; try { // Attempt to parse the marker value as JSON @@ -2650,7 +2442,7 @@ namespace FourSlash { return marker; } - function recordMarker(fileName: string, location: ILocationInformation, name: string, markerMap: MarkerMap, markers: Marker[]): Marker { + function recordMarker(fileName: string, location: LocationInformation, name: string, markerMap: MarkerMap, markers: Marker[]): Marker { const marker: Marker = { fileName: fileName, position: location.position @@ -2679,10 +2471,10 @@ namespace FourSlash { let output = ""; /// The current marker (or maybe multi-line comment?) we're parsing, possibly - let openMarker: ILocationInformation = null; + let openMarker: LocationInformation = null; /// A stack of the open range markers that are still unclosed - const openRanges: IRangeLocationInformation[] = []; + const openRanges: RangeLocationInformation[] = []; /// A list of ranges we've collected so far */ let localRanges: Range[] = []; diff --git a/src/harness/fourslashRunner.ts b/src/harness/fourslashRunner.ts index 7228f06c20fcd..84e352359c4ac 100644 --- a/src/harness/fourslashRunner.ts +++ b/src/harness/fourslashRunner.ts @@ -58,56 +58,6 @@ class FourSlashRunner extends RunnerBase { } }); }); - - describe("Generate Tao XML", () => { - const invalidReasons: any = {}; - FourSlash.xmlData.forEach(xml => { - if (xml.invalidReason !== null) { - invalidReasons[xml.invalidReason] = (invalidReasons[xml.invalidReason] || 0) + 1; - } - }); - const invalidReport: { reason: string; count: number }[] = []; - for (const reason in invalidReasons) { - if (invalidReasons.hasOwnProperty(reason)) { - invalidReport.push({ reason: reason, count: invalidReasons[reason] }); - } - } - invalidReport.sort((lhs, rhs) => lhs.count > rhs.count ? -1 : lhs.count === rhs.count ? 0 : 1); - - const lines: string[] = []; - lines.push(""); - lines.push(""); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - FourSlash.xmlData.forEach(xml => { - if (xml.invalidReason !== null) { - lines.push(""); - } - else { - lines.push(" "); - xml.actions.forEach(action => { - lines.push(" " + action); - }); - lines.push(" "); - } - }); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(" "); - lines.push(""); - Harness.IO.writeFile("built/local/fourslash.xml", lines.join("\r\n")); - }); }); } } From 1ee50223503fc646ab12bf191d0989760ec447c5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 16 Nov 2015 11:49:26 -0800 Subject: [PATCH 251/353] Change the api for node name resolver to take compiler options instead of supportedExtensions --- src/compiler/program.ts | 6 +++--- tests/cases/unittests/moduleResolution.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 1d3894ee186e7..80995afe5aab2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -42,14 +42,14 @@ namespace ts { : compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic; switch (moduleResolution) { - case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, getSupportedExtensions(compilerOptions), host); + case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host); case ModuleResolutionKind.Classic: return classicNameResolver(moduleName, containingFile, compilerOptions, host); } } - export function nodeModuleNameResolver(moduleName: string, containingFile: string, supportedExtensions: string[], host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const containingDirectory = getDirectoryPath(containingFile); - + const supportedExtensions = getSupportedExtensions(compilerOptions); if (getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { const failedLookupLocations: string[] = []; const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 295410ef2398e..4c35d61147abc 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -53,7 +53,7 @@ module ts { for (let ext of supportedTypeScriptExtensions) { let containingFile = { name: containingFileName } let moduleFile = { name: moduleFileNameNoExt + ext } - let resolution = nodeModuleNameResolver(moduleName, containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver(moduleName, containingFile.name, {}, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); @@ -92,7 +92,7 @@ module ts { let containingFile = { name: containingFileName }; let packageJson = { name: packageJsonFileName, content: JSON.stringify({ "typings": fieldRef }) }; let moduleFile = { name: moduleFileName }; - let resolution = nodeModuleNameResolver(moduleName, containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, packageJson, moduleFile)); + let resolution = nodeModuleNameResolver(moduleName, containingFile.name, {}, createModuleResolutionHost(containingFile, packageJson, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); // expect three failed lookup location - attempt to load module as file with all supported extensions @@ -110,7 +110,7 @@ module ts { let containingFile = { name: "/a/b/c.ts" }; let packageJson = { name: "/a/b/foo/package.json", content: JSON.stringify({ main: "/c/d" }) }; let indexFile = { name: "/a/b/foo/index.d.ts" }; - let resolution = nodeModuleNameResolver("./foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, packageJson, indexFile)); + let resolution = nodeModuleNameResolver("./foo", containingFile.name, {}, createModuleResolutionHost(containingFile, packageJson, indexFile)); assert.equal(resolution.resolvedModule.resolvedFileName, indexFile.name); assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false); assert.deepEqual(resolution.failedLookupLocations, [ @@ -127,7 +127,7 @@ module ts { it("load module as file - ts files not loaded", () => { let containingFile = { name: "/a/b/c/d/e.ts" }; let moduleFile = { name: "/a/b/node_modules/foo.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, {}, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.deepEqual(resolution.failedLookupLocations, [ "/a/b/c/d/node_modules/foo.ts", @@ -150,7 +150,7 @@ module ts { it("load module as file", () => { let containingFile = { name: "/a/b/c/d/e.ts" }; let moduleFile = { name: "/a/b/node_modules/foo.d.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, {}, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(resolution.resolvedModule.isExternalLibraryImport, true); }); @@ -158,7 +158,7 @@ module ts { it("load module as directory", () => { let containingFile = { name: "/a/node_modules/b/c/node_modules/d/e.ts" }; let moduleFile = { name: "/a/node_modules/foo/index.d.ts" }; - let resolution = nodeModuleNameResolver("foo", containingFile.name, supportedTypeScriptExtensions, createModuleResolutionHost(containingFile, moduleFile)); + let resolution = nodeModuleNameResolver("foo", containingFile.name, {}, createModuleResolutionHost(containingFile, moduleFile)); assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name); assert.equal(resolution.resolvedModule.isExternalLibraryImport, true); assert.deepEqual(resolution.failedLookupLocations, [ From 31bce223d98ed976542c4d2cd654618f10cdfb9c Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 11:50:42 -0800 Subject: [PATCH 252/353] switch fourslash to use local test state --- src/harness/fourslash.ts | 669 ++++++++++++- ...foreSemanticDiagnosticsInArrowFunction1.ts | 12 +- tests/cases/fourslash/fourslash.ts | 900 +++++------------- tests/cases/fourslash/indentationBlock.ts | 2 +- tests/cases/fourslash/indentationNone.ts | 2 +- .../fourslash/recursiveClassReference.ts | 2 +- tests/cases/fourslash/renameModuleToVar.ts | 8 +- 7 files changed, 908 insertions(+), 687 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 88458beaba4b8..5f48a88539589 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2174,31 +2174,11 @@ namespace FourSlash { runFourSlashTestContent(basePath, testType, content, fileName); } - // We don't want to recompile 'fourslash.ts' for every test, so - // here we cache the JS output and reuse it for every test. - let fourslashJsOutput: string; - { - const fourslashFile: Harness.Compiler.TestFile = { - unitName: Harness.Compiler.fourslashFileName, - content: undefined - }; - const host = Harness.Compiler.createCompilerHost([fourslashFile], - (fn, contents) => fourslashJsOutput = contents, - ts.ScriptTarget.Latest, - Harness.IO.useCaseSensitiveFileNames(), - Harness.IO.getCurrentDirectory()); - - const program = ts.createProgram([Harness.Compiler.fourslashFileName], { noResolve: true, target: ts.ScriptTarget.ES3 }, host); - - program.emit(host.getSourceFile(Harness.Compiler.fourslashFileName, ts.ScriptTarget.ES3)); - } - - export let currentTestState: TestState; export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): void { // Parse out the files and their metadata const testData = parseTestData(basePath, content, fileName); - currentTestState = new TestState(basePath, testType, testData); + const state = new TestState(basePath, testType, testData); let result = ""; const fourslashFile: Harness.Compiler.TestFile = { @@ -2228,17 +2208,27 @@ namespace FourSlash { } program.emit(sourceFile); - result = result || ""; // Might have an empty fourslash file - - result = fourslashJsOutput + "\r\n" + result; - runCode(result); + ts.Debug.assert(!!result); + runCode(result, state); } - function runCode(code: string): void { + function runCode(code: string, state: TestState): void { // Compile and execute the test + const wrappedCode = +`(function(test, goTo, verify, edit, debug, format, cancellation, classification, verifyOperationIsCancelled) { +${code} +})`; try { - eval(code); + const test = new FourSlashInterface.Test(state); + const goTo = new FourSlashInterface.GoTo(state); + const verify = new FourSlashInterface.Verify(state); + const edit = new FourSlashInterface.Edit(state); + const debug = new FourSlashInterface.Debug(state); + const format = new FourSlashInterface.Format(state); + const cancellation = new FourSlashInterface.Cancellation(state); + const f = eval(wrappedCode); + f(test, goTo, verify, edit, debug, format, cancellation, FourSlashInterface.Classification, FourSlash.verifyOperationIsCancelled); } catch (err) { // Debugging: FourSlash.currentTestState.printCurrentFileState(); @@ -2660,3 +2650,628 @@ namespace FourSlash { }; } } + +namespace FourSlashInterface { + export class Test { + constructor(private state: FourSlash.TestState) { + } + + public markers(): FourSlash.Marker[] { + return this.state.getMarkers(); + } + + public marker(name?: string): FourSlash.Marker { + return this.state.getMarkerByName(name); + } + + public ranges(): FourSlash.Range[] { + return this.state.getRanges(); + } + + public markerByName(s: string): FourSlash.Marker { + return this.state.getMarkerByName(s); + } + } + + export class GoTo { + constructor(private state: FourSlash.TestState) { + } + // Moves the caret to the specified marker, + // or the anonymous marker ('/**/') if no name + // is given + public marker(name?: string) { + this.state.goToMarker(name); + } + + public bof() { + this.state.goToBOF(); + } + + public eof() { + this.state.goToEOF(); + } + + public definition(definitionIndex = 0) { + this.state.goToDefinition(definitionIndex); + } + + public type(definitionIndex = 0) { + this.state.goToTypeDefinition(definitionIndex); + } + + public position(position: number, fileIndex?: number): void; + public position(position: number, fileName?: string): void; + public position(position: number, fileNameOrIndex?: any): void { + if (fileNameOrIndex !== undefined) { + this.file(fileNameOrIndex); + } + this.state.goToPosition(position); + } + + // Opens a file, given either its index as it + // appears in the test source, or its filename + // as specified in the test metadata + public file(index: number, content?: string): void; + public file(name: string, content?: string): void; + public file(indexOrName: any, content?: string): void { + this.state.openFile(indexOrName, content); + } + } + + export class VerifyNegatable { + public not: VerifyNegatable; + + constructor(protected state: FourSlash.TestState, private negative = false) { + if (!negative) { + this.not = new VerifyNegatable(state, true); + } + } + + // Verifies the member list contains the specified symbol. The + // member list is brought up if necessary + public memberListContains(symbol: string, text?: string, documenation?: string, kind?: string) { + if (this.negative) { + this.state.verifyMemberListDoesNotContain(symbol); + } + else { + this.state.verifyMemberListContains(symbol, text, documenation, kind); + } + } + + public memberListCount(expectedCount: number) { + this.state.verifyMemberListCount(expectedCount, this.negative); + } + + // Verifies the completion list contains the specified symbol. The + // completion list is brought up if necessary + public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string) { + if (this.negative) { + this.state.verifyCompletionListDoesNotContain(symbol, text, documentation, kind); + } + else { + this.state.verifyCompletionListContains(symbol, text, documentation, kind); + } + } + + // Verifies the completion list items count to be greater than the specified amount. The + // completion list is brought up if necessary + public completionListItemsCountIsGreaterThan(count: number) { + this.state.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); + } + + public completionListIsEmpty() { + this.state.verifyCompletionListIsEmpty(this.negative); + } + + public completionListAllowsNewIdentifier() { + this.state.verifyCompletionListAllowsNewIdentifier(this.negative); + } + + public memberListIsEmpty() { + this.state.verifyMemberListIsEmpty(this.negative); + } + + public referencesCountIs(count: number) { + this.state.verifyReferencesCountIs(count, /*localFilesOnly*/ false); + } + + public referencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean) { + this.state.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess); + } + + public signatureHelpPresent() { + this.state.verifySignatureHelpPresent(!this.negative); + } + + public errorExistsBetweenMarkers(startMarker: string, endMarker: string) { + this.state.verifyErrorExistsBetweenMarkers(startMarker, endMarker, !this.negative); + } + + public errorExistsAfterMarker(markerName = "") { + this.state.verifyErrorExistsAfterMarker(markerName, !this.negative, /*after*/ true); + } + + public errorExistsBeforeMarker(markerName = "") { + this.state.verifyErrorExistsAfterMarker(markerName, !this.negative, /*after*/ false); + } + + public quickInfoIs(expectedText?: string, expectedDocumentation?: string) { + this.state.verifyQuickInfoString(this.negative, expectedText, expectedDocumentation); + } + + public quickInfoExists() { + this.state.verifyQuickInfoExists(this.negative); + } + + public definitionCountIs(expectedCount: number) { + this.state.verifyDefinitionsCount(this.negative, expectedCount); + } + + public typeDefinitionCountIs(expectedCount: number) { + this.state.verifyTypeDefinitionsCount(this.negative, expectedCount); + } + + public definitionLocationExists() { + this.state.verifyDefinitionLocationExists(this.negative); + } + + public verifyDefinitionsName(name: string, containerName: string) { + this.state.verifyDefinitionsName(this.negative, name, containerName); + } + } + + export class Verify extends VerifyNegatable { + constructor(state: FourSlash.TestState) { + super(state); + } + + public caretAtMarker(markerName?: string) { + this.state.verifyCaretAtMarker(markerName); + } + + public indentationIs(numberOfSpaces: number) { + this.state.verifyIndentationAtCurrentPosition(numberOfSpaces); + } + + public indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle = ts.IndentStyle.Smart) { + this.state.verifyIndentationAtPosition(fileName, position, numberOfSpaces, indentStyle); + } + + public textAtCaretIs(text: string) { + this.state.verifyTextAtCaretIs(text); + } + + /** + * Compiles the current file and evaluates 'expr' in a context containing + * the emitted output, then compares (using ===) the result of that expression + * to 'value'. Do not use this function with external modules as it is not supported. + */ + public eval(expr: string, value: any) { + this.state.verifyEval(expr, value); + } + + public currentLineContentIs(text: string) { + this.state.verifyCurrentLineContent(text); + } + + public currentFileContentIs(text: string) { + this.state.verifyCurrentFileContent(text); + } + + public verifyGetEmitOutputForCurrentFile(expected: string): void { + this.state.verifyGetEmitOutputForCurrentFile(expected); + } + + public currentParameterHelpArgumentNameIs(name: string) { + this.state.verifyCurrentParameterHelpName(name); + } + + public currentParameterSpanIs(parameter: string) { + this.state.verifyCurrentParameterSpanIs(parameter); + } + + public currentParameterHelpArgumentDocCommentIs(docComment: string) { + this.state.verifyCurrentParameterHelpDocComment(docComment); + } + + public currentSignatureHelpDocCommentIs(docComment: string) { + this.state.verifyCurrentSignatureHelpDocComment(docComment); + } + + public signatureHelpCountIs(expected: number) { + this.state.verifySignatureHelpCount(expected); + } + + public signatureHelpArgumentCountIs(expected: number) { + this.state.verifySignatureHelpArgumentCount(expected); + } + + public currentSignatureParameterCountIs(expected: number) { + this.state.verifyCurrentSignatureHelpParameterCount(expected); + } + + public currentSignatureHelpIs(expected: string) { + this.state.verifyCurrentSignatureHelpIs(expected); + } + + public numberOfErrorsInCurrentFile(expected: number) { + this.state.verifyNumberOfErrorsInCurrentFile(expected); + } + + public baselineCurrentFileBreakpointLocations() { + this.state.baselineCurrentFileBreakpointLocations(); + } + + public baselineCurrentFileNameOrDottedNameSpans() { + this.state.baselineCurrentFileNameOrDottedNameSpans(); + } + + public baselineGetEmitOutput() { + this.state.baselineGetEmitOutput(); + } + + public nameOrDottedNameSpanTextIs(text: string) { + this.state.verifyCurrentNameOrDottedNameSpanText(text); + } + + public outliningSpansInCurrentFile(spans: FourSlash.TextSpan[]) { + this.state.verifyOutliningSpans(spans); + } + + public todoCommentsInCurrentFile(descriptors: string[]) { + this.state.verifyTodoComments(descriptors, this.state.getRanges()); + } + + public matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number) { + this.state.verifyMatchingBracePosition(bracePosition, expectedMatchPosition); + } + + public noMatchingBracePositionInCurrentFile(bracePosition: number) { + this.state.verifyNoMatchingBracePosition(bracePosition); + } + + public DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean) { + this.state.verifyDocCommentTemplate(empty ? undefined : { newText: expectedText, caretOffset: expectedOffset }); + } + + public noDocCommentTemplate() { + this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, /*empty*/ true); + } + + public getScriptLexicalStructureListCount(count: number) { + this.state.verifyGetScriptLexicalStructureListCount(count); + } + + // TODO: figure out what to do with the unused arguments. + public getScriptLexicalStructureListContains( + name: string, + kind: string, + fileName?: string, + parentName?: string, + isAdditionalSpan?: boolean, + markerPosition?: number) { + this.state.verifyGetScriptLexicalStructureListContains(name, kind); + } + + public navigationItemsListCount(count: number, searchValue: string, matchKind?: string) { + this.state.verifyNavigationItemsCount(count, searchValue, matchKind); + } + + public navigationItemsListContains( + name: string, + kind: string, + searchValue: string, + matchKind: string, + fileName?: string, + parentName?: string) { + this.state.verifyNavigationItemsListContains( + name, + kind, + searchValue, + matchKind, + fileName, + parentName); + } + + public occurrencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean) { + this.state.verifyOccurrencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess); + } + + public occurrencesAtPositionCount(expectedCount: number) { + this.state.verifyOccurrencesAtPositionListCount(expectedCount); + } + + public documentHighlightsAtPositionContains(range: FourSlash.Range, fileNamesToSearch: string[], kind?: string) { + this.state.verifyDocumentHighlightsAtPositionListContains(range.fileName, range.start, range.end, fileNamesToSearch, kind); + } + + public documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]) { + this.state.verifyDocumentHighlightsAtPositionListCount(expectedCount, fileNamesToSearch); + } + + public completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string) { + this.state.verifyCompletionEntryDetails(entryName, text, documentation, kind); + } + + /** + * This method *requires* a contiguous, complete, and ordered stream of classifications for a file. + */ + public syntacticClassificationsAre(...classifications: { classificationType: string; text: string }[]) { + this.state.verifySyntacticClassifications(classifications); + } + + /** + * This method *requires* an ordered stream of classifications for a file, and spans are highly recommended. + */ + public semanticClassificationsAre(...classifications: { classificationType: string; text: string; textSpan?: FourSlash.TextSpan }[]) { + this.state.verifySemanticClassifications(classifications); + } + + public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) { + this.state.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers); + } + + public renameInfoFailed(message?: string) { + this.state.verifyRenameInfoFailed(message); + } + + public renameLocations(findInStrings: boolean, findInComments: boolean) { + this.state.verifyRenameLocations(findInStrings, findInComments); + } + + public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; }, + displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]) { + this.state.verifyQuickInfoDisplayParts(kind, kindModifiers, textSpan, displayParts, documentation); + } + + public getSyntacticDiagnostics(expected: string) { + this.state.getSyntacticDiagnostics(expected); + } + + public getSemanticDiagnostics(expected: string) { + this.state.getSemanticDiagnostics(expected); + } + + public ProjectInfo(expected: string []) { + this.state.verifyProjectInfo(expected); + } + } + + export class Edit { + constructor(private state: FourSlash.TestState) { + } + public backspace(count?: number) { + this.state.deleteCharBehindMarker(count); + } + + public deleteAtCaret(times?: number) { + this.state.deleteChar(times); + } + + public replace(start: number, length: number, text: string) { + this.state.replace(start, length, text); + } + + public paste(text: string) { + this.state.paste(text); + } + + public insert(text: string) { + this.insertLines(text); + } + + public insertLine(text: string) { + this.insertLines(text + "\n"); + } + + public insertLines(...lines: string[]) { + this.state.type(lines.join("\n")); + } + + public moveRight(count?: number) { + this.state.moveCaretRight(count); + } + + public moveLeft(count?: number) { + if (typeof count === "undefined") { + count = 1; + } + this.state.moveCaretRight(count * -1); + } + + public enableFormatting() { + this.state.enableFormatting = true; + } + + public disableFormatting() { + this.state.enableFormatting = false; + } + } + + export class Debug { + constructor(private state: FourSlash.TestState) { + } + + public printCurrentParameterHelp() { + this.state.printCurrentParameterHelp(); + } + + public printCurrentFileState() { + this.state.printCurrentFileState(); + } + + public printCurrentFileStateWithWhitespace() { + this.state.printCurrentFileState(/*makeWhitespaceVisible*/true); + } + + public printCurrentFileStateWithoutCaret() { + this.state.printCurrentFileState(/*makeWhitespaceVisible*/false, /*makeCaretVisible*/false); + } + + public printCurrentQuickInfo() { + this.state.printCurrentQuickInfo(); + } + + public printCurrentSignatureHelp() { + this.state.printCurrentSignatureHelp(); + } + + public printMemberListMembers() { + this.state.printMemberListMembers(); + } + + public printCompletionListMembers() { + this.state.printCompletionListMembers(); + } + + public printBreakpointLocation(pos: number) { + this.state.printBreakpointLocation(pos); + } + public printBreakpointAtCurrentLocation() { + this.state.printBreakpointAtCurrentLocation(); + } + + public printNameOrDottedNameSpans(pos: number) { + this.state.printNameOrDottedNameSpans(pos); + } + + public printErrorList() { + this.state.printErrorList(); + } + + public printNavigationItems(searchValue = ".*") { + this.state.printNavigationItems(searchValue); + } + + public printScriptLexicalStructureItems() { + this.state.printScriptLexicalStructureItems(); + } + + public printReferences() { + this.state.printReferences(); + } + + public printContext() { + this.state.printContext(); + } + } + + export class Format { + constructor(private state: FourSlash.TestState) { + } + + public document() { + this.state.formatDocument(); + } + + public copyFormatOptions(): ts.FormatCodeOptions { + return this.state.copyFormatOptions(); + } + + public setFormatOptions(options: ts.FormatCodeOptions) { + return this.state.setFormatOptions(options); + } + + public selection(startMarker: string, endMarker: string) { + this.state.formatSelection(this.state.getMarkerByName(startMarker).position, this.state.getMarkerByName(endMarker).position); + } + + public setOption(name: string, value: number): void; + public setOption(name: string, value: string): void; + public setOption(name: string, value: boolean): void; + public setOption(name: string, value: any): void { + this.state.formatCodeOptions[name] = value; + } + } + + export class Cancellation { + constructor(private state: FourSlash.TestState) { + } + + public resetCancelled() { + this.state.resetCancelled(); + } + + public setCancelled(numberOfCalls = 0) { + this.state.setCancelled(numberOfCalls); + } + } + + export namespace Classification { + export function comment(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("comment", text, position); + } + + export function identifier(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("identifier", text, position); + } + + export function keyword(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("keyword", text, position); + } + + export function numericLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("numericLiteral", text, position); + } + + export function operator(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("operator", text, position); + } + + export function stringLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("stringLiteral", text, position); + } + + export function whiteSpace(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("whiteSpace", text, position); + } + + export function text(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("text", text, position); + } + + export function punctuation(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("punctuation", text, position); + } + + export function docCommentTagName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("docCommentTagName", text, position); + } + + export function className(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("className", text, position); + } + + export function enumName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("enumName", text, position); + } + + export function interfaceName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("interfaceName", text, position); + } + + export function moduleName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("moduleName", text, position); + } + + export function typeParameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("typeParameterName", text, position); + } + + export function parameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("parameterName", text, position); + } + + export function typeAliasName(text: string, position?: number): { classificationType: string; text: string; textSpan?: FourSlash.TextSpan } { + return getClassification("typeAliasName", text, position); + } + + function getClassification(type: string, text: string, position?: number) { + return { + classificationType: type, + text: text, + textSpan: position === undefined ? undefined : { start: position, end: position + text.length } + }; + } + } +} \ No newline at end of file diff --git a/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts b/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts index 16d2efcd6d4b0..d66c16207518d 100644 --- a/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts +++ b/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts @@ -3,16 +3,16 @@ //// var f4 = (x: T/**/ ) => { //// } -fs.goTo.marker(); +goTo.marker(); // Replace the "T" type with the non-existent type 'V'. -fs.edit.backspace(1); -fs.edit.insert("A"); +edit.backspace(1); +edit.insert("A"); // Bring up completion to force a pull resolve. This will end up resolving several symbols and // producing unreported diagnostics (i.e. that 'V' wasn't found). -fs.verify.completionListContains("T"); -fs.verify.completionEntryDetailIs("T", "(type parameter) T in (x: any): void"); +verify.completionListContains("T"); +verify.completionEntryDetailIs("T", "(type parameter) T in (x: any): void"); // There should now be a single error. -fs.verify.numberOfErrorsInCurrentFile(1); \ No newline at end of file +verify.numberOfErrorsInCurrentFile(1); diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index f6451e1f1c4cc..5b8bb94bb48fa 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -24,10 +24,7 @@ // @Module: Node // @Target: ES5 -// In the imperative section, you can write any valid TypeScript code. If -// you need help finding a something in Intellisense, you can -// type 'fs.' as an alternate way of accessing the top-level objects -// (e.g. 'fs.goTo.eof();') +// In the imperative section, you can write any valid TypeScript code. //--------------------------------------- // For API editors: @@ -45,52 +42,32 @@ // // TODO: figure out a better solution to the API exposure problem. -// /// -// /// - -declare var FourSlash; -module ts { - export interface SymbolDisplayPart { +declare module ts { + interface SymbolDisplayPart { text: string; kind: string; } -} - -//--------------------------------------------- - -// Return code used by getEmitOutput function to indicate status of the function -// It is a duplicate of the one in types.ts to expose it to testcases in fourslash -enum EmitReturnStatus { - Succeeded = 0, // All outputs generated if requested (.js, .map, .d.ts), no errors reported - AllOutputGenerationSkipped = 1, // No .js generated because of syntax errors, or compiler options errors, nothing generated - JSGeneratedWithSemanticErrors = 2, // .js and .map generated with semantic errors - DeclarationGenerationSkipped = 3, // .d.ts generation skipped because of semantic errors or declaration emitter specific errors; Output .js with semantic errors - EmitErrorsEncountered = 4 // Emitter errors occurred during emitting process -} -// This is a duplicate of the indentstyle in services.ts to expose it to testcases in fourslash -enum IndentStyle { - None, - Block, - Smart, + enum IndentStyle { + None = 0, + Block = 1, + Smart = 2, + } } -module FourSlashInterface { - - export interface Marker { +declare module FourSlashInterface { + interface Marker { fileName: string; position: number; data?: any; } - - export interface EditorOptions { + interface EditorOptions { IndentSize: number; TabSize: number; NewLineCharacter: string; ConvertTabsToSpaces: boolean; } - - export interface FormatCodeOptions extends EditorOptions { + interface FormatCodeOptions extends EditorOptions { InsertSpaceAfterCommaDelimiter: boolean; InsertSpaceAfterSemicolonInForStatements: boolean; InsertSpaceBeforeAndAfterBinaryOperators: boolean; @@ -100,646 +77,275 @@ module FourSlashInterface { InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean; PlaceOpenBraceOnNewLineForFunctions: boolean; PlaceOpenBraceOnNewLineForControlBlocks: boolean; - [s: string]: boolean | number| string; + [s: string]: boolean | number | string; } - - export interface Range { + interface Range { fileName: string; start: number; end: number; marker?: Marker; } - - export interface TextSpan { + interface TextSpan { start: number; end: number; } - - export class test_ { - public markers(): Marker[] { - return FourSlash.currentTestState.getMarkers(); - } - - public marker(name?: string): Marker { - return FourSlash.currentTestState.getMarkerByName(name); - } - - public ranges(): Range[] { - return FourSlash.currentTestState.getRanges(); - } - - public markerByName(s: string): Marker { - return FourSlash.currentTestState.getMarkerByName(s); - } + class test_ { + markers(): Marker[]; + marker(name?: string): Marker; + ranges(): Range[]; + markerByName(s: string): Marker; } - - export class goTo { - // Moves the caret to the specified marker, - // or the anonymous marker ('/**/') if no name - // is given - public marker(name?: string) { - FourSlash.currentTestState.goToMarker(name); - } - - public bof() { - FourSlash.currentTestState.goToBOF(); - } - - public eof() { - FourSlash.currentTestState.goToEOF(); - } - - public definition(definitionIndex: number = 0) { - FourSlash.currentTestState.goToDefinition(definitionIndex); - } - - public type(definitionIndex: number = 0) { - FourSlash.currentTestState.goToTypeDefinition(definitionIndex); - } - - public position(position: number, fileIndex?: number); - public position(position: number, fileName?: string); - public position(position: number, fileNameOrIndex?: any) { - if (fileNameOrIndex !== undefined) { - this.file(fileNameOrIndex); - } - FourSlash.currentTestState.goToPosition(position); - } - - // Opens a file, given either its index as it - // appears in the test source, or its filename - // as specified in the test metadata - public file(index: number, content?: string); - public file(name: string, content?: string); - public file(indexOrName: any, content?: string) { - FourSlash.currentTestState.openFile(indexOrName, content); - } + class goTo { + marker(name?: string): void; + bof(): void; + eof(): void; + definition(definitionIndex?: number): void; + type(definitionIndex?: number): void; + position(position: number, fileIndex?: number): any; + position(position: number, fileName?: string): any; + file(index: number, content?: string): any; + file(name: string, content?: string): any; } - - export class verifyNegatable { - public not: verifyNegatable; - - constructor(private negative = false) { - if (!negative) { - this.not = new verifyNegatable(true); - } - } - - // Verifies the member list contains the specified symbol. The - // member list is brought up if necessary - public memberListContains(symbol: string, text?: string, documenation?: string, kind?: string) { - if (this.negative) { - FourSlash.currentTestState.verifyMemberListDoesNotContain(symbol); - } else { - FourSlash.currentTestState.verifyMemberListContains(symbol, text, documenation, kind); - } - } - - public memberListCount(expectedCount: number) { - FourSlash.currentTestState.verifyMemberListCount(expectedCount, this.negative); - } - - // Verifies the completion list contains the specified symbol. The - // completion list is brought up if necessary - public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string) { - if (this.negative) { - FourSlash.currentTestState.verifyCompletionListDoesNotContain(symbol, text, documentation, kind); - } else { - FourSlash.currentTestState.verifyCompletionListContains(symbol, text, documentation, kind); - } - } - - // Verifies the completion list items count to be greater than the specified amount. The - // completion list is brought up if necessary - public completionListItemsCountIsGreaterThan(count: number) { - FourSlash.currentTestState.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); - } - - public completionListIsEmpty() { - FourSlash.currentTestState.verifyCompletionListIsEmpty(this.negative); - } - - public completionListAllowsNewIdentifier() { - FourSlash.currentTestState.verifyCompletionListAllowsNewIdentifier(this.negative); - } - - public memberListIsEmpty() { - FourSlash.currentTestState.verifyMemberListIsEmpty(this.negative); - } - - public referencesCountIs(count: number) { - FourSlash.currentTestState.verifyReferencesCountIs(count, /*localFilesOnly*/ false); - } - - public referencesAtPositionContains(range: Range, isWriteAccess?: boolean) { - FourSlash.currentTestState.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess); - } - - public signatureHelpPresent() { - FourSlash.currentTestState.verifySignatureHelpPresent(!this.negative); - } - - public errorExistsBetweenMarkers(startMarker: string, endMarker: string) { - FourSlash.currentTestState.verifyErrorExistsBetweenMarkers(startMarker, endMarker, !this.negative); - } - - public errorExistsAfterMarker(markerName = "") { - FourSlash.currentTestState.verifyErrorExistsAfterMarker(markerName, !this.negative, true); - } - - public errorExistsBeforeMarker(markerName = "") { - FourSlash.currentTestState.verifyErrorExistsAfterMarker(markerName, !this.negative, false); - } - - public quickInfoIs(expectedText?: string, expectedDocumentation?: string) { - FourSlash.currentTestState.verifyQuickInfoString(this.negative, expectedText, expectedDocumentation); - } - - public quickInfoExists() { - FourSlash.currentTestState.verifyQuickInfoExists(this.negative); - } - - public definitionCountIs(expectedCount: number) { - FourSlash.currentTestState.verifyDefinitionsCount(this.negative, expectedCount); - } - - public typeDefinitionCountIs(expectedCount: number) { - FourSlash.currentTestState.verifyTypeDefinitionsCount(this.negative, expectedCount); - } - - public definitionLocationExists() { - FourSlash.currentTestState.verifyDefinitionLocationExists(this.negative); - } - - public verifyDefinitionsName(name: string, containerName: string) { - FourSlash.currentTestState.verifyDefinitionsName(this.negative, name, containerName); - } + class verifyNegatable { + private negative; + not: verifyNegatable; + constructor(negative?: boolean); + memberListContains(symbol: string, text?: string, documenation?: string, kind?: string): void; + memberListCount(expectedCount: number): void; + completionListContains(symbol: string, text?: string, documentation?: string, kind?: string): void; + completionListItemsCountIsGreaterThan(count: number): void; + completionListIsEmpty(): void; + completionListAllowsNewIdentifier(): void; + memberListIsEmpty(): void; + referencesCountIs(count: number): void; + referencesAtPositionContains(range: Range, isWriteAccess?: boolean): void; + signatureHelpPresent(): void; + errorExistsBetweenMarkers(startMarker: string, endMarker: string): void; + errorExistsAfterMarker(markerName?: string): void; + errorExistsBeforeMarker(markerName?: string): void; + quickInfoIs(expectedText?: string, expectedDocumentation?: string): void; + quickInfoExists(): void; + definitionCountIs(expectedCount: number): void; + typeDefinitionCountIs(expectedCount: number): void; + definitionLocationExists(): void; + verifyDefinitionsName(name: string, containerName: string): void; } - - export class verify extends verifyNegatable { - public caretAtMarker(markerName?: string) { - FourSlash.currentTestState.verifyCaretAtMarker(markerName); - } - - public indentationIs(numberOfSpaces: number) { - FourSlash.currentTestState.verifyIndentationAtCurrentPosition(numberOfSpaces); - } - - public indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle = IndentStyle.Smart) { - FourSlash.currentTestState.verifyIndentationAtPosition(fileName, position, numberOfSpaces, indentStyle); - } - - public textAtCaretIs(text: string) { - FourSlash.currentTestState.verifyTextAtCaretIs(text); - } - + class verify extends verifyNegatable { + caretAtMarker(markerName?: string): void; + indentationIs(numberOfSpaces: number): void; + indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle?: IndentStyle): void; + textAtCaretIs(text: string): void; /** * Compiles the current file and evaluates 'expr' in a context containing * the emitted output, then compares (using ===) the result of that expression * to 'value'. Do not use this function with external modules as it is not supported. */ - public eval(expr: string, value: any) { - FourSlash.currentTestState.verifyEval(expr, value); - } - - public currentLineContentIs(text: string) { - FourSlash.currentTestState.verifyCurrentLineContent(text); - } - - public currentFileContentIs(text: string) { - FourSlash.currentTestState.verifyCurrentFileContent(text); - } - - public verifyGetEmitOutputForCurrentFile(expected: string): void { - FourSlash.currentTestState.verifyGetEmitOutputForCurrentFile(expected); - } - - public currentParameterHelpArgumentNameIs(name: string) { - FourSlash.currentTestState.verifyCurrentParameterHelpName(name); - } - - public currentParameterSpanIs(parameter: string) { - FourSlash.currentTestState.verifyCurrentParameterSpanIs(parameter); - } - - public currentParameterHelpArgumentDocCommentIs(docComment: string) { - FourSlash.currentTestState.verifyCurrentParameterHelpDocComment(docComment); - } - - public currentSignatureHelpDocCommentIs(docComment: string) { - FourSlash.currentTestState.verifyCurrentSignatureHelpDocComment(docComment); - } - - public signatureHelpCountIs(expected: number) { - FourSlash.currentTestState.verifySignatureHelpCount(expected); - } - - public signatureHelpArgumentCountIs(expected: number) { - FourSlash.currentTestState.verifySignatureHelpArgumentCount(expected); - } - - public currentSignatureParameterCountIs(expected: number) { - FourSlash.currentTestState.verifyCurrentSignatureHelpParameterCount(expected); - } - - public currentSignatureTypeParameterCountIs(expected: number) { - FourSlash.currentTestState.verifyCurrentSignatureHelpTypeParameterCount(expected); - } - - public currentSignatureHelpIs(expected: string) { - FourSlash.currentTestState.verifyCurrentSignatureHelpIs(expected); - } - - public numberOfErrorsInCurrentFile(expected: number) { - FourSlash.currentTestState.verifyNumberOfErrorsInCurrentFile(expected); - } - - public baselineCurrentFileBreakpointLocations() { - FourSlash.currentTestState.baselineCurrentFileBreakpointLocations(); - } - - public baselineCurrentFileNameOrDottedNameSpans() { - FourSlash.currentTestState.baselineCurrentFileNameOrDottedNameSpans(); - } - - public baselineGetEmitOutput() { - FourSlash.currentTestState.baselineGetEmitOutput(); - } - - public nameOrDottedNameSpanTextIs(text: string) { - FourSlash.currentTestState.verifyCurrentNameOrDottedNameSpanText(text); - } - - public outliningSpansInCurrentFile(spans: TextSpan[]) { - FourSlash.currentTestState.verifyOutliningSpans(spans); - } - - public todoCommentsInCurrentFile(descriptors: string[]) { - FourSlash.currentTestState.verifyTodoComments(descriptors, test.ranges()); - } - - public matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number) { - FourSlash.currentTestState.verifyMatchingBracePosition(bracePosition, expectedMatchPosition); - } - - public noMatchingBracePositionInCurrentFile(bracePosition: number) { - FourSlash.currentTestState.verifyNoMatchingBracePosition(bracePosition); - } - - public DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean) { - FourSlash.currentTestState.verifyDocCommentTemplate(empty ? undefined : { newText: expectedText, caretOffset: expectedOffset }); - } - - public noDocCommentTemplate() { - this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, true); - } - - public getScriptLexicalStructureListCount(count: number) { - FourSlash.currentTestState.verifyGetScriptLexicalStructureListCount(count); - } - - // TODO: figure out what to do with the unused arguments. - public getScriptLexicalStructureListContains( - name: string, - kind: string, - fileName?: string, - parentName?: string, - isAdditionalSpan?: boolean, - markerPosition?: number) { - FourSlash.currentTestState.verifyGetScriptLexicalStructureListContains(name, kind); - } - - public navigationItemsListCount(count: number, searchValue: string, matchKind?: string) { - FourSlash.currentTestState.verifyNavigationItemsCount(count, searchValue, matchKind); - } - - public navigationItemsListContains( - name: string, - kind: string, - searchValue: string, - matchKind: string, - fileName?: string, - parentName?: string) { - FourSlash.currentTestState.verifyNavigationItemsListContains( - name, - kind, - searchValue, - matchKind, - fileName, - parentName); - } - - public occurrencesAtPositionContains(range: Range, isWriteAccess?: boolean) { - FourSlash.currentTestState.verifyOccurrencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess); - } - - public occurrencesAtPositionCount(expectedCount: number) { - FourSlash.currentTestState.verifyOccurrencesAtPositionListCount(expectedCount); - } - - public documentHighlightsAtPositionContains(range: Range, fileNamesToSearch: string[], kind?: string) { - FourSlash.currentTestState.verifyDocumentHighlightsAtPositionListContains(range.fileName, range.start, range.end, fileNamesToSearch, kind); - } - - public documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]) { - FourSlash.currentTestState.verifyDocumentHighlightsAtPositionListCount(expectedCount, fileNamesToSearch); - } - - public completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string) { - FourSlash.currentTestState.verifyCompletionEntryDetails(entryName, text, documentation, kind); - } - + eval(expr: string, value: any): void; + currentLineContentIs(text: string): void; + currentFileContentIs(text: string): void; + verifyGetEmitOutputForCurrentFile(expected: string): void; + currentParameterHelpArgumentNameIs(name: string): void; + currentParameterSpanIs(parameter: string): void; + currentParameterHelpArgumentDocCommentIs(docComment: string): void; + currentSignatureHelpDocCommentIs(docComment: string): void; + signatureHelpCountIs(expected: number): void; + signatureHelpArgumentCountIs(expected: number): void; + currentSignatureParameterCountIs(expected: number): void; + currentSignatureTypeParameterCountIs(expected: number): void; + currentSignatureHelpIs(expected: string): void; + numberOfErrorsInCurrentFile(expected: number): void; + baselineCurrentFileBreakpointLocations(): void; + baselineCurrentFileNameOrDottedNameSpans(): void; + baselineGetEmitOutput(): void; + nameOrDottedNameSpanTextIs(text: string): void; + outliningSpansInCurrentFile(spans: TextSpan[]): void; + todoCommentsInCurrentFile(descriptors: string[]): void; + matchingBracePositionInCurrentFile(bracePosition: number, expectedMatchPosition: number): void; + noMatchingBracePositionInCurrentFile(bracePosition: number): void; + DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void; + noDocCommentTemplate(): void; + getScriptLexicalStructureListCount(count: number): void; + getScriptLexicalStructureListContains(name: string, kind: string, fileName?: string, parentName?: string, isAdditionalSpan?: boolean, markerPosition?: number): void; + navigationItemsListCount(count: number, searchValue: string, matchKind?: string): void; + navigationItemsListContains(name: string, kind: string, searchValue: string, matchKind: string, fileName?: string, parentName?: string): void; + occurrencesAtPositionContains(range: Range, isWriteAccess?: boolean): void; + occurrencesAtPositionCount(expectedCount: number): void; + documentHighlightsAtPositionContains(range: Range, fileNamesToSearch: string[], kind?: string): void; + documentHighlightsAtPositionCount(expectedCount: number, fileNamesToSearch: string[]): void; + completionEntryDetailIs(entryName: string, text: string, documentation?: string, kind?: string): void; /** * This method *requires* a contiguous, complete, and ordered stream of classifications for a file. */ - public syntacticClassificationsAre(...classifications: { classificationType: string; text: string }[]) { - FourSlash.currentTestState.verifySyntacticClassifications(classifications); - } - + syntacticClassificationsAre(...classifications: { + classificationType: string; + text: string; + }[]): void; /** * This method *requires* an ordered stream of classifications for a file, and spans are highly recommended. */ - public semanticClassificationsAre(...classifications: { classificationType: string; text: string; textSpan?: TextSpan }[]) { - FourSlash.currentTestState.verifySemanticClassifications(classifications); - } - - public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) { - FourSlash.currentTestState.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers) - } - - public renameInfoFailed(message?: string) { - FourSlash.currentTestState.verifyRenameInfoFailed(message) - } - - public renameLocations(findInStrings: boolean, findInComments: boolean) { - FourSlash.currentTestState.verifyRenameLocations(findInStrings, findInComments); - } - - public verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { start: number; length: number; }, - displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]) { - FourSlash.currentTestState.verifyQuickInfoDisplayParts(kind, kindModifiers, textSpan, displayParts, documentation); - } - - public getSyntacticDiagnostics(expected: string) { - FourSlash.currentTestState.getSyntacticDiagnostics(expected); - } - - public getSemanticDiagnostics(expected: string) { - FourSlash.currentTestState.getSemanticDiagnostics(expected); - } - - public ProjectInfo(expected: string []) { - FourSlash.currentTestState.verifyProjectInfo(expected); - } + semanticClassificationsAre(...classifications: { + classificationType: string; + text: string; + textSpan?: TextSpan; + }[]): void; + renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string): void; + renameInfoFailed(message?: string): void; + renameLocations(findInStrings: boolean, findInComments: boolean): void; + verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: { + start: number; + length: number; + }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[]): void; + getSyntacticDiagnostics(expected: string): void; + getSemanticDiagnostics(expected: string): void; + ProjectInfo(expected: string[]): void; } - - export class edit { - public backspace(count?: number) { - FourSlash.currentTestState.deleteCharBehindMarker(count); - } - - public deleteAtCaret(times?: number) { - FourSlash.currentTestState.deleteChar(times); - } - - public replace(start: number, length: number, text: string) { - FourSlash.currentTestState.replace(start, length, text); - } - - public paste(text: string) { - FourSlash.currentTestState.paste(text); - } - - public insert(text: string) { - this.insertLines(text); - } - - public insertLine(text: string) { - this.insertLines(text + '\n'); - } - - public insertLines(...lines: string[]) { - FourSlash.currentTestState.type(lines.join('\n')); - } - - public moveRight(count?: number) { - FourSlash.currentTestState.moveCaretRight(count); - } - - public moveLeft(count?: number) { - if (typeof count === 'undefined') { - count = 1; - } - FourSlash.currentTestState.moveCaretRight(count * -1); - } - - public enableFormatting() { - FourSlash.currentTestState.enableFormatting = true; - } - - public disableFormatting() { - FourSlash.currentTestState.enableFormatting = false; - } + class edit { + backspace(count?: number): void; + deleteAtCaret(times?: number): void; + replace(start: number, length: number, text: string): void; + paste(text: string): void; + insert(text: string): void; + insertLine(text: string): void; + insertLines(...lines: string[]): void; + moveRight(count?: number): void; + moveLeft(count?: number): void; + enableFormatting(): void; + disableFormatting(): void; } - - export class debug { - public printCurrentParameterHelp() { - FourSlash.currentTestState.printCurrentParameterHelp(); - } - - public printCurrentFileState() { - FourSlash.currentTestState.printCurrentFileState(); - } - - public printCurrentFileStateWithWhitespace() { - FourSlash.currentTestState.printCurrentFileState(/*withWhiteSpace=*/true); - } - - public printCurrentFileStateWithoutCaret() { - FourSlash.currentTestState.printCurrentFileState(/*withWhiteSpace=*/false, /*withCaret=*/false); - } - - public printCurrentQuickInfo() { - FourSlash.currentTestState.printCurrentQuickInfo(); - } - - public printCurrentSignatureHelp() { - FourSlash.currentTestState.printCurrentSignatureHelp(); - } - - public printMemberListMembers() { - FourSlash.currentTestState.printMemberListMembers(); - } - - public printCompletionListMembers() { - FourSlash.currentTestState.printCompletionListMembers(); - } - - public printBreakpointLocation(pos: number) { - FourSlash.currentTestState.printBreakpointLocation(pos); - } - public printBreakpointAtCurrentLocation() { - FourSlash.currentTestState.printBreakpointAtCurrentLocation(); - } - - public printNameOrDottedNameSpans(pos: number) { - FourSlash.currentTestState.printNameOrDottedNameSpans(pos); - } - - public printErrorList() { - FourSlash.currentTestState.printErrorList(); - } - - public printNavigationItems(searchValue: string = ".*") { - FourSlash.currentTestState.printNavigationItems(searchValue); - } - - public printScriptLexicalStructureItems() { - FourSlash.currentTestState.printScriptLexicalStructureItems(); - } - - public printReferences() { - FourSlash.currentTestState.printReferences(); - } - - public printContext() { - FourSlash.currentTestState.printContext(); - } + class debug { + printCurrentParameterHelp(): void; + printCurrentFileState(): void; + printCurrentFileStateWithWhitespace(): void; + printCurrentFileStateWithoutCaret(): void; + printCurrentQuickInfo(): void; + printCurrentSignatureHelp(): void; + printMemberListMembers(): void; + printCompletionListMembers(): void; + printBreakpointLocation(pos: number): void; + printBreakpointAtCurrentLocation(): void; + printNameOrDottedNameSpans(pos: number): void; + printErrorList(): void; + printNavigationItems(searchValue?: string): void; + printScriptLexicalStructureItems(): void; + printReferences(): void; + printContext(): void; } - - export class format { - public document() { - FourSlash.currentTestState.formatDocument(); - } - - public copyFormatOptions(): FormatCodeOptions { - return FourSlash.currentTestState.copyFormatOptions(); - } - - public setFormatOptions(options: FormatCodeOptions) { - return FourSlash.currentTestState.setFormatOptions(options); - } - - public selection(startMarker: string, endMarker: string) { - FourSlash.currentTestState.formatSelection(FourSlash.currentTestState.getMarkerByName(startMarker).position, FourSlash.currentTestState.getMarkerByName(endMarker).position); - } - - public setOption(name: string, value: number); - public setOption(name: string, value: string); - public setOption(name: string, value: boolean); - public setOption(name: string, value: any) { - FourSlash.currentTestState.formatCodeOptions[name] = value; - } + class format { + document(): void; + copyFormatOptions(): FormatCodeOptions; + setFormatOptions(options: FormatCodeOptions): any; + selection(startMarker: string, endMarker: string): void; + setOption(name: string, value: number): any; + setOption(name: string, value: string): any; + setOption(name: string, value: boolean): any; } - - export class cancellation { - public resetCancelled() { - FourSlash.currentTestState.resetCancelled(); - } - - public setCancelled(numberOfCalls: number = 0) { - FourSlash.currentTestState.setCancelled(numberOfCalls); - } + class cancellation { + resetCancelled(): void; + setCancelled(numberOfCalls?: number): void; } - - export module classification { - export function comment(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("comment", text, position); - } - - export function identifier(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("identifier", text, position); - } - - export function keyword(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("keyword", text, position); - } - - export function numericLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("numericLiteral", text, position); - } - - export function operator(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("operator", text, position); - } - - export function stringLiteral(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("stringLiteral", text, position); - } - - export function whiteSpace(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("whiteSpace", text, position); - } - - export function text(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("text", text, position); - } - - export function punctuation(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("punctuation", text, position); - } - - export function docCommentTagName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("docCommentTagName", text, position); - } - - export function className(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("className", text, position); - } - - export function enumName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("enumName", text, position); - } - - export function interfaceName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("interfaceName", text, position); - } - - export function moduleName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("moduleName", text, position); - } - - export function typeParameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("typeParameterName", text, position); - } - - export function parameterName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("parameterName", text, position); - } - - export function typeAliasName(text: string, position?: number): { classificationType: string; text: string; textSpan?: TextSpan } { - return getClassification("typeAliasName", text, position); - } - - function getClassification(type: string, text: string, position?: number) { - return { - classificationType: type, - text: text, - textSpan: position === undefined ? undefined : { start: position, end: position + text.length } - }; - } + module classification { + function comment(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function identifier(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function keyword(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function numericLiteral(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function operator(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function stringLiteral(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function whiteSpace(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function text(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function punctuation(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function docCommentTagName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function className(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function enumName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function interfaceName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function moduleName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function typeParameterName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function parameterName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; + function typeAliasName(text: string, position?: number): { + classificationType: string; + text: string; + textSpan?: TextSpan; + }; } } - -module fs { - export var test = new FourSlashInterface.test_(); - export var goTo = new FourSlashInterface.goTo(); - export var verify = new FourSlashInterface.verify(); - export var edit = new FourSlashInterface.edit(); - export var debug = new FourSlashInterface.debug(); - export var format = new FourSlashInterface.format(); - export var cancellation = new FourSlashInterface.cancellation(); -} - -function verifyOperationIsCancelled(f) { - FourSlash.verifyOperationIsCancelled(f); +declare module fs { + var test: FourSlashInterface.test_; + var goTo: FourSlashInterface.goTo; + var verify: FourSlashInterface.verify; + var edit: FourSlashInterface.edit; + var debug: FourSlashInterface.debug; + var format: FourSlashInterface.format; + var cancellation: FourSlashInterface.cancellation; } - -var test = new FourSlashInterface.test_(); -var goTo = new FourSlashInterface.goTo(); -var verify = new FourSlashInterface.verify(); -var edit = new FourSlashInterface.edit(); -var debug = new FourSlashInterface.debug(); -var format = new FourSlashInterface.format(); -var cancellation = new FourSlashInterface.cancellation(); -var classification = FourSlashInterface.classification; +declare function verifyOperationIsCancelled(f: any): void; +declare var test: FourSlashInterface.test_; +declare var goTo: FourSlashInterface.goTo; +declare var verify: FourSlashInterface.verify; +declare var edit: FourSlashInterface.edit; +declare var debug: FourSlashInterface.debug; +declare var format: FourSlashInterface.format; +declare var cancellation: FourSlashInterface.cancellation; +declare var classification: typeof FourSlashInterface.classification; diff --git a/tests/cases/fourslash/indentationBlock.ts b/tests/cases/fourslash/indentationBlock.ts index e880c4a095769..853ff43b0d6dd 100644 --- a/tests/cases/fourslash/indentationBlock.ts +++ b/tests/cases/fourslash/indentationBlock.ts @@ -179,5 +179,5 @@ ////{| "indent": 0 |} test.markers().forEach(marker => { - verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, IndentStyle.Block); + verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, ts.IndentStyle.Block); }); diff --git a/tests/cases/fourslash/indentationNone.ts b/tests/cases/fourslash/indentationNone.ts index 078f5ab35f65e..610a336cddada 100644 --- a/tests/cases/fourslash/indentationNone.ts +++ b/tests/cases/fourslash/indentationNone.ts @@ -179,5 +179,5 @@ ////{| "indent": 0 |} test.markers().forEach(marker => { - verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, IndentStyle.None); + verify.indentationAtPositionIs(marker.fileName, marker.position, marker.data.indent, ts.IndentStyle.None); }); diff --git a/tests/cases/fourslash/recursiveClassReference.ts b/tests/cases/fourslash/recursiveClassReference.ts index d0e96ac90e380..81843711d6517 100644 --- a/tests/cases/fourslash/recursiveClassReference.ts +++ b/tests/cases/fourslash/recursiveClassReference.ts @@ -11,4 +11,4 @@ //// } goTo.marker(); -fs.verify.quickInfoExists(); +verify.quickInfoExists(); diff --git a/tests/cases/fourslash/renameModuleToVar.ts b/tests/cases/fourslash/renameModuleToVar.ts index 023b0fa1c74aa..fc31f4040e8e3 100644 --- a/tests/cases/fourslash/renameModuleToVar.ts +++ b/tests/cases/fourslash/renameModuleToVar.ts @@ -10,7 +10,7 @@ //// var z = y + 5; ////} -fs.goTo.marker(); -fs.edit.backspace(6); -fs.edit.insert("var"); -fs.verify.numberOfErrorsInCurrentFile(0); \ No newline at end of file +goTo.marker(); +edit.backspace(6); +edit.insert("var"); +verify.numberOfErrorsInCurrentFile(0); From 076d65e1cf261277692591c33c5f4978c57c36d1 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 16:23:18 -0800 Subject: [PATCH 253/353] addressed PR feedback --- src/harness/compilerRunner.ts | 7 ++++--- src/harness/harness.ts | 24 +++++++++++++----------- tests/cases/fourslash/fourslash.ts | 11 +---------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 85a51b8f2a4fa..399f8a272dd57 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -250,10 +250,11 @@ class CompilerBaselineRunner extends RunnerBase { // These types are equivalent, but depend on what order the compiler observed // certain parts of the program. - const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!result.program.getSourceFile(file.unitName)); + const program = result.program; + const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName)); - const fullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ true); - const pullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ false); + const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true); + const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false); const fullResults: ts.Map = {}; const pullResults: ts.Map = {}; diff --git a/src/harness/harness.ts b/src/harness/harness.ts index e58e66354345f..ef0f2678e29a6 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -767,9 +767,9 @@ namespace Harness { } namespace Harness { - const tcServicesFileName = "built/local/typescriptServices.js"; export const libFolder = "built/local/"; - export let tcServicesFile = IO.readFile(tcServicesFileName); + const tcServicesFileName = ts.combinePaths(libFolder, "typescriptServices.js"); + export const tcServicesFile = IO.readFile(tcServicesFileName); export interface SourceMapEmitterCallback { (emittedFile: string, emittedLine: number, emittedColumn: number, sourceFile: string, sourceLine: number, sourceColumn: number, sourceName: string): void; @@ -990,7 +990,6 @@ namespace Harness { options.noErrorTruncation = true; options.skipDefaultLibCheck = true; - const newLine = "\r\n"; currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory(); // Parse settings @@ -1002,27 +1001,30 @@ namespace Harness { useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; } + const programFiles: TestFile[] = inputFiles.slice(); // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. // Treat them as library files, so include them in build, but not in baselines. - const includeBuiltFiles: TestFile[] = []; if (options.includeBuiltFile) { - const builtFileName = libFolder + options.includeBuiltFile; + const builtFileName = ts.combinePaths(libFolder, options.includeBuiltFile); const builtFile: TestFile = { unitName: builtFileName, - content: normalizeLineEndings(IO.readFile(builtFileName), newLine), + content: normalizeLineEndings(IO.readFile(builtFileName), Harness.IO.newLine()), }; - includeBuiltFiles.push(builtFile); + programFiles.push(builtFile); } const fileOutputs: GeneratedFile[] = []; - const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName); + const programFileNames = programFiles.map(file => file.unitName); const compilerHost = createCompilerHost( - inputFiles.concat(includeBuiltFiles).concat(otherFiles), + programFiles.concat(otherFiles), (fileName, code, writeByteOrderMark) => fileOutputs.push({ fileName, code, writeByteOrderMark }), - options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine); - const program = ts.createProgram(programFiles, options, compilerHost); + options.target, + useCaseSensitiveFileNames, + currentDirectory, + options.newLine); + const program = ts.createProgram(programFileNames, options, compilerHost); const emitResult = program.emit(); diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 5b8bb94bb48fa..f93ac76d6ed13 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -55,7 +55,7 @@ declare module ts { } } -declare module FourSlashInterface { +declare namespace FourSlashInterface { interface Marker { fileName: string; position: number; @@ -331,15 +331,6 @@ declare module FourSlashInterface { }; } } -declare module fs { - var test: FourSlashInterface.test_; - var goTo: FourSlashInterface.goTo; - var verify: FourSlashInterface.verify; - var edit: FourSlashInterface.edit; - var debug: FourSlashInterface.debug; - var format: FourSlashInterface.format; - var cancellation: FourSlashInterface.cancellation; -} declare function verifyOperationIsCancelled(f: any): void; declare var test: FourSlashInterface.test_; declare var goTo: FourSlashInterface.goTo; From a275dabe44f1e58fb7676b963190dd70cd729ab6 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 16 Nov 2015 16:48:57 -0800 Subject: [PATCH 254/353] When constructing signature, include parameter symbol instead of property symbol of parameter-property declaration Fixes #4566 --- src/compiler/checker.ts | 8 +++++++- ...natureHelpConstructorCallParamProperties.ts | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f975c110b0311..378fd85265f4e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3829,7 +3829,13 @@ namespace ts { let minArgumentCount = -1; for (let i = 0, n = declaration.parameters.length; i < n; i++) { const param = declaration.parameters[i]; - parameters.push(param.symbol); + let paramSymbol = param.symbol; + // Include parameter symbol instead of property symbol in the signature + if (paramSymbol && !!(paramSymbol.flags & SymbolFlags.Property) && !isBindingPattern(param.name)) { + const resolvedSymbol = resolveName(param, paramSymbol.name, SymbolFlags.Value, undefined, undefined); + paramSymbol = resolvedSymbol; + } + parameters.push(paramSymbol); if (param.type && param.type.kind === SyntaxKind.StringLiteral) { hasStringLiterals = true; } diff --git a/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts b/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts new file mode 100644 index 0000000000000..aab276403fe2d --- /dev/null +++ b/tests/cases/fourslash/signatureHelpConstructorCallParamProperties.ts @@ -0,0 +1,18 @@ +/// + +////class Circle { +//// /** +//// * Initialize a circle. +//// * @param radius The radius of the circle. +//// */ +//// constructor(private radius: number) { +//// } +////} +////var a = new Circle(/**/ + +goTo.marker(''); +verify.signatureHelpCountIs(1); +verify.currentSignatureHelpIs("Circle(radius: number): Circle"); +verify.currentParameterHelpArgumentNameIs("radius"); +verify.currentParameterSpanIs("radius: number"); +verify.currentParameterHelpArgumentDocCommentIs("The radius of the circle."); \ No newline at end of file From 33fc598a8afe3189cf1593c7f081241c0bd43045 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 23:24:25 -0800 Subject: [PATCH 255/353] clean residual state in binder and emitter, clean test data in version cache test --- src/compiler/binder.ts | 2 + src/compiler/emitter.ts | 55 +++++----- tests/cases/unittests/versionCache.ts | 141 +++++++++++++++++--------- 3 files changed, 122 insertions(+), 76 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 8b88da5b74932..6b04e22551dd6 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -139,6 +139,8 @@ namespace ts { file.classifiableNames = classifiableNames; } + file = undefined; + options = undefined; parent = undefined; container = undefined; blockScopeContainer = undefined; diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index e4cd57542a7a0..bdeac582bbfc0 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -516,7 +516,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let decorateEmitted: boolean; let paramEmitted: boolean; let awaiterEmitted: boolean; - let tempFlags: TempFlags; + let tempFlags: TempFlags = 0; let tempVariables: Identifier[]; let tempParameters: Identifier[]; let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]; @@ -584,33 +584,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return doEmit; function doEmit(jsFilePath: string, rootFile?: SourceFile) { - // reset the state - writer.reset(); - currentSourceFile = undefined; - currentText = undefined; - currentLineMap = undefined; - exportFunctionForFile = undefined; generatedNameSet = {}; nodeToGeneratedName = []; - computedPropertyNamesToGeneratedNames = undefined; - convertedLoopState = undefined; - - extendsEmitted = false; - decorateEmitted = false; - paramEmitted = false; - awaiterEmitted = false; - tempFlags = 0; - tempVariables = undefined; - tempParameters = undefined; - externalImports = undefined; - exportSpecifiers = undefined; - exportEquals = undefined; - hasExportStars = undefined; - detachedCommentsInfo = undefined; - sourceMapData = undefined; - isEs6Module = false; - renamedDependencies = undefined; - isCurrentFileExternalModule = false; root = rootFile; if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) { @@ -634,6 +609,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM); + + // reset the state + writer.reset(); + currentSourceFile = undefined; + currentText = undefined; + currentLineMap = undefined; + exportFunctionForFile = undefined; + generatedNameSet = undefined; + nodeToGeneratedName = undefined; + computedPropertyNamesToGeneratedNames = undefined; + convertedLoopState = undefined; + extendsEmitted = false; + decorateEmitted = false; + paramEmitted = false; + awaiterEmitted = false; + tempFlags = 0; + tempVariables = undefined; + tempParameters = undefined; + externalImports = undefined; + exportSpecifiers = undefined; + exportEquals = undefined; + hasExportStars = undefined; + detachedCommentsInfo = undefined; + sourceMapData = undefined; + isEs6Module = false; + renamedDependencies = undefined; + isCurrentFileExternalModule = false; + root = undefined; } function emitSourceFile(sourceFile: SourceFile): void { diff --git a/tests/cases/unittests/versionCache.ts b/tests/cases/unittests/versionCache.ts index 06c2cadbfe97e..20cb0ea7127da 100644 --- a/tests/cases/unittests/versionCache.ts +++ b/tests/cases/unittests/versionCache.ts @@ -20,7 +20,10 @@ module ts { } describe('VersionCache TS code', () => { - var testContent = `/// + let validateEditAtLineCharIndex: (line: number, char: number, deleteLength: number, insertString: string) => void; + + before(() => { + let testContent = `/// var x = 10; var y = { zebra: 12, giraffe: "ell" }; z.a; @@ -31,16 +34,21 @@ k=y; var p:Point=new Point(); var q:Point=p;` - let {lines, lineMap} = server.LineIndex.linesFromText(testContent); - assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); + let {lines, lineMap} = server.LineIndex.linesFromText(testContent); + assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); - let lineIndex = new server.LineIndex(); - lineIndex.load(lines); + let lineIndex = new server.LineIndex(); + lineIndex.load(lines); - function validateEditAtLineCharIndex(line: number, char: number, deleteLength: number, insertString: string): void { - let position = lineColToPosition(lineIndex, line, char); - validateEdit(lineIndex, testContent, position, deleteLength, insertString); - } + validateEditAtLineCharIndex = (line: number, char: number, deleteLength: number, insertString: string) => { + let position = lineColToPosition(lineIndex, line, char); + validateEdit(lineIndex, testContent, position, deleteLength, insertString); + }; + }); + + after(() => { + validateEditAtLineCharIndex = undefined; + }) it('change 9 1 0 1 {"y"}', () => { validateEditAtLineCharIndex(9, 1, 0, "y"); @@ -68,22 +76,35 @@ var q:Point=p;` }); describe('VersionCache simple text', () => { - let testContent = `in this story: + let validateEditAtPosition: (position: number, deleteLength: number, insertString: string) => void; + let testContent: string; + let lines: string[]; + let lineMap: number[]; + before(() => { + testContent = `in this story: the lazy brown fox jumped over the cow that ate the grass that was purple at the tips and grew 1cm per day`; - let {lines, lineMap} = server.LineIndex.linesFromText(testContent); - assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); + ({lines, lineMap} = server.LineIndex.linesFromText(testContent)); + assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); + + let lineIndex = new server.LineIndex(); + lineIndex.load(lines); - let lineIndex = new server.LineIndex(); - lineIndex.load(lines); + validateEditAtPosition = (position: number, deleteLength: number, insertString: string) => { + validateEdit(lineIndex, testContent, position, deleteLength, insertString); + } + }); - function validateEditAtPosition(position: number, deleteLength: number, insertString: string): void { - validateEdit(lineIndex, testContent, position, deleteLength, insertString); - } + after(() => { + validateEditAtPosition = undefined; + testContent = undefined; + lines = undefined; + lineMap = undefined; + }); it('Insert at end of file', () => { validateEditAtPosition(testContent.length, 0, "hmmmm...\r\n"); @@ -159,50 +180,70 @@ and grew 1cm per day`; }); describe('VersionCache stress test', () => { - const iterationCount = 20; - //const interationCount = 20000; // uncomment for testing - - // Use scanner.ts, decent size, does not change frequentlly - let testFileName = "src/compiler/scanner.ts"; - let testContent = Harness.IO.readFile(testFileName); - let totalChars = testContent.length; - assert.isTrue(totalChars > 0, "Failed to read test file."); - - let {lines, lineMap} = server.LineIndex.linesFromText(testContent); - assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); - - let lineIndex = new server.LineIndex(); - lineIndex.load(lines); - let rsa: number[] = []; let la: number[] = []; let las: number[] = []; let elas: number[] = []; let ersa: number[] = []; let ela: number[] = []; - let etotalChars = totalChars; + const iterationCount = 20; + let lines: string[]; + let lineMap: number[]; + let lineIndex: server.LineIndex; + let testContent: string; - for (let j = 0; j < 100000; j++) { - rsa[j] = Math.floor(Math.random() * totalChars); - la[j] = Math.floor(Math.random() * (totalChars - rsa[j])); - if (la[j] > 4) { - las[j] = 4; - } - else { - las[j] = la[j]; - } - if (j < 4000) { - ersa[j] = Math.floor(Math.random() * etotalChars); - ela[j] = Math.floor(Math.random() * (etotalChars - ersa[j])); - if (ela[j] > 4) { - elas[j] = 4; + before(() => { + //const interationCount = 20000; // uncomment for testing + + // Use scanner.ts, decent size, does not change frequentlly + let testFileName = "src/compiler/scanner.ts"; + testContent = Harness.IO.readFile(testFileName); + let totalChars = testContent.length; + assert.isTrue(totalChars > 0, "Failed to read test file."); + + ({lines, lineMap} = server.LineIndex.linesFromText(testContent)); + assert.isTrue(lines.length > 0, "Failed to initialize test text. Expected text to have at least one line"); + + lineIndex = new server.LineIndex(); + lineIndex.load(lines); + + let etotalChars = totalChars; + + for (let j = 0; j < 100000; j++) { + rsa[j] = Math.floor(Math.random() * totalChars); + la[j] = Math.floor(Math.random() * (totalChars - rsa[j])); + if (la[j] > 4) { + las[j] = 4; } else { - elas[j] = ela[j]; + las[j] = la[j]; + } + if (j < 4000) { + ersa[j] = Math.floor(Math.random() * etotalChars); + ela[j] = Math.floor(Math.random() * (etotalChars - ersa[j])); + if (ela[j] > 4) { + elas[j] = 4; + } + else { + elas[j] = ela[j]; + } + etotalChars += (las[j] - elas[j]); } - etotalChars += (las[j] - elas[j]); } - } + }); + + after(() => { + rsa = undefined; + la = undefined; + las = undefined; + elas = undefined; + ersa = undefined; + ela = undefined; + lines = undefined; + lineMap = undefined; + lineIndex = undefined; + testContent = undefined; + }); it("Range (average length 1/4 file size)", () => { for (let i = 0; i < iterationCount; i++) { From a26d89d7a2ebb924f1f1bc519c94ac465899f8fa Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 16 Nov 2015 23:44:07 -0800 Subject: [PATCH 256/353] addressed PR feedback --- tests/cases/unittests/versionCache.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/cases/unittests/versionCache.ts b/tests/cases/unittests/versionCache.ts index 20cb0ea7127da..c1d283ca8cd2a 100644 --- a/tests/cases/unittests/versionCache.ts +++ b/tests/cases/unittests/versionCache.ts @@ -187,15 +187,14 @@ and grew 1cm per day`; let ersa: number[] = []; let ela: number[] = []; const iterationCount = 20; + //const iterationCount = 20000; // uncomment for testing let lines: string[]; let lineMap: number[]; let lineIndex: server.LineIndex; let testContent: string; before(() => { - //const interationCount = 20000; // uncomment for testing - - // Use scanner.ts, decent size, does not change frequentlly + // Use scanner.ts, decent size, does not change frequently let testFileName = "src/compiler/scanner.ts"; testContent = Harness.IO.readFile(testFileName); let totalChars = testContent.length; From 443abe6deaedeeb5b8d578755113b1eeee51efe9 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 17 Nov 2015 10:53:29 -0800 Subject: [PATCH 257/353] Adds ThisType to SyntaxKind, to distinguish between a 'this' expression and a 'this' type. Needed for transforms --- src/compiler/binder.ts | 10 +++++----- src/compiler/checker.ts | 7 +++++-- src/compiler/declarationEmitter.ts | 2 +- src/compiler/emitter.ts | 14 +++++++------ src/compiler/parser.ts | 9 ++++++++- src/compiler/types.ts | 4 +++- src/services/services.ts | 20 +++++++++++-------- .../reference/thisTypeInClasses.symbols | 1 - .../reference/thisTypeInClasses.types | 1 - 9 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 2993ec3aa0c17..3e00af2832ccb 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -189,7 +189,7 @@ namespace ts { } if (node.name.kind === SyntaxKind.ComputedPropertyName) { const nameExpression = (node.name).expression; - // treat computed property names where expression is string/numeric literal as just string/numeric literal + // treat computed property names where expression is string/numeric literal as just string/numeric literal if (isStringOrNumericLiteral(nameExpression.kind)) { return (nameExpression).text; } @@ -450,7 +450,7 @@ namespace ts { /** * Returns true if node and its subnodes were successfully traversed. - * Returning false means that node was not examined and caller needs to dive into the node himself. + * Returning false means that node was not examined and caller needs to dive into the node himself. */ function bindReachableStatement(node: Node): void { if (checkUnreachable(node)) { @@ -560,7 +560,7 @@ namespace ts { } function bindIfStatement(n: IfStatement): void { - // denotes reachability state when entering 'thenStatement' part of the if statement: + // denotes reachability state when entering 'thenStatement' part of the if statement: // i.e. if condition is false then thenStatement is unreachable const ifTrueState = n.expression.kind === SyntaxKind.FalseKeyword ? Reachability.Unreachable : currentReachabilityState; // denotes reachability state when entering 'elseStatement': @@ -1179,7 +1179,7 @@ namespace ts { return checkStrictModePrefixUnaryExpression(node); case SyntaxKind.WithStatement: return checkStrictModeWithStatement(node); - case SyntaxKind.ThisKeyword: + case SyntaxKind.ThisType: seenThisKeyword = true; return; @@ -1528,7 +1528,7 @@ namespace ts { // unreachable code is reported if // - user has explicitly asked about it AND - // - statement is in not ambient context (statements in ambient context is already an error + // - statement is in not ambient context (statements in ambient context is already an error // so we should not report extras) AND // - node is not variable statement OR // - node is block scoped variable statement OR diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d9f5474e2ff8d..2218d53ee34d4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4541,7 +4541,7 @@ namespace ts { return esSymbolType; case SyntaxKind.VoidKeyword: return voidType; - case SyntaxKind.ThisKeyword: + case SyntaxKind.ThisType: return getTypeFromThisTypeNode(node); case SyntaxKind.StringLiteral: return getTypeFromStringLiteral(node); @@ -10157,7 +10157,7 @@ namespace ts { checkDestructuringAssignment(p, type); } else { - // non-shorthand property assignments should always have initializers + // non-shorthand property assignments should always have initializers checkDestructuringAssignment((p).initializer, type); } } @@ -14620,6 +14620,9 @@ namespace ts { const type = isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node); return type.symbol; + case SyntaxKind.ThisType: + return getTypeFromTypeNode(node).symbol; + case SyntaxKind.ConstructorKeyword: // constructor keyword for an overload, should take us to the definition if it exist const constructorDeclaration = node.parent; diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 669cbcbcf0cde..59f89226d5fad 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -378,7 +378,7 @@ namespace ts { case SyntaxKind.BooleanKeyword: case SyntaxKind.SymbolKeyword: case SyntaxKind.VoidKeyword: - case SyntaxKind.ThisKeyword: + case SyntaxKind.ThisType: case SyntaxKind.StringLiteral: return writeTextOfNode(currentText, type); case SyntaxKind.ExpressionWithTypeArguments: diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d0314649b8884..384ed82625a4e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -428,7 +428,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi * var loop = function(x) { } * var arguments_1 = arguments * for (var x;;) loop(x); - * otherwise semantics of the code will be different since 'arguments' inside converted loop body + * otherwise semantics of the code will be different since 'arguments' inside converted loop body * will refer to function that holds converted loop. * This value is set on demand. */ @@ -436,10 +436,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi /* * list of non-block scoped variable declarations that appear inside converted loop - * such variable declarations should be moved outside the loop body + * such variable declarations should be moved outside the loop body * for (let x;;) { * var y = 1; - * ... + * ... * } * should be converted to * var loop = function(x) { @@ -2651,7 +2651,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitCallTarget(node: Expression): Expression { - if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.SuperKeyword) { + if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || /*node.kind === SyntaxKind.ThisType ||*/ node.kind === SyntaxKind.SuperKeyword) { emit(node); return node; } @@ -3226,7 +3226,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } if (convertedLoopState && (getCombinedNodeFlags(decl) & NodeFlags.BlockScoped) === 0) { - // we are inside a converted loop - this can only happen in downlevel scenarios + // we are inside a converted loop - this can only happen in downlevel scenarios // record names for all variable declarations for (const varDecl of decl.declarations) { hoistVariableDeclarationFromLoop(convertedLoopState, varDecl); @@ -3551,7 +3551,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(`case "${labelMarker}": `); // if there are no outer converted loop or outer label in question is located inside outer converted loop // then emit labeled break\continue - // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do + // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) { if (isBreak) { write("break "); @@ -7868,6 +7868,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: return emitAccessor(node); + // case SyntaxKind.ThisType: + // console.log("ThisType: emitJavaScriptWorker"); case SyntaxKind.ThisKeyword: return emitThis(node); case SyntaxKind.SuperKeyword: diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 96c8e19e7bcc2..c2074ba22f07d 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1956,6 +1956,12 @@ namespace ts { return finishNode(node); } + function parseThisTypeNode(): TypeNode { + const node = createNode(SyntaxKind.ThisType); + nextToken(); + return finishNode(node); + } + function parseTypeQuery(): TypeQueryNode { const node = createNode(SyntaxKind.TypeQuery); parseExpected(SyntaxKind.TypeOfKeyword); @@ -2388,8 +2394,9 @@ namespace ts { case SyntaxKind.StringLiteral: return parseLiteralNode(/*internName*/ true); case SyntaxKind.VoidKeyword: - case SyntaxKind.ThisKeyword: return parseTokenNode(); + case SyntaxKind.ThisKeyword: + return parseThisTypeNode(); case SyntaxKind.TypeOfKeyword: return parseTypeQuery(); case SyntaxKind.OpenBraceToken: diff --git a/src/compiler/types.ts b/src/compiler/types.ts index eb3322e60b9fd..b06bf1ba86e0d 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -204,6 +204,7 @@ namespace ts { UnionType, IntersectionType, ParenthesizedType, + ThisType, // Binding patterns ObjectBindingPattern, ArrayBindingPattern, @@ -349,7 +350,7 @@ namespace ts { FirstFutureReservedWord = ImplementsKeyword, LastFutureReservedWord = YieldKeyword, FirstTypeNode = TypePredicate, - LastTypeNode = ParenthesizedType, + LastTypeNode = ThisType, FirstPunctuation = OpenBraceToken, LastPunctuation = CaretEqualsToken, FirstToken = Unknown, @@ -726,6 +727,7 @@ namespace ts { // @kind(SyntaxKind.StringKeyword) // @kind(SyntaxKind.SymbolKeyword) // @kind(SyntaxKind.VoidKeyword) + // @kind(SyntaxKind.ThisType) export interface TypeNode extends Node { _typeNodeBrand: any; } diff --git a/src/services/services.ts b/src/services/services.ts index 9fb2eef215234..bf5652e5541f5 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2314,7 +2314,7 @@ namespace ts { return true; } - + return false; } @@ -2333,7 +2333,7 @@ namespace ts { } return false; } - + function tryConsumeDefine(): boolean { let token = scanner.getToken(); if (token === SyntaxKind.Identifier && scanner.getTokenValue() === "define") { @@ -2359,7 +2359,7 @@ namespace ts { if (token !== SyntaxKind.OpenBracketToken) { return true; } - + // skip open bracket token = scanner.scan(); let i = 0; @@ -2374,7 +2374,7 @@ namespace ts { token = scanner.scan(); } return true; - + } return false; } @@ -3976,7 +3976,7 @@ namespace ts { let sourceFile = getValidSourceFile(fileName); let entries: CompletionEntry[] = []; - + if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames)); @@ -4595,6 +4595,7 @@ namespace ts { case SyntaxKind.PropertyAccessExpression: case SyntaxKind.QualifiedName: case SyntaxKind.ThisKeyword: + case SyntaxKind.ThisType: case SyntaxKind.SuperKeyword: // For the identifiers/this/super etc get the type at position let type = typeChecker.getTypeAtLocation(node); @@ -4866,6 +4867,7 @@ namespace ts { function getSemanticDocumentHighlights(node: Node): DocumentHighlights[] { if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || + node.kind === SyntaxKind.ThisType || node.kind === SyntaxKind.SuperKeyword || isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) { @@ -5561,7 +5563,7 @@ namespace ts { } } - if (node.kind === SyntaxKind.ThisKeyword) { + if (node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.ThisType) { return getReferencesForThisKeyword(node, sourceFiles); } @@ -6043,7 +6045,7 @@ namespace ts { cancellationToken.throwIfCancellationRequested(); let node = getTouchingWord(sourceFile, position); - if (!node || node.kind !== SyntaxKind.ThisKeyword) { + if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) { return; } @@ -6405,7 +6407,8 @@ namespace ts { return node.parent.kind === SyntaxKind.TypeReference || (node.parent.kind === SyntaxKind.ExpressionWithTypeArguments && !isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) || - node.kind === SyntaxKind.ThisKeyword && !isExpression(node); + (node.kind === SyntaxKind.ThisKeyword && !isExpression(node)) || + node.kind === SyntaxKind.ThisType; } function isNamespaceReference(node: Node): boolean { @@ -6525,6 +6528,7 @@ namespace ts { case SyntaxKind.NullKeyword: case SyntaxKind.SuperKeyword: case SyntaxKind.ThisKeyword: + case SyntaxKind.ThisType: case SyntaxKind.Identifier: break; diff --git a/tests/baselines/reference/thisTypeInClasses.symbols b/tests/baselines/reference/thisTypeInClasses.symbols index 0915d6e5e6ba9..5ae45b923afdb 100644 --- a/tests/baselines/reference/thisTypeInClasses.symbols +++ b/tests/baselines/reference/thisTypeInClasses.symbols @@ -92,7 +92,6 @@ class C5 { let f1 = (x: this): this => this; >f1 : Symbol(f1, Decl(thisTypeInClasses.ts, 34, 11)) >x : Symbol(x, Decl(thisTypeInClasses.ts, 34, 18)) ->this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1)) >this : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1)) let f2 = (x: this) => this; diff --git a/tests/baselines/reference/thisTypeInClasses.types b/tests/baselines/reference/thisTypeInClasses.types index 512359decd9d5..69d0f0b1f8f69 100644 --- a/tests/baselines/reference/thisTypeInClasses.types +++ b/tests/baselines/reference/thisTypeInClasses.types @@ -93,7 +93,6 @@ class C5 { >f1 : (x: this) => this >(x: this): this => this : (x: this) => this >x : this ->this : this >this : this let f2 = (x: this) => this; From 4be0095a7c925b3ab4e833ebec1be526849e2f65 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 17 Nov 2015 10:56:02 -0800 Subject: [PATCH 258/353] Clean up unnecessary comment annotations --- src/compiler/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index b06bf1ba86e0d..457a3e5ca92cb 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1077,7 +1077,6 @@ namespace ts { export interface DebuggerStatement extends Statement { } // @kind(SyntaxKind.MissingDeclaration) - // @factoryhidden("name", true) export interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement { name?: Identifier; } @@ -1234,7 +1233,6 @@ namespace ts { export interface TypeElement extends Declaration { _typeElementBrand: any; name?: PropertyName; - // @factoryparam questionToken?: Node; } From a989595044bf942cef77360e7225622f464e4a6b Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 17 Nov 2015 11:24:17 -0800 Subject: [PATCH 259/353] use getCanonicalFileName on path fragments as in other utility methods --- src/compiler/program.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 80f793cb50f9d..dc31dfb5213c3 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -919,9 +919,8 @@ namespace ts { return; } - const caseSensitive = host.useCaseSensitiveFileNames(); for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) { - if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) { + if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) { if (i === 0) { // Failed to find any common path component return true; From e41f1ae04d69f1dadf02c40c56d378098865f2ff Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 17 Nov 2015 13:03:15 -0800 Subject: [PATCH 260/353] only check against default flag --- src/compiler/emitter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4bddaa221e8e4..1cd017cbf2b8c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5583,7 +5583,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } // If this is an exported class, but not on the top level (i.e. on an internal // module), export it - if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default)) { + if (node.flags & NodeFlags.Default) { // if this is a top level default export of decorated class, write the export after the declaration. writeLine(); if (thisNodeIsDecorated && modulekind === ModuleKind.ES6) { From e0a8af00a78d28c5b929835a5aceb623e032d6ea Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 17 Nov 2015 13:27:52 -0800 Subject: [PATCH 261/353] do not resolve parameters/type parameters if it is requested from restricted locations --- src/compiler/checker.ts | 36 ++++++++++--- ...rameterNamesInTypeParameterList.errors.txt | 44 +++++++++++++++ .../parameterNamesInTypeParameterList.js | 53 +++++++++++++++++++ ...ersAndParametersInComputedNames.errors.txt | 17 ++++++ ...eParametersAndParametersInComputedNames.js | 21 ++++++++ .../parameterNamesInTypeParameterList.ts | 23 ++++++++ ...eParametersAndParametersInComputedNames.ts | 8 +++ 7 files changed, 195 insertions(+), 7 deletions(-) create mode 100644 tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt create mode 100644 tests/baselines/reference/parameterNamesInTypeParameterList.js create mode 100644 tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt create mode 100644 tests/baselines/reference/typeParametersAndParametersInComputedNames.js create mode 100644 tests/cases/compiler/parameterNamesInTypeParameterList.ts create mode 100644 tests/cases/compiler/typeParametersAndParametersInComputedNames.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 378fd85265f4e..f9fd563b8736d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -476,15 +476,37 @@ namespace ts { // Locals of a source file are not in scope (because they get merged into the global symbol table) if (location.locals && !isGlobalSourceFile(location)) { if (result = getSymbol(location.locals, name, meaning)) { - // Type parameters of a function are in scope in the entire function declaration, including the parameter - // list and return type. However, local types are only in scope in the function body. - if (!(meaning & SymbolFlags.Type) || - !(result.flags & (SymbolFlags.Type & ~SymbolFlags.TypeParameter)) || - !isFunctionLike(location) || - lastLocation === (location).body) { + let useResult = true; + if (isFunctionLike(location) && lastLocation && lastLocation !== (location).body) { + // symbol lookup restrictions for function-like declarations + // - Type parameters of a function are in scope in the entire function declaration, including the parameter + // list and return type. However, local types are only in scope in the function body. + // - parameters are only in the scope of function body + if (meaning & result.flags & SymbolFlags.Type) { + useResult = result.flags & SymbolFlags.TypeParameter + // type parameters are visible in parameter list, return type and type parameter list + ? lastLocation === (location).type || + lastLocation.kind === SyntaxKind.Parameter || + lastLocation.kind === SyntaxKind.TypeParameter + // local types not visible outside the function body + : false; + } + if (meaning & SymbolFlags.Value && result.flags & SymbolFlags.FunctionScopedVariable) { + // function scoped variables are visible only inside function body and parameter list + // technically here we might mix parameters and variables declared in function, + // however this case is detected separately when checking initializers of parameters + // to make sure that they reference no variables declared after them. + useResult = lastLocation === (location).type || + lastLocation.kind === SyntaxKind.Parameter; + } + } + + if (useResult) { break loop; } - result = undefined; + else { + result = undefined; + } } } switch (location.kind) { diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt b/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt new file mode 100644 index 0000000000000..54ddb963f94d0 --- /dev/null +++ b/tests/baselines/reference/parameterNamesInTypeParameterList.errors.txt @@ -0,0 +1,44 @@ +tests/cases/compiler/parameterNamesInTypeParameterList.ts(1,30): error TS2304: Cannot find name 'a'. +tests/cases/compiler/parameterNamesInTypeParameterList.ts(5,30): error TS2304: Cannot find name 'a'. +tests/cases/compiler/parameterNamesInTypeParameterList.ts(9,30): error TS2304: Cannot find name 'a'. +tests/cases/compiler/parameterNamesInTypeParameterList.ts(14,22): error TS2304: Cannot find name 'a'. +tests/cases/compiler/parameterNamesInTypeParameterList.ts(17,22): error TS2304: Cannot find name 'a'. +tests/cases/compiler/parameterNamesInTypeParameterList.ts(20,22): error TS2304: Cannot find name 'a'. + + +==== tests/cases/compiler/parameterNamesInTypeParameterList.ts (6 errors) ==== + function f0(a: T) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b; + } + + function f1({a}: {a:T}) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b; + } + + function f2([a]: T[]) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b; + } + + class A { + m0(a: T) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b + } + m1({a}: {a:T}) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b + } + m2([a]: T[]) { + ~ +!!! error TS2304: Cannot find name 'a'. + a.b + } + } \ No newline at end of file diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.js b/tests/baselines/reference/parameterNamesInTypeParameterList.js new file mode 100644 index 0000000000000..2fbd7fad3cb05 --- /dev/null +++ b/tests/baselines/reference/parameterNamesInTypeParameterList.js @@ -0,0 +1,53 @@ +//// [parameterNamesInTypeParameterList.ts] +function f0(a: T) { + a.b; +} + +function f1({a}: {a:T}) { + a.b; +} + +function f2([a]: T[]) { + a.b; +} + +class A { + m0(a: T) { + a.b + } + m1({a}: {a:T}) { + a.b + } + m2([a]: T[]) { + a.b + } +} + +//// [parameterNamesInTypeParameterList.js] +function f0(a) { + a.b; +} +function f1(_a) { + var a = _a.a; + a.b; +} +function f2(_a) { + var a = _a[0]; + a.b; +} +var A = (function () { + function A() { + } + A.prototype.m0 = function (a) { + a.b; + }; + A.prototype.m1 = function (_a) { + var a = _a.a; + a.b; + }; + A.prototype.m2 = function (_a) { + var a = _a[0]; + a.b; + }; + return A; +})(); diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt b/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt new file mode 100644 index 0000000000000..872a0a10923a2 --- /dev/null +++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.errors.txt @@ -0,0 +1,17 @@ +tests/cases/compiler/typeParametersAndParametersInComputedNames.ts(6,10): error TS2304: Cannot find name 'T'. +tests/cases/compiler/typeParametersAndParametersInComputedNames.ts(6,13): error TS2304: Cannot find name 'a'. + + +==== tests/cases/compiler/typeParametersAndParametersInComputedNames.ts (2 errors) ==== + function foo(a: T) : string { + return ""; + } + + class A { + [foo(a)](a: T) { + ~ +!!! error TS2304: Cannot find name 'T'. + ~ +!!! error TS2304: Cannot find name 'a'. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js new file mode 100644 index 0000000000000..1cb53663fbde2 --- /dev/null +++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js @@ -0,0 +1,21 @@ +//// [typeParametersAndParametersInComputedNames.ts] +function foo(a: T) : string { + return ""; +} + +class A { + [foo(a)](a: T) { + } +} + +//// [typeParametersAndParametersInComputedNames.js] +function foo(a) { + return ""; +} +var A = (function () { + function A() { + } + A.prototype[foo(a)] = function (a) { + }; + return A; +})(); diff --git a/tests/cases/compiler/parameterNamesInTypeParameterList.ts b/tests/cases/compiler/parameterNamesInTypeParameterList.ts new file mode 100644 index 0000000000000..dba122db866ee --- /dev/null +++ b/tests/cases/compiler/parameterNamesInTypeParameterList.ts @@ -0,0 +1,23 @@ +function f0(a: T) { + a.b; +} + +function f1({a}: {a:T}) { + a.b; +} + +function f2([a]: T[]) { + a.b; +} + +class A { + m0(a: T) { + a.b + } + m1({a}: {a:T}) { + a.b + } + m2([a]: T[]) { + a.b + } +} \ No newline at end of file diff --git a/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts b/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts new file mode 100644 index 0000000000000..273dcb2a3eacc --- /dev/null +++ b/tests/cases/compiler/typeParametersAndParametersInComputedNames.ts @@ -0,0 +1,8 @@ +function foo(a: T) : string { + return ""; +} + +class A { + [foo(a)](a: T) { + } +} \ No newline at end of file From 9531d929c703dade551c2d0497574b9e8b2f1dff Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 17 Nov 2015 14:34:02 -0800 Subject: [PATCH 262/353] update test with pr feedback --- tests/baselines/reference/typeGuardInClass.js | 8 ++++---- tests/baselines/reference/typeGuardInClass.symbols | 6 ++++-- tests/baselines/reference/typeGuardInClass.types | 10 ++++++---- .../expressions/typeGuards/typeGuardInClass.ts | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js index 44bda9f4cb5af..0ce25a7c11c13 100644 --- a/tests/baselines/reference/typeGuardInClass.js +++ b/tests/baselines/reference/typeGuardInClass.js @@ -4,14 +4,14 @@ let x: string | number; if (typeof x === "string") { let n = class { constructor() { - x; // Should be "string" + let y: string = x; } } } else { let m = class { constructor() { - x; // Should be "number" + let y: number = x; } } } @@ -22,7 +22,7 @@ var x; if (typeof x === "string") { var n = (function () { function class_1() { - x; // Should be "string" + var y = x; } return class_1; })(); @@ -30,7 +30,7 @@ if (typeof x === "string") { else { var m = (function () { function class_2() { - x; // Should be "number" + var y = x; } return class_2; })(); diff --git a/tests/baselines/reference/typeGuardInClass.symbols b/tests/baselines/reference/typeGuardInClass.symbols index 66de16518598b..cc0e745e4de9e 100644 --- a/tests/baselines/reference/typeGuardInClass.symbols +++ b/tests/baselines/reference/typeGuardInClass.symbols @@ -9,7 +9,8 @@ if (typeof x === "string") { >n : Symbol(n, Decl(typeGuardInClass.ts, 3, 7)) constructor() { - x; // Should be "string" + let y: string = x; +>y : Symbol(y, Decl(typeGuardInClass.ts, 5, 15)) >x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) } } @@ -19,7 +20,8 @@ else { >m : Symbol(m, Decl(typeGuardInClass.ts, 10, 7)) constructor() { - x; // Should be "number" + let y: number = x; +>y : Symbol(y, Decl(typeGuardInClass.ts, 12, 15)) >x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3)) } } diff --git a/tests/baselines/reference/typeGuardInClass.types b/tests/baselines/reference/typeGuardInClass.types index 8552b58508e72..93fe9f28c5e9e 100644 --- a/tests/baselines/reference/typeGuardInClass.types +++ b/tests/baselines/reference/typeGuardInClass.types @@ -10,10 +10,11 @@ if (typeof x === "string") { let n = class { >n : typeof (Anonymous class) ->class { constructor() { x; // Should be "string" } } : typeof (Anonymous class) +>class { constructor() { let y: string = x; } } : typeof (Anonymous class) constructor() { - x; // Should be "string" + let y: string = x; +>y : string >x : string } } @@ -21,10 +22,11 @@ if (typeof x === "string") { else { let m = class { >m : typeof (Anonymous class) ->class { constructor() { x; // Should be "number" } } : typeof (Anonymous class) +>class { constructor() { let y: number = x; } } : typeof (Anonymous class) constructor() { - x; // Should be "number" + let y: number = x; +>y : number >x : number } } diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts index f88088744fc72..aa394aaa75b99 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts @@ -3,14 +3,14 @@ let x: string | number; if (typeof x === "string") { let n = class { constructor() { - x; // Should be "string" + let y: string = x; } } } else { let m = class { constructor() { - x; // Should be "number" + let y: number = x; } } } From 31039a3fff48b23a40c087e530eaa55f9f092b89 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 17 Nov 2015 15:22:26 -0800 Subject: [PATCH 263/353] disallow references to function locals from return type annotations --- src/compiler/checker.ts | 14 +++++++++----- ...nctionVariableInReturnTypeAnnotation.errors.txt | 10 ++++++++++ .../functionVariableInReturnTypeAnnotation.js | 11 +++++++++++ .../functionVariableInReturnTypeAnnotation.ts | 4 ++++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt create mode 100644 tests/baselines/reference/functionVariableInReturnTypeAnnotation.js create mode 100644 tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f9fd563b8736d..5348d2b19f064 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -492,12 +492,16 @@ namespace ts { : false; } if (meaning & SymbolFlags.Value && result.flags & SymbolFlags.FunctionScopedVariable) { - // function scoped variables are visible only inside function body and parameter list - // technically here we might mix parameters and variables declared in function, - // however this case is detected separately when checking initializers of parameters + // parameters are visible only inside function body, parameter list and return type + // technically for parameter list case here we might mix parameters and variables declared in function, + // however it is detected separately when checking initializers of parameters // to make sure that they reference no variables declared after them. - useResult = lastLocation === (location).type || - lastLocation.kind === SyntaxKind.Parameter; + useResult = + lastLocation.kind === SyntaxKind.Parameter || + ( + lastLocation === (location).type && + result.valueDeclaration.kind === SyntaxKind.Parameter + ); } } diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt new file mode 100644 index 0000000000000..93a35292b7062 --- /dev/null +++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.errors.txt @@ -0,0 +1,10 @@ +tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts(1,24): error TS2304: Cannot find name 'b'. + + +==== tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts (1 errors) ==== + function bar(): typeof b { + ~ +!!! error TS2304: Cannot find name 'b'. + var b = 1; + return undefined; + } \ No newline at end of file diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js new file mode 100644 index 0000000000000..191255e52c22c --- /dev/null +++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.js @@ -0,0 +1,11 @@ +//// [functionVariableInReturnTypeAnnotation.ts] +function bar(): typeof b { + var b = 1; + return undefined; +} + +//// [functionVariableInReturnTypeAnnotation.js] +function bar() { + var b = 1; + return undefined; +} diff --git a/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts b/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts new file mode 100644 index 0000000000000..c8936034a2578 --- /dev/null +++ b/tests/cases/compiler/functionVariableInReturnTypeAnnotation.ts @@ -0,0 +1,4 @@ +function bar(): typeof b { + var b = 1; + return undefined; +} \ No newline at end of file From 8ca6b31faa4eb2c7b3ed1bba08b1201ed36a84bc Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Wed, 18 Nov 2015 18:09:31 +0900 Subject: [PATCH 264/353] const --- src/compiler/tsc.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index fda9d86d85abc..d77699303c4a0 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -300,19 +300,19 @@ namespace ts { return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } - let fileOrDirectory = normalizePath(commandLine.options.project); + const fileOrDirectory = normalizePath(commandLine.options.project); if (!fileOrDirectory /* current directory */ || sys.directoryExists(fileOrDirectory)) { configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); } else { if (!/^tsconfig(?:-.*)?\.json$/.test(getBaseFileName(fileOrDirectory))) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project)); + reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project), /* compilerHost */ undefined); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } configFileName = fileOrDirectory; } if (!sys.fileExists(configFileName)) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project)); + reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project), /* compilerHost */ undefined); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } } From cf007461b923fa5b826d29daa9ad1d124182d871 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 18 Nov 2015 01:41:41 -0800 Subject: [PATCH 265/353] Fixed invalid code for binding expressions. --- scripts/tslint/preferConstRule.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index e4ffa396fb713..c14264ed7af52 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -106,11 +106,23 @@ class PreferConstWalker extends Lint.RuleWalker { if (node.kind === ts.SyntaxKind.ObjectLiteralExpression) { const pattern = node as ts.ObjectLiteralExpression; for (const element of pattern.properties) { - if (element.name.kind === ts.SyntaxKind.Identifier) { - this.markAssignment(element.name as ts.Identifier); + const kind = element.kind; + + if (kind === ts.SyntaxKind.ShorthandPropertyAssignment) { + this.markAssignment((element as ts.ShorthandPropertyAssignment).name); } - else if (isBindingPattern(element.name)) { - this.visitBindingPatternIdentifiers(element.name as ts.BindingPattern); + else if (kind === ts.SyntaxKind.PropertyAssignment) { + const rhs = (element as ts.PropertyAssignment).initializer; + + if (rhs.kind === ts.SyntaxKind.Identifier) { + this.markAssignment(rhs as ts.Identifier); + } + else if (rhs.kind === ts.SyntaxKind.ObjectLiteralExpression || rhs.kind === ts.SyntaxKind.ArrayLiteralExpression) { + this.visitBindingLiteralExpression(rhs as ts.ObjectLiteralExpression | ts.ArrayLiteralExpression); + } + else { + // Should be an error, but do nothing for now. + } } } } From 15d689cdcdddb0b926d3e96249cde6f1abe7105c Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 18 Nov 2015 01:46:17 -0800 Subject: [PATCH 266/353] Simplify simplify simplify. --- scripts/tslint/preferConstRule.ts | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index c14264ed7af52..a460648107946 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -112,17 +112,10 @@ class PreferConstWalker extends Lint.RuleWalker { this.markAssignment((element as ts.ShorthandPropertyAssignment).name); } else if (kind === ts.SyntaxKind.PropertyAssignment) { - const rhs = (element as ts.PropertyAssignment).initializer; - - if (rhs.kind === ts.SyntaxKind.Identifier) { - this.markAssignment(rhs as ts.Identifier); - } - else if (rhs.kind === ts.SyntaxKind.ObjectLiteralExpression || rhs.kind === ts.SyntaxKind.ArrayLiteralExpression) { - this.visitBindingLiteralExpression(rhs as ts.ObjectLiteralExpression | ts.ArrayLiteralExpression); - } - else { - // Should be an error, but do nothing for now. - } + this.visitLHSExpressions((element as ts.PropertyAssignment).initializer); + } + else { + // Should we throw an exception? } } } From cbb61654fbe95c0d77e7a0ac6c3ba3080ee705c4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 18 Nov 2015 01:52:08 -0800 Subject: [PATCH 267/353] Small refactorings. --- scripts/tslint/preferConstRule.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index a460648107946..2b5b5550c065b 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -85,12 +85,12 @@ class PreferConstWalker extends Lint.RuleWalker { visitBinaryExpression(node: ts.BinaryExpression) { if (isAssignmentOperator(node.operatorToken.kind)) { - this.visitLHSExpressions(node.left); + this.visitLeftHandSideExpression(node.left); } super.visitBinaryExpression(node); } - private visitLHSExpressions(node: ts.Expression) { + private visitLeftHandSideExpression(node: ts.Expression) { while (node.kind === ts.SyntaxKind.ParenthesizedExpression) { node = (node as ts.ParenthesizedExpression).expression; } @@ -112,7 +112,7 @@ class PreferConstWalker extends Lint.RuleWalker { this.markAssignment((element as ts.ShorthandPropertyAssignment).name); } else if (kind === ts.SyntaxKind.PropertyAssignment) { - this.visitLHSExpressions((element as ts.PropertyAssignment).initializer); + this.visitLeftHandSideExpression((element as ts.PropertyAssignment).initializer); } else { // Should we throw an exception? @@ -122,7 +122,7 @@ class PreferConstWalker extends Lint.RuleWalker { else if (node.kind === ts.SyntaxKind.ArrayLiteralExpression) { const pattern = node as ts.ArrayLiteralExpression; for (const element of pattern.elements) { - this.visitLHSExpressions(element); + this.visitLeftHandSideExpression(element); } } } @@ -150,7 +150,7 @@ class PreferConstWalker extends Lint.RuleWalker { private visitAnyUnaryExpression(node: ts.PrefixUnaryExpression | ts.PostfixUnaryExpression) { if (node.operator === ts.SyntaxKind.PlusPlusToken || node.operator === ts.SyntaxKind.MinusMinusToken) { - this.visitLHSExpressions(node.operand); + this.visitLeftHandSideExpression(node.operand); } } @@ -216,12 +216,12 @@ class PreferConstWalker extends Lint.RuleWalker { } } - private collectNameIdentifiers(value: ts.VariableDeclaration, node: ts.Identifier | ts.BindingPattern, table: ts.Map) { + private collectNameIdentifiers(declaration: ts.VariableDeclaration, node: ts.Identifier | ts.BindingPattern, table: ts.Map) { if (node.kind === ts.SyntaxKind.Identifier) { - table[(node as ts.Identifier).text] = {declaration: value, usages: 0}; + table[(node as ts.Identifier).text] = { declaration, usages: 0 }; } else { - this.collectBindingPatternIdentifiers(value, node as ts.BindingPattern, table); + this.collectBindingPatternIdentifiers(declaration, node as ts.BindingPattern, table); } } From bd84b844ff8982ee0c2e8a7f9d777925760fea8a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 18 Nov 2015 10:07:42 -0800 Subject: [PATCH 268/353] Remove unnecessary 'else' block. --- scripts/tslint/preferConstRule.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index 2b5b5550c065b..aaa1b0e53d5b8 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -114,9 +114,6 @@ class PreferConstWalker extends Lint.RuleWalker { else if (kind === ts.SyntaxKind.PropertyAssignment) { this.visitLeftHandSideExpression((element as ts.PropertyAssignment).initializer); } - else { - // Should we throw an exception? - } } } else if (node.kind === ts.SyntaxKind.ArrayLiteralExpression) { From 5ac6eb2d79d424fa216a1e01a6dd3dac9fbedb53 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 18 Nov 2015 10:48:03 -0800 Subject: [PATCH 269/353] PR feedback --- src/compiler/checker.ts | 5 +- src/compiler/declarationEmitter.ts | 109 +++++++++++++++-------------- src/compiler/program.ts | 10 +-- src/compiler/utilities.ts | 6 +- 4 files changed, 68 insertions(+), 62 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 36ca3eeb7605d..d2ccd9cebc82a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -12034,7 +12034,10 @@ namespace ts { const symbol = getSymbolOfNode(node); const localSymbol = node.localSymbol || symbol; - const firstDeclaration = forEach(symbol.declarations, + // 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 declaration => declaration.kind === node.kind && !isSourceFileJavaScript(getSourceFile(declaration)) ? declaration : undefined); diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 954a24ec5b10f..0d94deda92000 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -77,64 +77,67 @@ namespace ts { let addedGlobalFileReference = false; let allSourcesModuleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[] = []; forEach(sourceFiles, sourceFile => { - if (!isSourceFileJavaScript(sourceFile)) { - // Check what references need to be added - if (!compilerOptions.noResolve) { - forEach(sourceFile.referencedFiles, fileReference => { - const referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); - - // Emit reference in dts, if the file reference was not already emitted - if (referencedFile && !contains(emittedReferencedFiles, referencedFile)) { - // Add a reference to generated dts file, - // global file reference is added only - // - if it is not bundled emit (because otherwise it would be self reference) - // - and it is not already added - if (writeReferencePath(referencedFile, !isBundledEmit && !addedGlobalFileReference)) { - addedGlobalFileReference = true; - } - emittedReferencedFiles.push(referencedFile); + // Dont emit for javascript file + if (isSourceFileJavaScript(sourceFile)) { + return; + } + + // Check what references need to be added + if (!compilerOptions.noResolve) { + forEach(sourceFile.referencedFiles, fileReference => { + const referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); + + // Emit reference in dts, if the file reference was not already emitted + if (referencedFile && !contains(emittedReferencedFiles, referencedFile)) { + // Add a reference to generated dts file, + // global file reference is added only + // - if it is not bundled emit (because otherwise it would be self reference) + // - and it is not already added + if (writeReferencePath(referencedFile, !isBundledEmit && !addedGlobalFileReference)) { + addedGlobalFileReference = true; } - }); - } + emittedReferencedFiles.push(referencedFile); + } + }); + } - if (!isBundledEmit || !isExternalModule(sourceFile)) { - noDeclare = false; - emitSourceFile(sourceFile); - } - else if (isExternalModule(sourceFile)) { - noDeclare = true; - write(`declare module "${getResolvedExternalModuleName(host, sourceFile)}" {`); - writeLine(); - increaseIndent(); - emitSourceFile(sourceFile); - decreaseIndent(); - write("}"); - writeLine(); - } + if (!isBundledEmit || !isExternalModule(sourceFile)) { + noDeclare = false; + emitSourceFile(sourceFile); + } + else if (isExternalModule(sourceFile)) { + noDeclare = true; + write(`declare module "${getResolvedExternalModuleName(host, sourceFile)}" {`); + writeLine(); + increaseIndent(); + emitSourceFile(sourceFile); + decreaseIndent(); + write("}"); + writeLine(); + } - // create asynchronous output for the importDeclarations - if (moduleElementDeclarationEmitInfo.length) { - const oldWriter = writer; - forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { - if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { - Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration); - createAndSetNewTextWriterWithSymbolWriter(); - Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit)); - for (let i = 0; i < aliasEmitInfo.indent; i++) { - increaseIndent(); - } - writeImportDeclaration(aliasEmitInfo.node); - aliasEmitInfo.asynchronousOutput = writer.getText(); - for (let i = 0; i < aliasEmitInfo.indent; i++) { - decreaseIndent(); - } + // create asynchronous output for the importDeclarations + if (moduleElementDeclarationEmitInfo.length) { + const oldWriter = writer; + forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { + if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) { + Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration); + createAndSetNewTextWriterWithSymbolWriter(); + Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit)); + for (let i = 0; i < aliasEmitInfo.indent; i++) { + increaseIndent(); } - }); - setWriter(oldWriter); + writeImportDeclaration(aliasEmitInfo.node); + aliasEmitInfo.asynchronousOutput = writer.getText(); + for (let i = 0; i < aliasEmitInfo.indent; i++) { + decreaseIndent(); + } + } + }); + setWriter(oldWriter); - allSourcesModuleElementDeclarationEmitInfo = allSourcesModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); - moduleElementDeclarationEmitInfo = []; - } + allSourcesModuleElementDeclarationEmitInfo = allSourcesModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo); + moduleElementDeclarationEmitInfo = []; } }); diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 8048c8aaad700..36b389662e291 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -342,7 +342,7 @@ namespace ts { host = host || createCompilerHost(options); // Map storing if there is emit blocking diagnostics for given input - const hasEmitBlockingDiagnostics = createFileMap(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined); + const hasEmitBlockingDiagnostics = createFileMap(getCanonicalFileName); const currentDirectory = host.getCurrentDirectory(); const resolveModuleNamesWorker = host.resolveModuleNames @@ -1287,14 +1287,14 @@ namespace ts { if (emitFileName) { const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName); // Report error if the output overwrites input file - if (forEach(files, file => toPath(file.fileName, currentDirectory, getCanonicalFileName) === emitFilePath)) { - createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); + if (filesByName.contains(emitFilePath)) { + createEmitBlockingDiagnostics(emitFileName, emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file); } // Report error if multiple files write into same file if (emitFilesSeen.contains(emitFilePath)) { // Already seen the same emit file - report error - createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); + createEmitBlockingDiagnostics(emitFileName, emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files); } else { emitFilesSeen.set(emitFilePath, true); @@ -1303,7 +1303,7 @@ namespace ts { } } - function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) { + function createEmitBlockingDiagnostics(emitFileName: string, emitFilePath: Path, message: DiagnosticMessage) { hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true); programDiagnostics.add(createCompilerDiagnostic(message, emitFileName)); } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 4287c0cb49b23..db05964af2eb3 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1913,11 +1913,11 @@ namespace ts { } else { const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile]; - forEach(sourceFiles, sourceFile => { + for (const sourceFile of sourceFiles) { if (!isDeclarationFile(sourceFile)) { onSingleFileEmit(host, sourceFile); } - }); + } } function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) { @@ -1936,7 +1936,7 @@ namespace ts { const bundledSources = filter(host.getSourceFiles(), sourceFile => !isDeclarationFile(sourceFile) && // Not a declaration file (!isExternalModule(sourceFile) || // non module file - (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit + (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted if (bundledSources.length) { const jsFilePath = options.outFile || options.out; const emitFileNames: EmitFileNames = { From a44ebbbc7eec05931e26b1646630929bba942e58 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Nov 2015 13:19:56 -0800 Subject: [PATCH 270/353] only make common dir on call --- src/compiler/program.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index d3eb24b75405a..bd59410b7382e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -374,7 +374,7 @@ namespace ts { } // _Always_ compute a common source directory - let commonSourceDirectory = computeCommonSourceDirectory(files); + let commonSourceDirectory: string; verifyCompilerOptions(); // unconditionally set oldProgram to undefined to prevent it from being captured in closure @@ -395,7 +395,9 @@ namespace ts { getTypeChecker, getClassifiableNames, getDiagnosticsProducingTypeChecker, - getCommonSourceDirectory: () => commonSourceDirectory, + getCommonSourceDirectory: () => { + return typeof commonSourceDirectory === "undefined" ? (commonSourceDirectory = computeCommonSourceDirectory(files)) : commonSourceDirectory; + }, emit, getCurrentDirectory: () => currentDirectory, getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(), @@ -1071,11 +1073,12 @@ namespace ts { } } - if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { - // Make sure directory path ends with directory separator so this string can directly - // used to replace with "" to get the relative path of the source file and the relative path doesn't - // start with / making it rooted path - commonSourceDirectory += directorySeparator; + if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { + // Make sure directory path ends with directory separator so this string can directly + // used to replace with "" to get the relative path of the source file and the relative path doesn't + // start with / making it rooted path + commonSourceDirectory += directorySeparator; + } } if (options.noEmit) { From 294f846d265e4f6120087111027d6277c0f3e11f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Nov 2015 13:56:38 -0800 Subject: [PATCH 271/353] Add a test which uses common src dir in a different way --- tests/baselines/reference/commonSourceDir5.js | 29 +++++++++++ .../reference/commonSourceDir5.symbols | 42 ++++++++++++++++ .../reference/commonSourceDir5.types | 48 +++++++++++++++++++ tests/cases/compiler/commonSourceDir5.ts | 17 +++++++ 4 files changed, 136 insertions(+) create mode 100644 tests/baselines/reference/commonSourceDir5.js create mode 100644 tests/baselines/reference/commonSourceDir5.symbols create mode 100644 tests/baselines/reference/commonSourceDir5.types create mode 100644 tests/cases/compiler/commonSourceDir5.ts diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js new file mode 100644 index 0000000000000..3270df7015f40 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir5.js @@ -0,0 +1,29 @@ +//// [tests/cases/compiler/commonSourceDir5.ts] //// + +//// [bar.ts] +import {z} from "./foo"; +export var x = z + z; + +//// [foo.ts] +import {pi} from "B:/baz"; +export var i = Math.sqrt(-1); +export var z = pi * pi; + +//// [baz.ts] +import {x} from "A:/bar"; +import {i} from "A:/foo"; +export var pi = Math.PI; +export var y = x * i; + +//// [concat.js] +define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) { + exports.pi = Math.PI; + exports.y = bar_1.x * foo_1.i; +}); +define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) { + exports.i = Math.sqrt(-1); + exports.z = baz_1.pi * baz_1.pi; +}); +define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) { + exports.x = foo_2.z + foo_2.z; +}); diff --git a/tests/baselines/reference/commonSourceDir5.symbols b/tests/baselines/reference/commonSourceDir5.symbols new file mode 100644 index 0000000000000..6426ac39de3c4 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir5.symbols @@ -0,0 +1,42 @@ +=== A:/bar.ts === +import {z} from "./foo"; +>z : Symbol(z, Decl(bar.ts, 0, 8)) + +export var x = z + z; +>x : Symbol(x, Decl(bar.ts, 1, 10)) +>z : Symbol(z, Decl(bar.ts, 0, 8)) +>z : Symbol(z, Decl(bar.ts, 0, 8)) + +=== A:/foo.ts === +import {pi} from "B:/baz"; +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) + +export var i = Math.sqrt(-1); +>i : Symbol(i, Decl(foo.ts, 1, 10)) +>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) + +export var z = pi * pi; +>z : Symbol(z, Decl(foo.ts, 2, 10)) +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) + +=== B:/baz.ts === +import {x} from "A:/bar"; +>x : Symbol(x, Decl(baz.ts, 0, 8)) + +import {i} from "A:/foo"; +>i : Symbol(i, Decl(baz.ts, 1, 8)) + +export var pi = Math.PI; +>pi : Symbol(pi, Decl(baz.ts, 2, 10)) +>Math.PI : Symbol(Math.PI, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>PI : Symbol(Math.PI, Decl(lib.d.ts, --, --)) + +export var y = x * i; +>y : Symbol(y, Decl(baz.ts, 3, 10)) +>x : Symbol(x, Decl(baz.ts, 0, 8)) +>i : Symbol(i, Decl(baz.ts, 1, 8)) + diff --git a/tests/baselines/reference/commonSourceDir5.types b/tests/baselines/reference/commonSourceDir5.types new file mode 100644 index 0000000000000..ff13bb20215c0 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir5.types @@ -0,0 +1,48 @@ +=== A:/bar.ts === +import {z} from "./foo"; +>z : number + +export var x = z + z; +>x : number +>z + z : number +>z : number +>z : number + +=== A:/foo.ts === +import {pi} from "B:/baz"; +>pi : number + +export var i = Math.sqrt(-1); +>i : number +>Math.sqrt(-1) : number +>Math.sqrt : (x: number) => number +>Math : Math +>sqrt : (x: number) => number +>-1 : number +>1 : number + +export var z = pi * pi; +>z : number +>pi * pi : number +>pi : number +>pi : number + +=== B:/baz.ts === +import {x} from "A:/bar"; +>x : number + +import {i} from "A:/foo"; +>i : number + +export var pi = Math.PI; +>pi : number +>Math.PI : number +>Math : Math +>PI : number + +export var y = x * i; +>y : number +>x * i : number +>x : number +>i : number + diff --git a/tests/cases/compiler/commonSourceDir5.ts b/tests/cases/compiler/commonSourceDir5.ts new file mode 100644 index 0000000000000..d181bef68fe01 --- /dev/null +++ b/tests/cases/compiler/commonSourceDir5.ts @@ -0,0 +1,17 @@ +// @outFile: concat.js +// @module: amd +// @moduleResolution: node +// @Filename: A:/bar.ts +import {z} from "./foo"; +export var x = z + z; + +// @Filename: A:/foo.ts +import {pi} from "B:/baz"; +export var i = Math.sqrt(-1); +export var z = pi * pi; + +// @Filename: B:/baz.ts +import {x} from "A:/bar"; +import {i} from "A:/foo"; +export var pi = Math.PI; +export var y = x * i; \ No newline at end of file From c0f185943c2259cd821d1a607bc78a611c01b968 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Nov 2015 14:10:53 -0800 Subject: [PATCH 272/353] remove comment --- src/compiler/program.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index bd59410b7382e..d5b2eb1aea4f5 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -329,6 +329,7 @@ namespace ts { let fileProcessingDiagnostics = createDiagnosticCollection(); const programDiagnostics = createDiagnosticCollection(); + let commonSourceDirectory: string; let diagnosticsProducingTypeChecker: TypeChecker; let noDiagnosticsTypeChecker: TypeChecker; let classifiableNames: Map; @@ -373,8 +374,6 @@ namespace ts { } } - // _Always_ compute a common source directory - let commonSourceDirectory: string; verifyCompilerOptions(); // unconditionally set oldProgram to undefined to prevent it from being captured in closure From b73ce269371bd9e2b70df6e954cb4bb7c0e90c5e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 18 Nov 2015 15:29:51 -0800 Subject: [PATCH 273/353] Dont emit names index mapping into the sourcemap Since sourcemap spec is not very clear about symbol translation and use of nameIndex of the mapping, dont emit it --- src/compiler/emitter.ts | 107 ---------------------------------------- 1 file changed, 107 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index bdeac582bbfc0..fe65f5c625c9f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -548,14 +548,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi * @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; @@ -753,13 +745,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // Current source map file and its index in the sources list let sourceMapSourceIndex = -1; - // Names and its index map - const sourceMapNameIndexMap: Map = {}; - const sourceMapNameIndices: number[] = []; - function getSourceMapNameIndex() { - return sourceMapNameIndices.length ? lastOrUndefined(sourceMapNameIndices) : -1; - } - // Last recorded and encoded spans let lastRecordedSourceMapSpan: SourceMapSpan; let lastEncodedSourceMapSpan: SourceMapSpan = { @@ -769,7 +754,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi sourceColumn: 1, sourceIndex: 0 }; - let lastEncodedNameIndex = 0; // Encoding for sourcemap span function encodeLastRecordedSourceMapSpan() { @@ -805,12 +789,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // 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); @@ -876,7 +854,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emittedColumn: emittedColumn, sourceLine: sourceLinePos.line, sourceColumn: sourceLinePos.character, - nameIndex: getSourceMapNameIndex(), sourceIndex: sourceMapSourceIndex }; } @@ -929,69 +906,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - 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 = (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 ((node).name) { - const name = (node).name; - // For computed property names, the text will include the brackets - scopeName = name.kind === SyntaxKind.ComputedPropertyName - ? getTextOfNode(name) - : ((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); @@ -1134,8 +1048,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitStart = recordEmitNodeStartSpan; emitEnd = recordEmitNodeEndSpan; emitToken = writeTextWithSpanRecord; - scopeEmitStart = recordScopeNameOfNode; - scopeEmitEnd = recordScopeNameEnd; writeComment = writeCommentRangeWithMap; } @@ -3124,7 +3036,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); @@ -3136,7 +3047,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.statements.end); - scopeEmitEnd(); } function emitEmbeddedStatement(node: Node) { @@ -4981,8 +4891,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); @@ -5021,14 +4929,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(); @@ -5062,7 +4966,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } emitToken(SyntaxKind.CloseBraceToken, body.statements.end); - scopeEmitEnd(); } function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement { @@ -5348,7 +5251,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 @@ -5398,7 +5300,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } decreaseIndent(); emitToken(SyntaxKind.CloseBraceToken, ctor ? (ctor.body).statements.end : node.members.end); - scopeEmitEnd(); emitEnd(ctor || node); if (ctor) { emitTrailingComments(ctor); @@ -5535,14 +5436,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. @@ -5629,7 +5528,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi tempParameters = undefined; computedPropertyNamesToGeneratedNames = undefined; increaseIndent(); - scopeEmitStart(node); if (baseTypeNode) { writeLine(); emitStart(baseTypeNode); @@ -5662,7 +5560,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); - scopeEmitEnd(); emitStart(node); write(")("); if (baseTypeNode) { @@ -6225,12 +6122,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(" || ("); @@ -6354,7 +6249,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi else { write("{"); increaseIndent(); - scopeEmitStart(node); emitCaptureThisForNodeIfNecessary(node); writeLine(); emit(node.body); @@ -6362,7 +6256,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); const 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 From 9db441ef1697fa8ebe299124f4cfb9447453a900 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 18 Nov 2015 16:09:04 -0800 Subject: [PATCH 274/353] Update test baselines --- src/harness/sourceMapRecorder.ts | 3 +- tests/baselines/reference/ES5For-of8.js.map | 2 +- .../reference/ES5For-of8.sourcemap.txt | 22 +- ...computedPropertyNamesSourceMap1_ES5.js.map | 2 +- ...dPropertyNamesSourceMap1_ES5.sourcemap.txt | 34 +- ...computedPropertyNamesSourceMap1_ES6.js.map | 2 +- ...dPropertyNamesSourceMap1_ES6.sourcemap.txt | 22 +- ...computedPropertyNamesSourceMap2_ES5.js.map | 2 +- ...dPropertyNamesSourceMap2_ES5.sourcemap.txt | 10 +- ...computedPropertyNamesSourceMap2_ES6.js.map | 2 +- ...dPropertyNamesSourceMap2_ES6.sourcemap.txt | 10 +- .../reference/contextualTyping.js.map | 2 +- .../reference/contextualTyping.sourcemap.txt | 178 +-- .../reference/es3-sourcemap-amd.js.map | 2 +- .../reference/es3-sourcemap-amd.sourcemap.txt | 34 +- .../reference/es5-souremap-amd.js.map | 2 +- .../reference/es5-souremap-amd.sourcemap.txt | 34 +- .../reference/es6-sourcemap-amd.js.map | 2 +- .../reference/es6-sourcemap-amd.sourcemap.txt | 28 +- .../reference/getEmitOutputMapRoots.baseline | 2 +- .../reference/getEmitOutputSourceMap.baseline | 2 +- .../getEmitOutputSourceMap2.baseline | 2 +- .../getEmitOutputSourceRoot.baseline | 2 +- ...getEmitOutputSourceRootMultiFiles.baseline | 4 +- .../getEmitOutputTsxFile_Preserve.baseline | 2 +- .../getEmitOutputTsxFile_React.baseline | 2 +- tests/baselines/reference/out-flag.js.map | 2 +- .../reference/out-flag.sourcemap.txt | 56 +- tests/baselines/reference/out-flag2.js.map | 2 +- .../reference/out-flag2.sourcemap.txt | 28 +- tests/baselines/reference/out-flag3.js.map | 2 +- .../reference/out-flag3.sourcemap.txt | 28 +- .../reference/outModuleConcatAmd.js.map | 2 +- .../outModuleConcatAmd.sourcemap.txt | 36 +- .../reference/outModuleConcatSystem.js.map | 2 +- .../outModuleConcatSystem.sourcemap.txt | 36 +- .../reference/outModuleTripleSlashRefs.js.map | 2 +- .../outModuleTripleSlashRefs.sourcemap.txt | 50 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...aprootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...aprootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../maprootUrlSimpleNoOutdir/amd/m1.js.map | 2 +- .../maprootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../maprootUrlSimpleNoOutdir/amd/test.js.map | 2 +- .../maprootUrlSimpleNoOutdir/node/m1.js.map | 2 +- .../maprootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../maprootUrlSimpleNoOutdir/node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...maprootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...maprootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../maprootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../maprootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- .../amd/test.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...lsourcerootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lsourcerootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/ref/m1.js.map | 2 +- .../node/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../simple/FolderB/FolderC/fileC.js.map | 2 +- .../amd/outdir/simple/FolderB/fileB.js.map | 2 +- .../amd/rootDirectory.sourcemap.txt | 28 +- .../simple/FolderB/FolderC/fileC.js.map | 2 +- .../node/outdir/simple/FolderB/fileB.js.map | 2 +- .../node/rootDirectory.sourcemap.txt | 28 +- .../simple/FolderB/FolderC/fileC.js.map | 2 +- .../amd/outdir/simple/FolderB/fileB.js.map | 2 +- .../rootDirectoryWithSourceRoot.sourcemap.txt | 28 +- .../simple/FolderB/FolderC/fileC.js.map | 2 +- .../node/outdir/simple/FolderB/fileB.js.map | 2 +- .../rootDirectoryWithSourceRoot.sourcemap.txt | 28 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...olutePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otAbsolutePathSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...solutePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../amd/ref/m1.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...bsolutePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...ativePathMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...otRelativePathSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...ePathSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...lativePathSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...hSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../amd/ref/m1.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...elativePathSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...thSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...sourcemapMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...sourcemapMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../sourcemapSimpleNoOutdir/amd/m1.js.map | 2 +- .../amd/sourcemapSimpleNoOutdir.sourcemap.txt | 56 +- .../sourcemapSimpleNoOutdir/amd/test.js.map | 2 +- .../sourcemapSimpleNoOutdir/node/m1.js.map | 2 +- .../sourcemapSimpleNoOutdir.sourcemap.txt | 56 +- .../sourcemapSimpleNoOutdir/node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...cemapSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...cemapSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../sourcemapSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- .../sourcemapSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/bin/test.js.map | 2 +- ...pSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...pSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../amd/ref/m1.js.map | 2 +- .../sourcemapSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../sourcemapSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...apSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...apSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- .../amd/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- .../node/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 84 +- .../node/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../amd/diskFile0.js.map | 2 +- .../amd/ref/m1.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...cerootUrlMultifolderNoOutdir.sourcemap.txt | 84 +- .../node/test.js.map | 2 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../outputdir_multifolder/ref/m1.js.map | 2 +- .../simple/outputdir_multifolder/test.js.map | 2 +- .../outputdir_multifolder_ref/m2.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 84 +- .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../node/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 84 +- .../sourcerootUrlSimpleNoOutdir/amd/m1.js.map | 2 +- .../sourcerootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/m1.js.map | 2 +- .../sourcerootUrlSimpleNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...SimpleSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...otUrlSimpleSpecifyOutputFile.sourcemap.txt | 56 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../amd/test.js.map | 2 +- ...rcerootUrlSingleFileNoOutdir.sourcemap.txt | 28 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../node/outdir/simple/test.js.map | 2 +- ...leFileSpecifyOutputDirectory.sourcemap.txt | 28 +- .../amd/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../node/bin/test.js.map | 2 +- ...lSingleFileSpecifyOutputFile.sourcemap.txt | 28 +- .../amd/ref/m1.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js.map | 2 +- ...urcerootUrlSubfolderNoOutdir.sourcemap.txt | 56 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js.map | 2 +- ...folderSpecifyOutputDirectory.sourcemap.txt | 56 +- .../amd/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- .../node/bin/test.js.map | 2 +- ...rlSubfolderSpecifyOutputFile.sourcemap.txt | 56 +- tests/baselines/reference/properties.js.map | 2 +- .../reference/properties.sourcemap.txt | 52 +- .../recursiveClassReferenceTest.js.map | 2 +- .../recursiveClassReferenceTest.sourcemap.txt | 724 +++++------ .../reference/sourceMap-Comments.js.map | 2 +- .../sourceMap-Comments.sourcemap.txt | 158 +-- .../reference/sourceMap-Comments2.js.map | 2 +- .../sourceMap-Comments2.sourcemap.txt | 40 +- .../sourceMap-FileWithComments.js.map | 2 +- .../sourceMap-FileWithComments.sourcemap.txt | 202 +-- .../sourceMap-StringLiteralWithNewLine.js.map | 2 +- ...Map-StringLiteralWithNewLine.sourcemap.txt | 44 +- ...duleWithCommentPrecedingStatement01.js.map | 2 +- ...hCommentPrecedingStatement01.sourcemap.txt | 26 +- ...tionWithCommentPrecedingStatement01.js.map | 2 +- ...hCommentPrecedingStatement01.sourcemap.txt | 20 +- .../reference/sourceMapSample.js.map | 2 +- .../reference/sourceMapSample.sourcemap.txt | 416 +++--- .../reference/sourceMapValidationClass.js.map | 2 +- .../sourceMapValidationClass.sourcemap.txt | 166 +-- ...lidationClassWithDefaultConstructor.js.map | 2 +- ...nClassWithDefaultConstructor.sourcemap.txt | 34 +- ...ConstructorAndCapturedThisStatement.js.map | 2 +- ...ctorAndCapturedThisStatement.sourcemap.txt | 50 +- ...hDefaultConstructorAndExtendsClause.js.map | 2 +- ...tConstructorAndExtendsClause.sourcemap.txt | 56 +- .../sourceMapValidationClasses.js.map | 2 +- .../sourceMapValidationClasses.sourcemap.txt | 432 +++---- .../sourceMapValidationDecorators.js.map | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 372 +++--- .../reference/sourceMapValidationEnums.js.map | 2 +- .../sourceMapValidationEnums.sourcemap.txt | 54 +- ...sourceMapValidationExportAssignment.js.map | 2 +- ...apValidationExportAssignment.sourcemap.txt | 14 +- ...pValidationExportAssignmentCommonjs.js.map | 2 +- ...tionExportAssignmentCommonjs.sourcemap.txt | 14 +- ...alidationFunctionPropertyAssignment.js.map | 2 +- ...onFunctionPropertyAssignment.sourcemap.txt | 4 +- .../sourceMapValidationFunctions.js.map | 2 +- ...sourceMapValidationFunctions.sourcemap.txt | 110 +- .../sourceMapValidationImport.js.map | 2 +- .../sourceMapValidationImport.sourcemap.txt | 32 +- .../sourceMapValidationModule.js.map | 2 +- .../sourceMapValidationModule.sourcemap.txt | 98 +- .../sourceMapValidationStatements.js.map | 2 +- ...ourceMapValidationStatements.sourcemap.txt | 766 +++++------ .../sourceMapValidationWithComments.js.map | 2 +- ...rceMapValidationWithComments.sourcemap.txt | 126 +- ...sourceMapWithCaseSensitiveFileNames.js.map | 2 +- ...apWithCaseSensitiveFileNames.sourcemap.txt | 28 +- ...WithCaseSensitiveFileNamesAndOutDir.js.map | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 28 +- ...pleFilesWithFileEndingWithInterface.js.map | 2 +- ...sWithFileEndingWithInterface.sourcemap.txt | 46 +- ...rceMapWithNonCaseSensitiveFileNames.js.map | 2 +- ...ithNonCaseSensitiveFileNames.sourcemap.txt | 28 +- ...hNonCaseSensitiveFileNamesAndOutDir.js.map | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 28 +- .../sourcemapValidationDuplicateNames.js.map | 2 +- ...emapValidationDuplicateNames.sourcemap.txt | 68 +- tests/baselines/reference/tsxEmit3.js.map | 2 +- .../reference/tsxEmit3.sourcemap.txt | 254 ++-- .../baselines/reference/typeResolution.js.map | 2 +- .../reference/typeResolution.sourcemap.txt | 1150 ++++++++--------- 1186 files changed, 15701 insertions(+), 15702 deletions(-) diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts index 75246a9a26694..806ca7a845d2a 100644 --- a/src/harness/sourceMapRecorder.ts +++ b/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 + ")"; } } diff --git a/tests/baselines/reference/ES5For-of8.js.map b/tests/baselines/reference/ES5For-of8.js.map index be14106e77c3b..f4e62e46e18ba 100644 --- a/tests/baselines/reference/ES5For-of8.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/ES5For-of8.sourcemap.txt b/tests/baselines/reference/ES5For-of8.sourcemap.txt index 814f4364dc689..7a87dbf3998ea 100644 --- a/tests/baselines/reference/ES5For-of8.sourcemap.txt +++ b/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-> diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map index c47fcfcad3114..e8d4e52ad9672 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt index df0af71fb0224..53dce3e574c1f 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map index 9a2dd60999ef8..9ec6d18cc72db 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt index 30493b9734737..b589b7ad8eef1 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt +++ b/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 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map index 696204ae8da52..baf1e998efdc5 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt index c922e4f706db5..f6501777985f3 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt +++ b/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 >>>); diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.js.map index 251171232e03a..f8ca7ab584521 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.sourcemap.txt index 48149aee0b5a7..a6f9086e45561 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.sourcemap.txt +++ b/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 >^ diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map index 7c814c231e00d..247469aeb2db8 100644 --- a/tests/baselines/reference/contextualTyping.js.map +++ b/tests/baselines/reference/contextualTyping.js.map @@ -1,2 +1,2 @@ //// [contextualTyping.js.map] -{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","c9t5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAYA,sCAAsC;AACtC;IAAAA;QACIC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEIC;QACIC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IAETE,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAGC,CAACA;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAcC,eAAYA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA,CAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file +{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACE,QAAG,GAAqC,UAAS,CAAC;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IAET,QAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACf,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEX,MAAM,CAAC,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index 72419ef846a2e..3498ec016df93 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/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-> diff --git a/tests/baselines/reference/es3-sourcemap-amd.js.map b/tests/baselines/reference/es3-sourcemap-amd.js.map index e11de86943736..aa9f7aefe09de 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt index a20cfaa766dba..2a5a48fbe47b7 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/es5-souremap-amd.js.map b/tests/baselines/reference/es5-souremap-amd.js.map index b8412bd1e72e9..4c7e152e95bc1 100644 --- a/tests/baselines/reference/es5-souremap-amd.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt index 9b6b4af56ca71..3b5226d31f19d 100644 --- a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/es6-sourcemap-amd.js.map b/tests/baselines/reference/es6-sourcemap-amd.js.map index 779c13b129698..5c62572f0a6bc 100644 --- a/tests/baselines/reference/es6-sourcemap-amd.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt index 179dd79ba1700..db329263ffa00 100644 --- a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt +++ b/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 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> diff --git a/tests/baselines/reference/getEmitOutputMapRoots.baseline b/tests/baselines/reference/getEmitOutputMapRoots.baseline index 66130347d2d09..2c814ddb9b479 100644 --- a/tests/baselines/reference/getEmitOutputMapRoots.baseline +++ b/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 () { diff --git a/tests/baselines/reference/getEmitOutputSourceMap.baseline b/tests/baselines/reference/getEmitOutputSourceMap.baseline index 1f7056989e986..5859da0bb3eeb 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap.baseline +++ b/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 () { diff --git a/tests/baselines/reference/getEmitOutputSourceMap2.baseline b/tests/baselines/reference/getEmitOutputSourceMap2.baseline index df59ca001622f..c07c134519f6b 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap2.baseline +++ b/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 () { diff --git a/tests/baselines/reference/getEmitOutputSourceRoot.baseline b/tests/baselines/reference/getEmitOutputSourceRoot.baseline index 7b56ee5a4d82f..2c5e963b8b519 100644 --- a/tests/baselines/reference/getEmitOutputSourceRoot.baseline +++ b/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 () { diff --git a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline index 9df4711b3e165..fa4f33168226d 100644 --- a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline +++ b/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() { diff --git a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline index 2ae820dd53886..72167679f58f3 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline +++ b/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 () { diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline index 57b55c8a1f8e3..263983348aab0 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline +++ b/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 () { diff --git a/tests/baselines/reference/out-flag.js.map b/tests/baselines/reference/out-flag.js.map index 1d33d382ebacb..5d3af0ec652ae 100644 --- a/tests/baselines/reference/out-flag.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt index 397cfe346a386..82989f69583e7 100644 --- a/tests/baselines/reference/out-flag.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/out-flag2.js.map b/tests/baselines/reference/out-flag2.js.map index c1523e7578492..2c2f112b23855 100644 --- a/tests/baselines/reference/out-flag2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/out-flag2.sourcemap.txt b/tests/baselines/reference/out-flag2.sourcemap.txt index 6a67e61bc918d..160e00bd28ecf 100644 --- a/tests/baselines/reference/out-flag2.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/out-flag3.js.map b/tests/baselines/reference/out-flag3.js.map index a52d66589c7ac..5fb864821b7f2 100644 --- a/tests/baselines/reference/out-flag3.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/out-flag3.sourcemap.txt b/tests/baselines/reference/out-flag3.sourcemap.txt index c30c9f63020cc..a14ca70e61756 100644 --- a/tests/baselines/reference/out-flag3.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map index 44cd5ce9955bd..d27becbd0dcd5 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt index eec3a6014aa3e..1c2a46106ef1c 100644 --- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt @@ -25,7 +25,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(8, 9) Source(2, 1) + SourceIndex(0) name (A) +1->Emitted(8, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -33,16 +33,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(9, 9) Source(2, 18) + SourceIndex(0) name (A.constructor) -2 >Emitted(9, 10) Source(2, 19) + SourceIndex(0) name (A.constructor) +1->Emitted(9, 9) Source(2, 18) + SourceIndex(0) +2 >Emitted(9, 10) Source(2, 19) + SourceIndex(0) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(10, 17) Source(2, 19) + SourceIndex(0) name (A) +1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) +2 >Emitted(10, 17) Source(2, 19) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -54,8 +54,8 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(11, 5) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(11, 6) Source(2, 19) + SourceIndex(0) name (A) +1 >Emitted(11, 5) Source(2, 18) + SourceIndex(0) +2 >Emitted(11, 6) Source(2, 19) + SourceIndex(0) 3 >Emitted(11, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(11, 10) Source(2, 19) + SourceIndex(0) --- @@ -91,22 +91,22 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(16, 9) Source(2, 24) + SourceIndex(1) name (B) -2 >Emitted(16, 30) Source(2, 25) + SourceIndex(1) name (B) +1->Emitted(16, 9) Source(2, 24) + SourceIndex(1) +2 >Emitted(16, 30) Source(2, 25) + SourceIndex(1) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(17, 9) Source(2, 1) + SourceIndex(1) name (B) +1 >Emitted(17, 9) Source(2, 1) + SourceIndex(1) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(18, 13) Source(2, 24) + SourceIndex(1) name (B.constructor) -2 >Emitted(18, 43) Source(2, 25) + SourceIndex(1) name (B.constructor) +1->Emitted(18, 13) Source(2, 24) + SourceIndex(1) +2 >Emitted(18, 43) Source(2, 25) + SourceIndex(1) --- >>> } 1 >^^^^^^^^ @@ -114,16 +114,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(19, 9) Source(2, 28) + SourceIndex(1) name (B.constructor) -2 >Emitted(19, 10) Source(2, 29) + SourceIndex(1) name (B.constructor) +1 >Emitted(19, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(19, 10) Source(2, 29) + SourceIndex(1) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(20, 17) Source(2, 29) + SourceIndex(1) name (B) +1->Emitted(20, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(20, 17) Source(2, 29) + SourceIndex(1) --- >>> })(a_1.A); 1 >^^^^ @@ -139,8 +139,8 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(21, 5) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(21, 6) Source(2, 29) + SourceIndex(1) name (B) +1 >Emitted(21, 5) Source(2, 28) + SourceIndex(1) +2 >Emitted(21, 6) Source(2, 29) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 8) Source(2, 24) + SourceIndex(1) 5 >Emitted(21, 13) Source(2, 25) + SourceIndex(1) diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map index 77ff05f84fbf2..a46a7496db2bf 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt index 489487772dbf0..dce068013b468 100644 --- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt @@ -29,7 +29,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(12, 17) Source(2, 1) + SourceIndex(0) name (A) +1->Emitted(12, 17) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -37,16 +37,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(13, 17) Source(2, 18) + SourceIndex(0) name (A.constructor) -2 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) name (A.constructor) +1->Emitted(13, 17) Source(2, 18) + SourceIndex(0) +2 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) --- >>> return A; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(14, 25) Source(2, 19) + SourceIndex(0) name (A) +1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) +2 >Emitted(14, 25) Source(2, 19) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -58,8 +58,8 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(15, 13) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(15, 14) Source(2, 19) + SourceIndex(0) name (A) +1 >Emitted(15, 13) Source(2, 18) + SourceIndex(0) +2 >Emitted(15, 14) Source(2, 19) + SourceIndex(0) 3 >Emitted(15, 14) Source(2, 1) + SourceIndex(0) 4 >Emitted(15, 18) Source(2, 19) + SourceIndex(0) --- @@ -102,22 +102,22 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(30, 17) Source(2, 24) + SourceIndex(1) name (B) -2 >Emitted(30, 38) Source(2, 25) + SourceIndex(1) name (B) +1->Emitted(30, 17) Source(2, 24) + SourceIndex(1) +2 >Emitted(30, 38) Source(2, 25) + SourceIndex(1) --- >>> function B() { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(31, 17) Source(2, 1) + SourceIndex(1) name (B) +1 >Emitted(31, 17) Source(2, 1) + SourceIndex(1) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(32, 21) Source(2, 24) + SourceIndex(1) name (B.constructor) -2 >Emitted(32, 51) Source(2, 25) + SourceIndex(1) name (B.constructor) +1->Emitted(32, 21) Source(2, 24) + SourceIndex(1) +2 >Emitted(32, 51) Source(2, 25) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -125,16 +125,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(33, 17) Source(2, 28) + SourceIndex(1) name (B.constructor) -2 >Emitted(33, 18) Source(2, 29) + SourceIndex(1) name (B.constructor) +1 >Emitted(33, 17) Source(2, 28) + SourceIndex(1) +2 >Emitted(33, 18) Source(2, 29) + SourceIndex(1) --- >>> return B; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(34, 17) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(34, 25) Source(2, 29) + SourceIndex(1) name (B) +1->Emitted(34, 17) Source(2, 28) + SourceIndex(1) +2 >Emitted(34, 25) Source(2, 29) + SourceIndex(1) --- >>> })(a_1.A); 1 >^^^^^^^^^^^^ @@ -150,8 +150,8 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(35, 13) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(35, 14) Source(2, 29) + SourceIndex(1) name (B) +1 >Emitted(35, 13) Source(2, 28) + SourceIndex(1) +2 >Emitted(35, 14) Source(2, 29) + SourceIndex(1) 3 >Emitted(35, 14) Source(2, 1) + SourceIndex(1) 4 >Emitted(35, 16) Source(2, 24) + SourceIndex(1) 5 >Emitted(35, 21) Source(2, 25) + SourceIndex(1) diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map index 711163a76e862..8e4cd35fc3249 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt index c95eb22cb10ed..de9e34d106caf 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt +++ b/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) --- @@ -95,7 +95,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(15, 9) Source(3, 1) + SourceIndex(1) name (A) +1->Emitted(15, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -105,16 +105,16 @@ sourceFile:tests/cases/compiler/ref/a.ts > member: typeof GlobalFoo; > 2 > } -1->Emitted(16, 9) Source(5, 1) + SourceIndex(1) name (A.constructor) -2 >Emitted(16, 10) Source(5, 2) + SourceIndex(1) name (A.constructor) +1->Emitted(16, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 10) Source(5, 2) + SourceIndex(1) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) name (A) -2 >Emitted(17, 17) Source(5, 2) + SourceIndex(1) name (A) +1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 17) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -128,8 +128,8 @@ sourceFile:tests/cases/compiler/ref/a.ts 4 > export class A { > member: typeof GlobalFoo; > } -1 >Emitted(18, 5) Source(5, 1) + SourceIndex(1) name (A) -2 >Emitted(18, 6) Source(5, 2) + SourceIndex(1) name (A) +1 >Emitted(18, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(18, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(18, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(18, 10) Source(5, 2) + SourceIndex(1) --- @@ -167,22 +167,22 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(23, 9) Source(2, 24) + SourceIndex(2) name (B) -2 >Emitted(23, 30) Source(2, 25) + SourceIndex(2) name (B) +1->Emitted(23, 9) Source(2, 24) + SourceIndex(2) +2 >Emitted(23, 30) Source(2, 25) + SourceIndex(2) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(24, 9) Source(2, 1) + SourceIndex(2) name (B) +1 >Emitted(24, 9) Source(2, 1) + SourceIndex(2) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(25, 13) Source(2, 24) + SourceIndex(2) name (B.constructor) -2 >Emitted(25, 43) Source(2, 25) + SourceIndex(2) name (B.constructor) +1->Emitted(25, 13) Source(2, 24) + SourceIndex(2) +2 >Emitted(25, 43) Source(2, 25) + SourceIndex(2) --- >>> } 1 >^^^^^^^^ @@ -190,16 +190,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(26, 9) Source(2, 28) + SourceIndex(2) name (B.constructor) -2 >Emitted(26, 10) Source(2, 29) + SourceIndex(2) name (B.constructor) +1 >Emitted(26, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(26, 10) Source(2, 29) + SourceIndex(2) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(27, 9) Source(2, 28) + SourceIndex(2) name (B) -2 >Emitted(27, 17) Source(2, 29) + SourceIndex(2) name (B) +1->Emitted(27, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(27, 17) Source(2, 29) + SourceIndex(2) --- >>> })(a_1.A); 1 >^^^^ @@ -215,8 +215,8 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(28, 5) Source(2, 28) + SourceIndex(2) name (B) -2 >Emitted(28, 6) Source(2, 29) + SourceIndex(2) name (B) +1 >Emitted(28, 5) Source(2, 28) + SourceIndex(2) +2 >Emitted(28, 6) Source(2, 29) + SourceIndex(2) 3 >Emitted(28, 6) Source(2, 1) + SourceIndex(2) 4 >Emitted(28, 8) Source(2, 24) + SourceIndex(2) 5 >Emitted(28, 13) Source(2, 25) + SourceIndex(2) diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 8e555fb23f217..24a90ff9e954b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/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 @@ -181,7 +181,7 @@ sourceFile:../../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 0e907c1a2cad0..7ee1df9524621 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map index 1602fe4d4e088..2d046c948afe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 240277bfc7004..d44ed04f09ebb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/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 @@ -180,7 +180,7 @@ sourceFile:../../ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index cbb2dc3649237..a630d79aa96e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map index 1602fe4d4e088..2d046c948afe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 1a530c850e242..de0067c2473f5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/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 @@ -181,7 +181,7 @@ sourceFile:../../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 0e907c1a2cad0..7ee1df9524621 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 1602fe4d4e088..2d046c948afe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 511832f1de058..09c90aa1e6394 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/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 @@ -180,7 +180,7 @@ sourceFile:../../ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index cbb2dc3649237..a630d79aa96e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1602fe4d4e088..2d046c948afe3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 94371fe696d3e..4ffcb0252b2d1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 94348f987ce1b..1369ca14bcbf8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/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 @@ -175,7 +175,7 @@ sourceFile:../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index a580c050d07e2..b3feff79cab84 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 3f16355ad76da..783a11edfd4c3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 22aaecafe2d3d..b6eee92a83343 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index c0dbdb42cdf16..ff3711a23185a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/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 @@ -175,7 +175,7 @@ sourceFile:../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 2eab0f873245a..7813d8d45f113 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 963b3f3bb223e..67d311777c13a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/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 \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index b02c7fdd8c2bf..d105aadd66c03 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 4b883a84e706d..882d6c24f4cba 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:../../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 652d934d6022c..d6df6a2aa19cc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map index be0b3a580f51c..6934fa3cd534d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map index f9d0dd89e9ce8..5e98fe2825a91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 5ab3146b09944..9916b749d6fe7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,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->^^^^ @@ -438,16 +438,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 > @@ -461,8 +461,8 @@ sourceFile:../../test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 15bddd32fe5c9..150e5220bd7bb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map index eae921435ac84..76df4b5f82c13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 1236cb2c82711..10890a6970420 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:../../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 652d934d6022c..d6df6a2aa19cc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index be0b3a580f51c..6934fa3cd534d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index b02c7fdd8c2bf..d105aadd66c03 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 7fd3bf30722e4..67280d8b23937 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,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->^^^^ @@ -438,16 +438,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 > @@ -461,8 +461,8 @@ sourceFile:../../test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 15bddd32fe5c9..150e5220bd7bb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index eae921435ac84..76df4b5f82c13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index f9d0dd89e9ce8..5e98fe2825a91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index c532c3846d9a3..cfd8a5674ce1e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 4462b142d9804..6f0cbe742f7be 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 7f5576a8a9c7f..f31626dc2d803 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 834a5c3a112c1..4453e53c2952c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map index 80d6bbf450bb9..95ed215375ac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index ce271e4a3cd16..4fba7bb8a0dfb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 668c24e25c517..9a6067a275c54 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../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 > @@ -70,8 +70,8 @@ sourceFile:../m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map index de9ec1f985913..3f1f235645c92 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/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,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ebb800ef3dd85..750cbfcf1ded4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 7f5576a8a9c7f..f31626dc2d803 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 80d6bbf450bb9..95ed215375ac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ed2f07140c453..22cad8c44124b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../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 > @@ -70,8 +70,8 @@ sourceFile:../m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ce271e4a3cd16..4fba7bb8a0dfb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index de9ec1f985913..3f1f235645c92 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 6377a26395e5e..89c314ffb645c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index d8ab3db126671..738e852c7f3fb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index a8488d8a1345c..c100594d30472 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 88e67e19b3669..2eaa0e936b03c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map index 80d6bbf450bb9..95ed215375ac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index f227d9809ada5..14eb72017b052 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 420650feeac89..939cfd7fca3af 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map index 15d4e3e1c9b08..aa450e81a2677 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/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;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index f5cd30a8a50d0..0432e54d5c345 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 88e67e19b3669..2eaa0e936b03c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/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":";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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 80d6bbf450bb9..95ed215375ac7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 2e0ba5061ceca..42517a7e6ade0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 420650feeac89..939cfd7fca3af 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 15d4e3e1c9b08..aa450e81a2677 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/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;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index f77c1351b1584..18b0226c35402 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index d63cf86d23670..b938887a4acf7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map index bc33e2f8d720a..2b699d2706981 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index f630a92b4a99d..1c3193cbd2010 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.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_multifolder/mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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_multifolder/mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map index 05ee1332d71ef..cd0afe5bb0faa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map index bc33e2f8d720a..2b699d2706981 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index f630a92b4a99d..1c3193cbd2010 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.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_multifolder/mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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_multifolder/mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map index 05ee1332d71ef..cd0afe5bb0faa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 74b8b777ec312..7e1b50667b884 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.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_multifolder/mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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_multifolder/mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 05ee1332d71ef..cd0afe5bb0faa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index bc33e2f8d720a..2b699d2706981 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 74b8b777ec312..7e1b50667b884 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.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_multifolder/mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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_multifolder/mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 05ee1332d71ef..cd0afe5bb0faa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index bc33e2f8d720a..2b699d2706981 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 37b77beb154fa..16fc574b9c10f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_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":"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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 69830c04b5641..1d83cb2c7344e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.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 @@ -177,7 +177,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 37b77beb154fa..16fc574b9c10f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_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":"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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 69830c04b5641..1d83cb2c7344e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.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 @@ -177,7 +177,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map index 9ad95c3cfd4ca..6bbdb177623e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 86dae9982ec27..3098d176ceee3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map index 230b0e3381744..4556d50eb3075 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map index 9ad95c3cfd4ca..6bbdb177623e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 86dae9982ec27..3098d176ceee3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map index 230b0e3381744..4556d50eb3075 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 84f8b2e886a2e..39e884c2e811b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 9ad95c3cfd4ca..6bbdb177623e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 230b0e3381744..4556d50eb3075 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 84f8b2e886a2e..39e884c2e811b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 9ad95c3cfd4ca..6bbdb177623e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 230b0e3381744..4556d50eb3075 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map index b7b29ed1cf834..0f1b26bbb4c10 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index e020abba5a5b9..809260bb3bf10 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map index b7b29ed1cf834..0f1b26bbb4c10 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index e020abba5a5b9..809260bb3bf10 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 4433eb94534be..78f3538ee65e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 4433eb94534be..78f3538ee65e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 9b92dfb44558c..4528840f69b7e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 9b92dfb44558c..4528840f69b7e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index 85f4115a0ee3d..ed57bdb6f1ede 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index 85f4115a0ee3d..ed57bdb6f1ede 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_singleFile/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 702f520b4a6a1..4834c4ee4c436 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.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_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map index cba32efbabea0..bd2470b8ccf60 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 702f520b4a6a1..4834c4ee4c436 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.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_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map index cba32efbabea0..bd2470b8ccf60 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 68ca3d32ac991..186e55039a051 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.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_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index cba32efbabea0..bd2470b8ccf60 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/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,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 68ca3d32ac991..186e55039a051 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.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_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 43db599a09206..2ec23553c3b01 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index cba32efbabea0..bd2470b8ccf60 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/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,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 91ea14b3da422..0b06c40446086 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index a82ab38507bc8..7958222249dd3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 91ea14b3da422..0b06c40446086 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index a82ab38507bc8..7958222249dd3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index e6c67f2d66a12..2e4781ea76d4a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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=../../mapFiles/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -374,7 +374,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index 49da9789ec8a1..67e8b70639de8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 81bb9202e5a9c..4d37a85592e98 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map index 3fcfc31e4d1be..b142ff216f215 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index ad208f9375c4f..1c136477f286e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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=../../mapFiles/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,7 @@ sourceFile:../outputdir_mixed_subfolder/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->^^^^ @@ -383,16 +383,16 @@ sourceFile:../outputdir_mixed_subfolder/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 > @@ -406,8 +406,8 @@ sourceFile:../outputdir_mixed_subfolder/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) --- @@ -458,11 +458,11 @@ sourceFile:../outputdir_mixed_subfolder/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 > @@ -471,7 +471,7 @@ sourceFile:../outputdir_mixed_subfolder/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=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map index 49da9789ec8a1..67e8b70639de8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 98da596cfa43d..6ad4ef732753c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map index 3fcfc31e4d1be..b142ff216f215 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 181b1b84b5f27..e6842def391dc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -374,7 +374,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 49da9789ec8a1..67e8b70639de8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 81bb9202e5a9c..4d37a85592e98 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 3fcfc31e4d1be..b142ff216f215 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 4230c8e6366f1..216f6a944a1c9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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:../../outputdir_mixed_subfolder/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=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,7 @@ sourceFile:../outputdir_mixed_subfolder/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->^^^^ @@ -383,16 +383,16 @@ sourceFile:../outputdir_mixed_subfolder/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 > @@ -406,8 +406,8 @@ sourceFile:../outputdir_mixed_subfolder/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) --- @@ -458,11 +458,11 @@ sourceFile:../outputdir_mixed_subfolder/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 > @@ -471,7 +471,7 @@ sourceFile:../outputdir_mixed_subfolder/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=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 49da9789ec8a1..67e8b70639de8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 98da596cfa43d..6ad4ef732753c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 3fcfc31e4d1be..b142ff216f215 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index ca8dd0934b5b4..c311ad3591f6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index cfd0952c941db..547905cb97dfa 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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 @@ -175,7 +175,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 02be1ec09fbfc..b54fffed73f4e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 931a09b3ae6d6..12ac5dd705030 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 794d2a5817671..3406584c73b69 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index cb14a553f053a..04fb32e1d2f05 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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 @@ -175,7 +175,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 43710b5f06122..c5cc839430f52 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index eddbc79711cfd..1d5041d6d00f9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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:../outputdir_mixed_subfolder/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=../../mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 9745ad1a4ab6c..e9f528aa6ff15 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 12d96900c84c4..796cc24ede36a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -210,7 +210,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -220,16 +220,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -243,8 +243,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index e7200adafdbc0..a3ee5f5c5a5a9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map index f2b1ea701105c..5c480d5cfca0c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map index c2ac2bc27101a..c2846a461491e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 567b51cfff5f8..741a47081dc63 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:../../projects/outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:../../projects/outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 074ab743af3ed..2c5e6b0d422bd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map index 85da8e394210b..5bbce5100503e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 58dd5dfef8213..18a04eede7efb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -210,7 +210,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -220,16 +220,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -243,8 +243,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7200adafdbc0..a3ee5f5c5a5a9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index f2b1ea701105c..5c480d5cfca0c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 9745ad1a4ab6c..e9f528aa6ff15 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index b4900315771c4..75912ae748f8a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:../../projects/outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:../../projects/outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 074ab743af3ed..2c5e6b0d422bd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 85da8e394210b..5bbce5100503e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index c2ac2bc27101a..c2846a461491e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index a7235c6c2b368..abca41b470844 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 47e1835365a19..8a3e440d50d15 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index e2625035edb1b..73da1ac5c56dd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 76375ce0d0c9b..91176a8ecde87 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map index 5ce1629342421..ce35d107422ea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index 0950101384da7..23814887b4428 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index aff5583a5e9ac..d10d33dd98fa0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../outputdir_module_simple/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../outputdir_module_simple/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 > @@ -70,8 +70,8 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map index c0654a8e141c4..d17f6c723b235 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 458c6b0616238..a08c099059eee 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index e2625035edb1b..73da1ac5c56dd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 5ce1629342421..ce35d107422ea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index bcfdd607553c2..8ead1fb9593be 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../outputdir_module_simple/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../outputdir_module_simple/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 > @@ -70,8 +70,8 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 0950101384da7..23814887b4428 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index c0654a8e141c4..d17f6c723b235 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index b94a5ff18e5b1..a63aff1b36b54 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 8099c2f176aef..4398e601d3dfa 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 46af484749055..54c9ef1e304ce 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 66acf4aace791..e33df209633c4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map index 6139e8293b0ef..07229d468978e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 48f639a7ee2ee..3e2688c6c4e89 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../../outputdir_module_subfolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../../outputdir_module_subfolder/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 > @@ -70,8 +70,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 7e9c3643b9982..78ca8196e89d6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map index 64b21aa3115db..0d087fb4d98fc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 59c165fe0e3e7..7c5d0f70f505d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 66acf4aace791..e33df209633c4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 6139e8293b0ef..07229d468978e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index abf4b9d6a848d..76a74bc58e307 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../../outputdir_module_subfolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../../outputdir_module_subfolder/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 > @@ -70,8 +70,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 7e9c3643b9982..78ca8196e89d6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 64b21aa3115db..0d087fb4d98fc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index ae6d9b422211d..c0c0b0689aec9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index e666ef224a3cb..0bab7a9879b28 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map index b94901a1d6ea4..4065af78119e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index f820fb19c6506..e5bf488f3d0f0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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=../../../mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:../../projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:../../projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:../../projects/outputdir_multifolder/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=../../mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map index be7882c99f68c..2d94371174991 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map index ee5a589cb6289..2c4b424daf28d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map index b94901a1d6ea4..4065af78119e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index f820fb19c6506..e5bf488f3d0f0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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=../../../mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:../../projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:../../projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:../../projects/outputdir_multifolder/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=../../mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map index be7882c99f68c..2d94371174991 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map index ee5a589cb6289..2c4b424daf28d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index f9b0d9fd57ef6..ea4571b517c60 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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=../../../../../../mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:../../projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:../../projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:../../projects/outputdir_multifolder/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=../../../../../mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index be7882c99f68c..2d94371174991 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index ee5a589cb6289..2c4b424daf28d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index b94901a1d6ea4..4065af78119e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index f9b0d9fd57ef6..ea4571b517c60 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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:../../../projects/outputdir_multifolder/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=../../../../../../mapFiles/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:../../projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:../../projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:../../projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:../../projects/outputdir_multifolder/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=../../../../../mapFiles/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index be7882c99f68c..2d94371174991 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index ee5a589cb6289..2c4b424daf28d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index b94901a1d6ea4..4065af78119e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index fc3b27ea65c66..5fe8191c828b1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 534e9184f7b0f..ec7a51000b428 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../projects/outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../projects/outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../projects/outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map index fc3b27ea65c66..5fe8191c828b1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_multifolder/ref/m1.ts","../projects/outputdir_multifolder_ref/m2.ts","../projects/outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 534e9184f7b0f..ec7a51000b428 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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:../projects/outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../projects/outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../projects/outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../projects/outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map index 82ae367f41dc1..06c3d793d0036 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 880f12ff46171..7c6f2c2513d71 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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=../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map index bb43574904809..a0304c41f55a6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map index 82ae367f41dc1..06c3d793d0036 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 880f12ff46171..7c6f2c2513d71 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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=../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map index bb43574904809..a0304c41f55a6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 3ac5b5906405d..9b5cee44e8803 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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=../../../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 82ae367f41dc1..06c3d793d0036 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index bb43574904809..a0304c41f55a6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 3ac5b5906405d..9b5cee44e8803 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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=../../../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 82ae367f41dc1..06c3d793d0036 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index bb43574904809..a0304c41f55a6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map index 11bf13c6ac81c..c6dac016fa352 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 452ad2eb84115..cdfe8381ab41e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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 @@ -186,7 +186,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map index 11bf13c6ac81c..c6dac016fa352 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index 452ad2eb84115..cdfe8381ab41e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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:../outputdir_simple/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 @@ -186,7 +186,7 @@ sourceFile:../outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index b0d16a34e9aa0..3c5a58c134c08 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index b0d16a34e9aa0..3c5a58c134c08 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index ade0746d1bfd8..1234777c9c133 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index ade0746d1bfd8..1234777c9c133 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index b4f76aad2a38e..13278d30331ed 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map index e3d8cd8c37f2d..4fd259015f513 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index b4f76aad2a38e..13278d30331ed 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index 87f1e589a1251..ce2229723a356 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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=../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map index 67151dfbad59f..d27f0a2f6c387 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map index fe7aaf2252b05..2e3d358f1926c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index 87f1e589a1251..ce2229723a356 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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=../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map index 67151dfbad59f..d27f0a2f6c387 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map index fe7aaf2252b05..2e3d358f1926c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index f68430b295d2a..0e558e67ec2c0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 67151dfbad59f..d27f0a2f6c387 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index fe7aaf2252b05..2e3d358f1926c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index f68430b295d2a..0e558e67ec2c0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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:../../outputdir_subfolder/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=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 67151dfbad59f..d27f0a2f6c387 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index fe7aaf2252b05..2e3d358f1926c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index 9e7077cbe2511..c23b45ac58e6c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 8c4bedb4b3005..673c6572b5677 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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 @@ -186,7 +186,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map index 9e7077cbe2511..c23b45ac58e6c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 8c4bedb4b3005..673c6572b5677 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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:../outputdir_subfolder/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 @@ -186,7 +186,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 7c797a023a2ff..6bf4a2b529c51 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -374,7 +374,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index 18051b2af91c9..df653772beb82 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index c2157bc3b1b87..0f5f5cf0f7e1a 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map index 767d260e0b828..bd199ac9a0e0d 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 6aecdcd084ae7..8dca1559bd9dc 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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->^^^^ @@ -383,16 +383,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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 > @@ -406,8 +406,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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) --- @@ -458,11 +458,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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 > @@ -471,7 +471,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index 18051b2af91c9..df653772beb82 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0230aad40a59d..b61b34f055edd 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map index 767d260e0b828..bd199ac9a0e0d 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 06b8e768334c6..8cb77234642ea 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -374,7 +374,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 18051b2af91c9..df653772beb82 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index c2157bc3b1b87..0f5f5cf0f7e1a 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 767d260e0b828..bd199ac9a0e0d 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 468e5d2338b7f..3c2058bcd2dc7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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->^^^^ @@ -383,16 +383,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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 > @@ -406,8 +406,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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) --- @@ -458,11 +458,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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 > @@ -471,7 +471,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 18051b2af91c9..df653772beb82 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0230aad40a59d..b61b34f055edd 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 767d260e0b828..bd199ac9a0e0d 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index c6996bb53b9d7..17577d3546d14 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 0fa723ff01b48..a4f809db62883 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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 @@ -175,7 +175,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 0b202d40b8c6a..b322a9dd0bb77 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index bfe9f5dff6ad4..d4e651c5bc01f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index d78e3b4607a62..51451b71c5f51 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 6746d0609b6f9..a536b7903405c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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 @@ -175,7 +175,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 363ef3c21bf50..7cf551e7dc047 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 14ca884e9f7d0..b659a6c11c5ee 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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:file:///tests/cases/projects/outputdir_mixed_subfolder/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=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 66c8fa96a0b8e..d9acd94c2a548 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index f07b7d9212d5f..551e4bd33af31 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -210,7 +210,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -220,16 +220,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -243,8 +243,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 37bc803927189..41ee127a6f35b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map index 4e7e9721b83c0..efb5f39208427 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index ec29dfcad186b..aee18353538f7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index e3d905204b2d3..be65d7cc0795a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index c88465aaec47d..86d9101420139 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map index 6a18d277c1070..536a625dd6d73 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 34cc5d53b87b6..30804c5998c4c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -210,7 +210,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -220,16 +220,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -243,8 +243,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 37bc803927189..41ee127a6f35b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 4e7e9721b83c0..efb5f39208427 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 66c8fa96a0b8e..d9acd94c2a548 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 097d3769047b1..369780aeba35f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index c88465aaec47d..86d9101420139 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 6a18d277c1070..536a625dd6d73 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index ec29dfcad186b..aee18353538f7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 211bf71cbedf0..157ce395d153c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 5805c876be804..378636249a202 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map index d2270dfd2ce62..9f3ec1ffb4520 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index 7df7c4142e888..abbccf246f2a2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map index de9d99184d24d..9c3e6fa515fd5 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map index bc2e2667bcd70..ebdd91b2e81e0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index ff16dbdb8d68e..be57e02df9673 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map index b9c164bb73283..65b085f85ed4c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 4a730d962af85..5c93e1d11021f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index d2270dfd2ce62..9f3ec1ffb4520 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index de9d99184d24d..9c3e6fa515fd5 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 67a86d9d9ae97..1080bc3f44862 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index bc2e2667bcd70..ebdd91b2e81e0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index b9c164bb73283..65b085f85ed4c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 445268f27c17b..a1260336f45da 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 36bfe394d3907..4ac42e106d9a6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index d2d74c7219d48..a68ed748c2589 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index ec8a7690d4715..4e1e4067ed220 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map index 35691a873b83e..e30a7669d59c0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index acf02348d67ec..96b0628cdb492 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 95de442e92d38..b8ba80fd23897 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map index fee2f4cb12936..005a5ce83c05f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index b41fcbbc7b615..31f6509d55caf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index ec8a7690d4715..4e1e4067ed220 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 35691a873b83e..e30a7669d59c0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index a70074a2fbd23..e3921da4d814a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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 > @@ -70,8 +70,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 95de442e92d38..b8ba80fd23897 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index fee2f4cb12936..005a5ce83c05f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 439677f8aba06..0c0745ee8b247 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 617b90f7c814e..ece41d398b4db 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map index dd02f14d4a163..21fcb42a117c4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt index ceda6b4c058ad..570fdc7051940 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 57ced088c4146..51aa3088c8ece 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map index 04ab805bfcb24..c5bffb7504155 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map index dd02f14d4a163..21fcb42a117c4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt index ceda6b4c058ad..570fdc7051940 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map index 57ced088c4146..51aa3088c8ece 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map index 04ab805bfcb24..c5bffb7504155 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 2bf3e6591183b..5d6bc0ed0429b 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 57ced088c4146..51aa3088c8ece 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 04ab805bfcb24..c5bffb7504155 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index dd02f14d4a163..21fcb42a117c4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 2bf3e6591183b..5d6bc0ed0429b 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 57ced088c4146..51aa3088c8ece 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 04ab805bfcb24..c5bffb7504155 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index dd02f14d4a163..21fcb42a117c4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index aecd97d513692..fa2ace4860349 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 344b620620d79..36b0d16d1aa8b 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index aecd97d513692..fa2ace4860349 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 344b620620d79..36b0d16d1aa8b 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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:file:///tests/cases/projects/outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map index 0fc2c621e0a61..811549fe24b3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt index f13225988bd0b..9da8ea4abed3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map index ede8f059f004e..d11bc79cf0334 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map index 0fc2c621e0a61..811549fe24b3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt index f13225988bd0b..9da8ea4abed3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map index ede8f059f004e..d11bc79cf0334 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index c5c7205d89447..17c7f707a841b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 0fc2c621e0a61..811549fe24b3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index ede8f059f004e..d11bc79cf0334 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index c5c7205d89447..17c7f707a841b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 0fc2c621e0a61..811549fe24b3b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index ede8f059f004e..d11bc79cf0334 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index 29ba590802a13..141dd1ad65428 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index 27d691b2b1090..100a3db76a50b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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 @@ -186,7 +186,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index 29ba590802a13..141dd1ad65428 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index 27d691b2b1090..100a3db76a50b 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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:file:///tests/cases/projects/outputdir_simple/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 @@ -186,7 +186,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt index a0eb693f75319..169448dbcc252 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt index a0eb693f75319..169448dbcc252 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 22edc6e923d13..92a8de1c6069b 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 22edc6e923d13..92a8de1c6069b 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index b7c18ea6cd109..b894437e6230a 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index 420452cddcfb6..ee286c89ca6d4 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_singleFile/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index b7c18ea6cd109..b894437e6230a 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:file:///tests/cases/projects/outputdir_singleFile/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt index 7f311cb64eeb9..aa943fface2e5 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map index 74b0608f23623..3f248eb9a9f50 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map index 5883b6aac3f50..4b826d6120d90 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt index 7f311cb64eeb9..aa943fface2e5 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map index 74b0608f23623..3f248eb9a9f50 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map index 5883b6aac3f50..4b826d6120d90 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 5f992db632392..f3b69f5c9d2ee 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 74b0608f23623..3f248eb9a9f50 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 5883b6aac3f50..4b826d6120d90 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 5f992db632392..f3b69f5c9d2ee 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 74b0608f23623..3f248eb9a9f50 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 5883b6aac3f50..4b826d6120d90 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index 25ed0e8fc92f5..b9dedfdcff0e3 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index b8a52baa41e5f..15d09ffdb8918 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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 @@ -186,7 +186,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index 25ed0e8fc92f5..b9dedfdcff0e3 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index b8a52baa41e5f..15d09ffdb8918 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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:file:///tests/cases/projects/outputdir_subfolder/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 @@ -186,7 +186,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index d7a3195e99556..7fe57686484cd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index 04f168a6289cc..e0a454d9bd571 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index fe1ebdb1cc96a..a03c8c6f00968 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0ce68e169af7d..649185834529b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 6f2bf783957ab..c92ce6a5682e7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 04f168a6289cc..e0a454d9bd571 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index eff1de8b03918..5a2c18f1c9455 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0ce68e169af7d..649185834529b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 37bb9be8a9590..a12dbceafb4dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 1a75ab0b60194..39befa7956e1a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index a6626039aa21a..facd1d09335a2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index d1ab16ddf2b57..726cc1f8f73ee 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.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=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index f3058d9f8787f..eaeb7656f4d75 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 2a4bc95cbc247..761aedbcad465 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index ba9f4ee590ccc..f3f77743f872e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index da3d501acb7e7..5d18153232237 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.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=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 3b00d82ab66c4..d633a771659e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index e8aa1436d988a..b785f6cb68377 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 8c257bd111148..7e688e451b47e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map index 8612cd0d1085a..ebd470938c72a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index 058e405b6061e..bc02e6dd3556e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index a8f4f3bf2385b..6b355f2e100e6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index e7f54a4a2e144..0f0c69c2a6a59 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map index 4ac74c2fcdb7c..3092b58bc9648 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 009fa65f89ca6..230cb7a71113e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 8c257bd111148..7e688e451b47e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 8612cd0d1085a..ebd470938c72a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 3b00d82ab66c4..d633a771659e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 8fbb0bd391688..7421f638a219c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7f54a4a2e144..0f0c69c2a6a59 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 4ac74c2fcdb7c..3092b58bc9648 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 058e405b6061e..bc02e6dd3556e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 85e465474d309..98097928102aa 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 20a9789039979..af4fba87197a4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 6751f2f82cd22..cf78aceb7b01d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 06f3e02521d12..401358139c35a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index ca45773f423fb..cb701f714246b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 2843c88faf5ac..18ee99d7c0b8e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map index 41d3e11e99563..fa2686116eefb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 0f31c24c53996..2dcc2d3a8f6db 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 6751f2f82cd22..cf78aceb7b01d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 8b33b445d72bb..c59ecb7077118 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ca45773f423fb..cb701f714246b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 41d3e11e99563..fa2686116eefb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 2ace469f90296..3039b7ea3771c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index bd33dbb5ec7e0..d629e05614f27 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 89ea048e26883..fbf5088baef71 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6c5413f630e73..79f66a3b65709 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index bf0333f3d1263..aee99f1df4776 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 35e7e9a48dd7c..52bea82896609 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map index d0638b6c34ce5..2bd96b8731680 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c16c32be6b264..eaf597d4673ab 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6c5413f630e73..79f66a3b65709 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 363cd0e29f154..57ccdae87425d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 35e7e9a48dd7c..52bea82896609 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index d0638b6c34ce5..2bd96b8731680 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 29e01bc0bc6d2..239c3d618ba67 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 557f15f4e2a0b..fc6733e1e406b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index 8bcabc44e3ab9..ffce1098df610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index 8bcabc44e3ab9..ffce1098df610 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index e2d9eaa8dda3c..3e7b4d1b21bb9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index e2d9eaa8dda3c..3e7b4d1b21bb9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=http://www.typescriptlang.org/outputdir_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index 2e0ee57fe0504..429ef42162bf4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index f64fa277957ca..278bdb65bfc34 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index 2e0ee57fe0504..429ef42162bf4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index f64fa277957ca..278bdb65bfc34 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index a3179d120d8b6..7f41d24298398 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index a3179d120d8b6..7f41d24298398 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 232cdca7916b9..ef44bbeae905f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 232cdca7916b9..ef44bbeae905f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index f1c6e3bd1b7a7..d876a9633b4ec 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 8d22ea01f1692..72fc256960937 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index f1c6e3bd1b7a7..d876a9633b4ec 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 8d22ea01f1692..72fc256960937 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 13e178f926cdb..5abd520cdaea9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 13e178f926cdb..5abd520cdaea9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 3fe9cb43cbdd5..df39c21af9eb7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 3fe9cb43cbdd5..df39c21af9eb7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 8fff42e6b47be..a3604df7a9d99 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 8fff42e6b47be..a3604df7a9d99 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index e697e24c64d4c..e909fa2b9d9ab 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index e697e24c64d4c..e909fa2b9d9ab 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 50bebc38cbeb5..8d48c91668d75 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 50bebc38cbeb5..8d48c91668d75 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.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=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index e80a550275c2a..386fdffa417f3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index b885327d18679..a3eb3d49a399f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index e80a550275c2a..386fdffa417f3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index b885327d18679..a3eb3d49a399f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js.map b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js.map index de54805ee5425..d67fd5861cff8 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js.map +++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js.map @@ -1 +1 @@ -{"version":3,"file":"fileC.js","sourceRoot":"","sources":["../../../../FolderA/FolderB/FolderC/fileC.ts"],"names":["C","C.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fileC.js","sourceRoot":"","sources":["../../../../FolderA/FolderB/FolderC/fileC.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js.map b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js.map index 79496de73d952..161ad8891f6b9 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js.map +++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js.map @@ -1 +1 @@ -{"version":3,"file":"fileB.js","sourceRoot":"","sources":["../../../FolderA/FolderB/fileB.ts"],"names":["B","B.constructor"],"mappings":"AAAA,wCAAwC;AACxC;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"fileB.js","sourceRoot":"","sources":["../../../FolderA/FolderB/fileB.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC;IAAA;IAEA,CAAC;IAAD,QAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt index 0833854ab17d3..4ef619780a6a9 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.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->^^^^ @@ -27,16 +27,16 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 1->class C { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (C.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return C; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (C) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -49,8 +49,8 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 3 > 4 > class C { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (C) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- @@ -83,7 +83,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (B) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -93,16 +93,16 @@ sourceFile:../../../FolderA/FolderB/fileB.ts > public c: C; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (B.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (B.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return B; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) name (B) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -116,8 +116,8 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 4 > class B { > public c: C; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (B) +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) --- diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js.map b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js.map index de54805ee5425..d67fd5861cff8 100644 --- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js.map +++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js.map @@ -1 +1 @@ -{"version":3,"file":"fileC.js","sourceRoot":"","sources":["../../../../FolderA/FolderB/FolderC/fileC.ts"],"names":["C","C.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fileC.js","sourceRoot":"","sources":["../../../../FolderA/FolderB/FolderC/fileC.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js.map b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js.map index 79496de73d952..161ad8891f6b9 100644 --- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js.map +++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js.map @@ -1 +1 @@ -{"version":3,"file":"fileB.js","sourceRoot":"","sources":["../../../FolderA/FolderB/fileB.ts"],"names":["B","B.constructor"],"mappings":"AAAA,wCAAwC;AACxC;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"fileB.js","sourceRoot":"","sources":["../../../FolderA/FolderB/fileB.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC;IAAA;IAEA,CAAC;IAAD,QAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt index 0833854ab17d3..4ef619780a6a9 100644 --- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.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->^^^^ @@ -27,16 +27,16 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 1->class C { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (C.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return C; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (C) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -49,8 +49,8 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 3 > 4 > class C { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (C) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- @@ -83,7 +83,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (B) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -93,16 +93,16 @@ sourceFile:../../../FolderA/FolderB/fileB.ts > public c: C; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (B.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (B.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return B; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) name (B) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -116,8 +116,8 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 4 > class B { > public c: C; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (B) +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) --- diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js.map b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js.map index 9a35f3fbc3ecc..45953aa1384d9 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js.map +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js.map @@ -1 +1 @@ -{"version":3,"file":"fileC.js","sourceRoot":"SourceRootPath/","sources":["FolderB/FolderC/fileC.ts"],"names":["C","C.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fileC.js","sourceRoot":"SourceRootPath/","sources":["FolderB/FolderC/fileC.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js.map b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js.map index 41ef956764844..bf8cdf049728e 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js.map +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js.map @@ -1 +1 @@ -{"version":3,"file":"fileB.js","sourceRoot":"SourceRootPath/","sources":["FolderB/fileB.ts"],"names":["B","B.constructor"],"mappings":"AAAA,wCAAwC;AACxC;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"fileB.js","sourceRoot":"SourceRootPath/","sources":["FolderB/fileB.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC;IAAA;IAEA,CAAC;IAAD,QAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt index c0f24c52650a4..f7312546b9c1a 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:FolderB/FolderC/fileC.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->^^^^ @@ -27,16 +27,16 @@ sourceFile:FolderB/FolderC/fileC.ts 1->class C { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (C.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return C; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (C) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -49,8 +49,8 @@ sourceFile:FolderB/FolderC/fileC.ts 3 > 4 > class C { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (C) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- @@ -83,7 +83,7 @@ sourceFile:FolderB/fileB.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (B) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -93,16 +93,16 @@ sourceFile:FolderB/fileB.ts > public c: C; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (B.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (B.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return B; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) name (B) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -116,8 +116,8 @@ sourceFile:FolderB/fileB.ts 4 > class B { > public c: C; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (B) +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) --- diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js.map b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js.map index 9a35f3fbc3ecc..45953aa1384d9 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js.map +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js.map @@ -1 +1 @@ -{"version":3,"file":"fileC.js","sourceRoot":"SourceRootPath/","sources":["FolderB/FolderC/fileC.ts"],"names":["C","C.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fileC.js","sourceRoot":"SourceRootPath/","sources":["FolderB/FolderC/fileC.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js.map b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js.map index 41ef956764844..bf8cdf049728e 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js.map +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js.map @@ -1 +1 @@ -{"version":3,"file":"fileB.js","sourceRoot":"SourceRootPath/","sources":["FolderB/fileB.ts"],"names":["B","B.constructor"],"mappings":"AAAA,wCAAwC;AACxC;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"fileB.js","sourceRoot":"SourceRootPath/","sources":["FolderB/fileB.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC;IAAA;IAEA,CAAC;IAAD,QAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt index c0f24c52650a4..f7312546b9c1a 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:FolderB/FolderC/fileC.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->^^^^ @@ -27,16 +27,16 @@ sourceFile:FolderB/FolderC/fileC.ts 1->class C { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (C.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (C.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return C; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (C) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -49,8 +49,8 @@ sourceFile:FolderB/FolderC/fileC.ts 3 > 4 > class C { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (C) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (C) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- @@ -83,7 +83,7 @@ sourceFile:FolderB/fileB.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (B) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -93,16 +93,16 @@ sourceFile:FolderB/fileB.ts > public c: C; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (B.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (B.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return B; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) name (B) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -116,8 +116,8 @@ sourceFile:FolderB/fileB.ts 4 > class B { > public c: C; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (B) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (B) +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) --- diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index ec4f3128e18f9..f0aa7384842b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 381b239c573ab..c98918eea425d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 7e234d178b806..969a22ff126c8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map index b5e6eec3623b3..d795c3d1f0dca 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map index ec4f3128e18f9..f0aa7384842b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 2963737a5a064..92c865170ff62 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index f0b41e615ae1f..c49bb6636de69 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map index b5e6eec3623b3..d795c3d1f0dca 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index ec4f3128e18f9..f0aa7384842b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 381b239c573ab..c98918eea425d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index b5e6eec3623b3..d795c3d1f0dca 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 999019984d6cf..88a769b0692f5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index ec4f3128e18f9..f0aa7384842b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 2963737a5a064..92c865170ff62 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index b5e6eec3623b3..d795c3d1f0dca 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 9ed3d1262fa7b..23f36ea8f4cf0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 3aa34b0f8331c..553e2c2917e45 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 7ede7f02c360f..56384b24393da 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index cf4a14ae9e93c..11f204cc24202 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 7330eac1399a9..841774dd5d8e8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 454bdf3acb0de..2b99649fc57c8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index b686585c9775a..169f5f406419e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index f7d00d1aff9e8..a4bacca9ebe3c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 71a33c0180608..4cd16335c50f5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.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=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index c4c57a82e126f..f5c4331334935 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 71e1da5d3ccf8..e14b728dd46e9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 11b024ba13440..d3bd748ad6e67 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map index aeb0a1c3c5d12..592b96fbd1001 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map index 7e08245de722a..daf004c3b55f4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index de341c87ec136..44d48962b7441 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 9072b5c7129d6..e8f80c758440c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map index 0b67e7ee4815f..18639c662b1b3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 71e1da5d3ccf8..e14b728dd46e9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index aeb0a1c3c5d12..592b96fbd1001 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index c4c57a82e126f..f5c4331334935 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 0a60d710297e2..d2940564d5e6f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index de341c87ec136..44d48962b7441 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 0b67e7ee4815f..18639c662b1b3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 7e08245de722a..daf004c3b55f4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index fbbb2304152d6..9d14df31dfb0d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 0fd0b2def0c7e..80a58d92972f8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 8c710d9c4da3e..5a469df876a03 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 89373fc1cfaf0..1d4305e41813a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 0ff03b640b1a1..68a8bf01d78ad 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map index 945ed0583adfd..9c1f4a5283f7c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index 9bf6e024b3f55..96a18a01e7d65 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 55790d252721b..5816334e8f384 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map index a7792ef52426b..034f9cd6a8837 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 89373fc1cfaf0..1d4305e41813a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 945ed0583adfd..9c1f4a5283f7c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 52eadf10bdbc8..54f26f1f6417f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 9bf6e024b3f55..96a18a01e7d65 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index a7792ef52426b..034f9cd6a8837 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index e4c6d218e888b..f82ccd852c599 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index a910369c3e4bf..c88cea943628b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 827aa235ef262..c37bfdf9b76b1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6f750f89857a4..142e9c6ee87d1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 990b84fd4fd97..11690d331dc0e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map index f65cfa554d17b..2989145088a4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 19b046a427c58..eb122749c16b3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 757d17973aff9..e6a37f0e52bf3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map index c63a094397635..a74f5b47bd6b2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6f750f89857a4..142e9c6ee87d1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index f65cfa554d17b..2989145088a4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 4491a6dbea557..14b7c6fbdae20 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 19b046a427c58..eb122749c16b3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index c63a094397635..a74f5b47bd6b2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 4849be6e95a34..5d98a1433f21d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 30bac946d14ac..a7747ef079d52 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index af6c2b21fdc89..cf09d609fac49 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map index c41bb34558123..6d8889bab5042 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map index e43074326e06b..1ed71a40f7805 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index b7293d81f542d..43858f6ab7a2c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map index da7206b4e32be..02d8fb800bf07 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map index c41bb34558123..6d8889bab5042 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map index e43074326e06b..1ed71a40f7805 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index b7293d81f542d..43858f6ab7a2c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map index da7206b4e32be..02d8fb800bf07 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index e43074326e06b..1ed71a40f7805 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index da7206b4e32be..02d8fb800bf07 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index c41bb34558123..6d8889bab5042 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index a76377a99e468..6de3c355d6f18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index e43074326e06b..1ed71a40f7805 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index da7206b4e32be..02d8fb800bf07 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index c41bb34558123..6d8889bab5042 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index a76377a99e468..6de3c355d6f18 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index 9ce443017eb07..35b866d6488c0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 23f41f64947a5..bc639f73abf91 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map index 9ce443017eb07..35b866d6488c0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 23f41f64947a5..bc639f73abf91 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map index 166a894f9bc4a..9443bade40329 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 0087d5d671695..0062e88d20e43 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map index 68302f9245b3f..e0b6ac94e0dab 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map index 166a894f9bc4a..9443bade40329 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 0087d5d671695..0062e88d20e43 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map index 68302f9245b3f..e0b6ac94e0dab 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 166a894f9bc4a..9443bade40329 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 68302f9245b3f..e0b6ac94e0dab 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index a0c7d8cd9768a..98cd3b2fce21a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 166a894f9bc4a..9443bade40329 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 68302f9245b3f..e0b6ac94e0dab 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index a0c7d8cd9768a..98cd3b2fce21a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map index 28168d6c0ced4..7156ba8dc5440 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index f4897f2cd52e4..ff2cacede465f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map index 28168d6c0ced4..7156ba8dc5440 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index f4897f2cd52e4..ff2cacede465f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 8a378aeb6339a..125a4421ad971 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 8a378aeb6339a..125a4421ad971 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index d7ecfe75c3598..9a26f02b8a576 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index d7ecfe75c3598..9a26f02b8a576 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index ab2d0e10bd34c..e5ab088d09287 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map index d4b7f1b88c671..9b57a17d7b863 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_singleFile/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index ab2d0e10bd34c..e5ab088d09287 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map index 0cd3d17ea8ff5..3f9a2d1663c38 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 9d5c143cfd46c..2ef04f2b3f77d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map index 9979f6eb7d561..624510e0e30a1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map index 0cd3d17ea8ff5..3f9a2d1663c38 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 9d5c143cfd46c..2ef04f2b3f77d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map index 9979f6eb7d561..624510e0e30a1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 0cd3d17ea8ff5..3f9a2d1663c38 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 9979f6eb7d561..624510e0e30a1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 63af6359f7ef6..d197965afca05 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 0cd3d17ea8ff5..3f9a2d1663c38 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 9979f6eb7d561..624510e0e30a1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 63af6359f7ef6..d197965afca05 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index d11b23b98c4c7..38a56a19d6ece 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6a0176bdacd0a..6b213c2a75c32 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map index d11b23b98c4c7..38a56a19d6ece 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6a0176bdacd0a..6b213c2a75c32 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 0927206ec1bd1..18642fd6b92eb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index a144760b69f8f..d0ac5895087ed 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map index 6014ca9159858..d1d1c89c2d09c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 84f18c56247b3..c03088ddef1b7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 64ebd330860a1..cd7b5c94f43e7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map index 6014ca9159858..d1d1c89c2d09c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 0927206ec1bd1..18642fd6b92eb 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 6014ca9159858..d1d1c89c2d09c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index a8377701181ab..d1bfd626bde8e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 84f18c56247b3..c03088ddef1b7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 6014ca9159858..d1d1c89c2d09c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index d8857daae5c01..57344b47a2e26 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 62f932a571e19..e74e7cd0aa124 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index d722bc8936af3..4b5c1990860ed 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index 03976e6a8d68e..f406d61a6f1b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index b71c21b5b99d6..a4e47c43e8e5b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index a9529891ffd37..07a4d87993fab 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index d1799c07a98c0..c0b85afcabb2b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 239577614701f..6bd9a36c15d02 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 2a0cc630cc05c..b424fde902b88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.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=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 414fa845b2ec7..b901c4216b1ef 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 0cdc44d330d6d..87fde1b1fc091 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 77e69f9879021..0fc10da2d063b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map index 20138821cfe42..16801c3c52ad0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map index 92fd6e19cfb36..1301ec29c6f83 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 292dcb61933f2..c357e30eab94f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 095d4b65fdfbe..87853b40d402b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map index a603394fc15a9..5a4611f70d753 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 0cdc44d330d6d..87fde1b1fc091 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 20138821cfe42..16801c3c52ad0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 414fa845b2ec7..b901c4216b1ef 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 82da7e4770b15..d448bfea7c481 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 292dcb61933f2..c357e30eab94f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index a603394fc15a9..5a4611f70d753 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 92fd6e19cfb36..1301ec29c6f83 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 28aa64ae076f7..a01933c295d1c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 39dcc66e06b8d..ad5d1bec31bff 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 43c4340ba370b..22cbf468a27aa 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index e0af3af9b222c..90bd33a75ded9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index b4f6ed8c48879..a2cfea82b4a00 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map index 22f07c1754496..65782697205b0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index 05c53f0182efb..307314f1b376a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 82c62b23d3c1c..1047b68c140ba 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map index 1e72e2a220395..cc920d4b3072b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index e0af3af9b222c..90bd33a75ded9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 22f07c1754496..65782697205b0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index cf74f45b0dc24..141ba81fb1e32 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 05c53f0182efb..307314f1b376a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1e72e2a220395..cc920d4b3072b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index d94164cc05673..672182a35393f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 262e5cdc1f397..0694f9887300b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index fc0f367f34368..d0986b1a01070 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index aaae11bb5b5be..c868a96ea0bc5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index a483e0ff9fc60..71ccf39ce3f46 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map index 22f07c1754496..65782697205b0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 702b574b61472..1ab2f12428888 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 4e25047bafc0f..a97a677bc8a17 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map index b3972a3cfc174..7f38b9e6e3db4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index aaae11bb5b5be..c868a96ea0bc5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 22f07c1754496..65782697205b0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index fe64e38c46853..059d8090022da 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 702b574b61472..1ab2f12428888 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index b3972a3cfc174..7f38b9e6e3db4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index ebcaec60aaac2..22d0354932bb3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index dc294ebd160d1..54c54aafec978 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 83f9ef1f262eb..a923a71015662 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map index dfe53a2f98c5d..b0102393a6d27 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map index ebf5d6bc88620..8b0aa0b151b13 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index 20c4a628b797f..1e7409b877877 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map index 1c3b0105b5f0b..52a842ad8ea68 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map index dfe53a2f98c5d..b0102393a6d27 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map index ebf5d6bc88620..8b0aa0b151b13 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index 20c4a628b797f..1e7409b877877 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map index 1c3b0105b5f0b..52a842ad8ea68 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index ebf5d6bc88620..8b0aa0b151b13 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 1c3b0105b5f0b..52a842ad8ea68 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index dfe53a2f98c5d..b0102393a6d27 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 325718e37e1e1..f22687619bc07 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index ebf5d6bc88620..8b0aa0b151b13 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 1c3b0105b5f0b..52a842ad8ea68 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index dfe53a2f98c5d..b0102393a6d27 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 325718e37e1e1..f22687619bc07 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map index d7eeef9ca4955..57f6637b4f498 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 46af9b6678ba0..53d479879d67c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map index d7eeef9ca4955..57f6637b4f498 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 46af9b6678ba0..53d479879d67c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map index 66ee252767864..7cd5a10b95d24 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 181dcd2d8c672..02199705e318d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map index eb9e3b663f1ac..5e5a862e511f0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map index 66ee252767864..7cd5a10b95d24 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 181dcd2d8c672..02199705e318d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map index eb9e3b663f1ac..5e5a862e511f0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 66ee252767864..7cd5a10b95d24 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index eb9e3b663f1ac..5e5a862e511f0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 3a97d4540e29c..43993182320e0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 66ee252767864..7cd5a10b95d24 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index eb9e3b663f1ac..5e5a862e511f0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 3a97d4540e29c..43993182320e0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map index cc3b39712085f..b1adff8db7eb9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index c85101c002636..c797be4d43260 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map index cc3b39712085f..b1adff8db7eb9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index c85101c002636..c797be4d43260 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index 17acf414c6dbc..e125816f9a18e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index 17acf414c6dbc..e125816f9a18e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 161f1a1befb0c..3c8bc78f8f3cc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 161f1a1befb0c..3c8bc78f8f3cc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index b282a6db091d9..6d92e64eb643f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map index d6fa9b1eda688..ce0e34920488b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index b282a6db091d9..6d92e64eb643f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index e3643a7e1e4da..64d3f901d6d29 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map index 7792f8a3df67f..0fee1b5aff796 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index e3643a7e1e4da..64d3f901d6d29 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map index 7792f8a3df67f..0fee1b5aff796 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 7792f8a3df67f..0fee1b5aff796 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index c76e3a2c05c7e..e9073db7f8e6c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 17c695312b304..003271f673071 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 7792f8a3df67f..0fee1b5aff796 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index c76e3a2c05c7e..e9073db7f8e6c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map index ef39d6c5cdbce..2b18772f2d69c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index c0ad748bf2bcb..e66acb3fe680b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map index ef39d6c5cdbce..2b18772f2d69c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index c0ad748bf2bcb..e66acb3fe680b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map index cbb7eed495327..63515fe31eadf 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index 40be0ca660cbd..0df5279d9e601 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map index c9a79b35d3c52..6be8dbd2c2fe0 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map index 0826e9e95f33a..b0920b4ceb40c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index d3eeabc27b53f..bcdea4d83e551 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map index c9a79b35d3c52..6be8dbd2c2fe0 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index aabf49f904d98..fa1fe6ea3c7f4 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index bad31ecf8d2a4..6e310b886d412 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 4557384d5b831..56b7bf6916e93 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:../../../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:../../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:../../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index e31d90a8f0c70..055f6d365884c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index bad31ecf8d2a4..6e310b886d412 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 7a377d04299ef..1f4ecba9f66cc 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:../../../ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:../../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:../../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:../../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 94371fe696d3e..4ffcb0252b2d1 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index 821236c5c8505..d09317a643150 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.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 @@ -175,7 +175,7 @@ sourceFile:../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index a580c050d07e2..b3feff79cab84 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index e37948398a3c8..08c87a22d2371 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 22aaecafe2d3d..b6eee92a83343 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 4394eb0748eaf..68471a480afa5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.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 @@ -175,7 +175,7 @@ sourceFile:../ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index 2eab0f873245a..7813d8d45f113 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 9486ad5e3a79d..67bff3854348a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.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=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map index cbb7eed495327..63515fe31eadf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map index 51755e4c9a347..59a6906dc3a64 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 383a66a6e2fb5..ddf94de0cb755 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -210,7 +210,7 @@ sourceFile:m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -220,16 +220,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -243,8 +243,8 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map index 462fa38ab4239..1189804417dcd 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map index 0826e9e95f33a..b0920b4ceb40c 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map index 095951a67d097..08873af0fb445 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 0036386e6c44a..0da8427676160 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,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->^^^^ @@ -438,16 +438,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 > @@ -461,8 +461,8 @@ sourceFile:test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map index 3b3ef6b145c44..beb2f169f2b00 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 820b088730f71..4e804534b20b9 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 181025cda92fd..bedb71ac1266d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index ac636fcee1646..951753e5d723f 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 7158e15c4935b..47cd3f9a8c12d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:../../../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:../../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:../../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:../../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:../../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 6df33fbb9e655..a54ce6e186aec 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index cda16e9fb3e0c..376c49fcc1612 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 5a37db58aa093..4d31ab33c51c7 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 0548113dc8198..e0c9ecf522d29 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,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->^^^^ @@ -438,16 +438,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 > @@ -461,8 +461,8 @@ sourceFile:../../../test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:../../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:../../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index c532c3846d9a3..cfd8a5674ce1e 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6c8bdf4da742c..03bbf02e05cee 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map index 51755e4c9a347..59a6906dc3a64 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt index b461163a8b8e4..bcbcf45417be6 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map index 9bcc170386cc8..0a71062733ad2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map index 095951a67d097..08873af0fb445 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt index d5247e7eeb021..18f20a86868eb 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map index 7bae4ed7491a2..a96a7c935dc92 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/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,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 4a09f6eebdda0..241f72a6745c5 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 67882e5327bfc..8e25f5d298d61 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c8c025ac58271..1a7be7185cb50 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index fbcf63377be22..ed202459a4e98 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 1c53bf2849cf2..d81ee7d0d8fad 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 8fda552208ba7..ca311af9472ef 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../../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->^^^^ @@ -47,16 +47,16 @@ sourceFile:../../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 > @@ -70,8 +70,8 @@ sourceFile:../../m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 6377a26395e5e..89c314ffb645c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index 71c0a41b2d11a..c83e5fee86a93 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map index 51755e4c9a347..59a6906dc3a64 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index b6ddd879bc183..cba7424e20130 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map index 9bcc170386cc8..0a71062733ad2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map index 095951a67d097..08873af0fb445 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index 3319b4e31f9dc..3f7647f227ee3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map index 56d42d8bdfd58..38ce9cbe7be1a 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/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;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 652d934d6022c..d6df6a2aa19cc 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/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":";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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 67882e5327bfc..8e25f5d298d61 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index de5d168dad2c1..d07f7b01fc2d4 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:../../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 15bddd32fe5c9..150e5220bd7bb 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index bcab7aa3bc644..62804c7ae0812 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/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;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index a9427c9fc8bbc..bfe3f249f1c20 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:../../../ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index f77c1351b1584..18b0226c35402 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index 9c12e1749caaf..d074e78ce3c88 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:../test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map index 5511f8eed7a74..ffa9f9f880132 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt index 9f8f5856ae82f..fae25202ebf25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map index 38fe91174ea14..e267093ff28c1 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map index 5511f8eed7a74..ffa9f9f880132 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt index 9f8f5856ae82f..fae25202ebf25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map index 38fe91174ea14..e267093ff28c1 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index b9e02d043489a..3a3e660ebb593 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 4c7bad4f920d8..5fecc97d364a2 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index 8bb6ed1465023..909bc0e42eff5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index cb0659450da97..b638e890cfce2 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index b9e02d043489a..3a3e660ebb593 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 4c7bad4f920d8..5fecc97d364a2 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index 8bb6ed1465023..909bc0e42eff5 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index cb0659450da97..b638e890cfce2 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,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->^^^^ @@ -355,16 +355,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 > @@ -378,8 +378,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) --- @@ -430,11 +430,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 > @@ -443,7 +443,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map index 37b77beb154fa..16fc574b9c10f 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_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":"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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index fa9ebc580e629..efde82f881cd9 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.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 @@ -177,7 +177,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map index 37b77beb154fa..16fc574b9c10f 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_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":"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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index fa9ebc580e629..efde82f881cd9 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.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 @@ -177,7 +177,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt index 17bbd902b9603..2eb83abfe6a56 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map index 69f4d8bbfc17c..432c227c72b7e 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt index 17bbd902b9603..2eb83abfe6a56 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map index 69f4d8bbfc17c..432c227c72b7e 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index dcba20cf66a51..d3339c99f1950 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 5ec3a45d1bd61..9026931ffe9c4 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index 0a6c6e15aa1c6..afe348176d3c5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../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:../../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:../../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:../../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:../../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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index dcba20cf66a51..d3339c99f1950 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 5ec3a45d1bd61..9026931ffe9c4 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index 0a6c6e15aa1c6..afe348176d3c5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../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:../../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:../../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:../../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:../../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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map index b7b29ed1cf834..0f1b26bbb4c10 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 6343dcc34c6d5..246480ea6fba5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map index b7b29ed1cf834..0f1b26bbb4c10 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 6343dcc34c6d5..246480ea6fba5 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../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:../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:../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:../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:../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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt index 0b09b971bcbec..662bee468cda5 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map index 3cb3f00b46d7f..27d7a9ee7335c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt index 0b09b971bcbec..662bee468cda5 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map index 3cb3f00b46d7f..27d7a9ee7335c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index d2bb04b222685..9b9740e35556c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index dffdc150f7185..2b86d9f68227a 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index d2bb04b222685..9b9740e35556c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index dffdc150f7185..2b86d9f68227a 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index 127f06d960ee7..8dcf4e9b92851 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map index c15b0f9ed70ea..1ea77ceaed18f 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index 127f06d960ee7..8dcf4e9b92851 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt index 6bdf8e8ef313b..e9fd62ee40df4 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map index ef084bb212820..ec2e68648b7d2 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map index da83de7ea2e73..fa208c79390a5 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt index 6bdf8e8ef313b..e9fd62ee40df4 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map index ef084bb212820..ec2e68648b7d2 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 22a81dc63bc12..21d3e73474e5f 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/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,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index 2de709b09abb8..fd9ac18f50808 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8be5eb8e01a4..1733ce017197a 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 22a81dc63bc12..21d3e73474e5f 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/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,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index 2de709b09abb8..fd9ac18f50808 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:../../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:../../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map index 91ea14b3da422..0b06c40446086 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 9ca0493ff415e..09d4554b31828 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map index 91ea14b3da422..0b06c40446086 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 9ca0493ff415e..09d4554b31828 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:../test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index 04f168a6289cc..e0a454d9bd571 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 6abc36a083230..85d90c0e0a74f 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0ce68e169af7d..649185834529b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 49e704a99e1f8..d51a6fa992688 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 04f168a6289cc..e0a454d9bd571 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 7e0989aabb01e..9520b49d86568 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -181,7 +181,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -191,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -280,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -293,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0ce68e169af7d..649185834529b 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index e425f41290b8a..ba0f9afb8202a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 3d19accc614eb..744288284468d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: m2.js @@ -180,7 +180,7 @@ sourceFile:ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -190,16 +190,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -213,8 +213,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -279,11 +279,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -292,8 +292,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -373,7 +373,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->^^^^ @@ -383,16 +383,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 > @@ -406,8 +406,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) --- @@ -458,11 +458,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 > @@ -471,7 +471,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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 37bb9be8a9590..a12dbceafb4dd 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 51a641cb750a4..5310d6d6814e0 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map index a6626039aa21a..facd1d09335a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 38aecc15857f0..c4c07a7d1d0ad 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index f3058d9f8787f..eaeb7656f4d75 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index df760dc79b022..6f7ef24fcda5c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.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 @@ -175,7 +175,7 @@ sourceFile:ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -185,16 +185,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -208,8 +208,8 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) --- @@ -274,11 +274,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -287,8 +287,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -362,7 +362,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -372,16 +372,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -395,8 +395,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) --- @@ -447,11 +447,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -460,7 +460,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map index ba9f4ee590ccc..f3f77743f872e 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index c8507ca7df84d..2d42454f204fe 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.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=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 3b00d82ab66c4..d633a771659e1 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 8c257bd111148..7e688e451b47e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 0fa4d7bfa36f5..e7826e39784ae 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map index 8612cd0d1085a..ebd470938c72a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map index 058e405b6061e..bc02e6dd3556e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index e7f54a4a2e144..0f0c69c2a6a59 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 625e81c473819..caaa9e90fb7a7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map index 4ac74c2fcdb7c..3092b58bc9648 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 8c257bd111148..7e688e451b47e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map index 8612cd0d1085a..ebd470938c72a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 3b00d82ab66c4..d633a771659e1 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 8a9a8cba4301e..32bb9a5296243 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) 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, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 9) 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, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -309,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -322,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -384,7 +384,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -394,16 +394,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -417,8 +417,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) --- @@ -483,11 +483,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -496,8 +496,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7f54a4a2e144..0f0c69c2a6a59 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map index 4ac74c2fcdb7c..3092b58bc9648 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map index 058e405b6061e..bc02e6dd3556e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index f2cac8f7a2abc..c2ee169442953 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -47,16 +47,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -70,8 +70,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -208,7 +208,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -218,16 +218,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -241,8 +241,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -307,11 +307,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -320,8 +320,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -428,7 +428,7 @@ sourceFile:outputdir_module_multifolder/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->^^^^ @@ -438,16 +438,16 @@ sourceFile:outputdir_module_multifolder/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 > @@ -461,8 +461,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) --- @@ -527,11 +527,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) +5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) --- >>>} 1 > @@ -540,8 +540,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 85e465474d309..98097928102aa 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index d2331ef357941..7eb5eacc3ca4f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -204,7 +204,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -214,16 +214,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) +2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -237,8 +237,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) --- @@ -303,11 +303,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) +4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) +5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -316,8 +316,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -372,7 +372,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^^^^^ @@ -382,16 +382,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) +2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) --- >>> })(); 1 >^^^^ @@ -405,8 +405,8 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) 3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) 4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) --- @@ -471,11 +471,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) +2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) +3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) +4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) +5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -484,8 +484,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) +2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 6751f2f82cd22..cf78aceb7b01d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 15f5ae4bc9321..2db8ae246ddf6 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index ca45773f423fb..cb701f714246b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 75f6eb8394069..6fcfe48c6d9f4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map index 41d3e11e99563..fa2686116eefb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 6751f2f82cd22..cf78aceb7b01d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 6a53c3e993607..a20ca08711b78 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ca45773f423fb..cb701f714246b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index 41d3e11e99563..fa2686116eefb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c4f12e28fe814..b3a76f102f83c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile: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->^^^^ @@ -47,16 +47,16 @@ sourceFile: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 > @@ -70,8 +70,8 @@ sourceFile:m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 2ace469f90296..3039b7ea3771c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index e0c060eb88922..31142e112d4e4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -71,8 +71,8 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6c5413f630e73..79f66a3b65709 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 880d55412f825..0068f4294d804 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 35e7e9a48dd7c..52bea82896609 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 7fc9e0c1f6090..a66a51f00341b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map index d0638b6c34ce5..2bd96b8731680 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6c5413f630e73..79f66a3b65709 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a57b57d2b17db..88a4bc419885a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index fdfa62ec27bbd..b622673b2e368 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -211,7 +211,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -221,16 +221,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -244,8 +244,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) --- @@ -310,11 +310,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -323,8 +323,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 35e7e9a48dd7c..52bea82896609 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index d0638b6c34ce5..2bd96b8731680 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c97d88b3d59a3..3e88b9083ca2f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -37,7 +37,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->^^^^ @@ -47,16 +47,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 > @@ -70,8 +70,8 @@ sourceFile:ref/m1.ts 4 > export 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) --- @@ -136,11 +136,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) +5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) --- >>>} 1 > @@ -149,8 +149,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -232,7 +232,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -242,16 +242,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -265,8 +265,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -331,11 +331,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) +5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -344,8 +344,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) --- >>>exports.f1 = f1; 1-> diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 29e01bc0bc6d2..239c3d618ba67 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 54624487a5772..7e3b7d9e1d89a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:ref/m1.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -48,16 +48,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 21) 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, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) 4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) --- @@ -137,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) +4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) +5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -150,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) +2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -205,7 +205,7 @@ sourceFile:test.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -215,16 +215,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -238,8 +238,8 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) 3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) 4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) --- @@ -304,11 +304,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) +2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) +3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) +4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) +5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -317,8 +317,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) +2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) --- >>> exports.f1 = f1; 1->^^^^ diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index a70e80c9c1a54..fb198e5f490b9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile0.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index a70e80c9c1a54..fb198e5f490b9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 4f4f068056fa9..ff2fee631b4da 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map index 64aafef0915ff..97e0d452dba03 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map index 859053b551029..d668056049e25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map index e652c011c172f..02fe5ddcde59d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder_ref/m2.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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 4f4f068056fa9..ff2fee631b4da 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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=m1.js.map=================================================================== JsFile: m2.js @@ -183,7 +183,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -193,16 +193,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -216,8 +216,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_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) --- @@ -268,11 +268,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m2_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 > @@ -281,8 +281,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -345,7 +345,7 @@ sourceFile:outputdir_multifolder/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->^^^^ @@ -355,16 +355,16 @@ sourceFile:outputdir_multifolder/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 > @@ -378,8 +378,8 @@ sourceFile:outputdir_multifolder/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) --- @@ -430,11 +430,11 @@ sourceFile:outputdir_multifolder/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 > @@ -443,7 +443,7 @@ sourceFile:outputdir_multifolder/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=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map index 2e0ee57fe0504..429ef42162bf4 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 823af8d1bc3ed..16d11d70bbfdd 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map index 2e0ee57fe0504..429ef42162bf4 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAC;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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/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;ACRD,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;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 823af8d1bc3ed..16d11d70bbfdd 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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:outputdir_multifolder/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 @@ -177,7 +177,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -187,16 +187,16 @@ sourceFile:outputdir_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +1->Emitted(14, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(14, 6) Source(4, 2) + SourceIndex(1) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) +2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -210,8 +210,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 4 > class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) name (m2_c1) +1 >Emitted(16, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(16, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(16, 2) Source(2, 1) + SourceIndex(1) 4 >Emitted(16, 6) Source(4, 2) + SourceIndex(1) --- @@ -262,11 +262,11 @@ sourceFile:outputdir_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) name (m2_f1) +1->Emitted(19, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(19, 11) Source(8, 11) + SourceIndex(1) +3 >Emitted(19, 12) Source(8, 12) + SourceIndex(1) +4 >Emitted(19, 24) Source(8, 24) + SourceIndex(1) +5 >Emitted(19, 25) Source(8, 25) + SourceIndex(1) --- >>>} 1 > @@ -275,8 +275,8 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(20, 1) Source(9, 1) + SourceIndex(1) +2 >Emitted(20, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -333,7 +333,7 @@ sourceFile:outputdir_multifolder/test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(25, 5) Source(4, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -343,16 +343,16 @@ sourceFile:outputdir_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(26, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(26, 6) Source(6, 2) + SourceIndex(2) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- >>>})(); 1 > @@ -366,8 +366,8 @@ sourceFile:outputdir_multifolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) name (c1) +1 >Emitted(28, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(28, 2) Source(6, 2) + SourceIndex(2) 3 >Emitted(28, 2) Source(4, 1) + SourceIndex(2) 4 >Emitted(28, 6) Source(6, 2) + SourceIndex(2) --- @@ -418,11 +418,11 @@ sourceFile:outputdir_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) name (f1) +1->Emitted(31, 5) Source(10, 5) + SourceIndex(2) +2 >Emitted(31, 11) Source(10, 11) + SourceIndex(2) +3 >Emitted(31, 12) Source(10, 12) + SourceIndex(2) +4 >Emitted(31, 21) Source(10, 21) + SourceIndex(2) +5 >Emitted(31, 22) Source(10, 22) + SourceIndex(2) --- >>>} 1 > @@ -431,7 +431,7 @@ sourceFile:outputdir_multifolder/test.ts 1 > > 2 >} -1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(32, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(32, 2) Source(11, 2) + SourceIndex(2) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt index e9ff85f6fe6c2..bd47f942319a8 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt index e9ff85f6fe6c2..bd47f942319a8 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 411004d82a33d..9ae5029e13b8e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index d920bbe078d63..43b7b9cb12626 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map index ad9ad3d5ce04a..83557b43a867f 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 411004d82a33d..9ae5029e13b8e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map index f1c6e3bd1b7a7..d876a9633b4ec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 10e2e3700c151..5c2960857741b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map index f1c6e3bd1b7a7..d876a9633b4ec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.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;ACRD,6BAA6B;AAC7B,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 10e2e3700c151..5c2960857741b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile: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: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: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: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: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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index ac21898e23f7f..640e894b53c06 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index ac21898e23f7f..640e894b53c06 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index cdd78604f7541..8a280e118e5c1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index cdd78604f7541..8a280e118e5c1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 54961a153f98a..cb0dcfb8a0ccc 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map index a1be429da805c..9dc5e9c0cae83 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index 54961a153f98a..cb0dcfb8a0ccc 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (c1) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -50,16 +50,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -73,8 +73,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (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:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (f1) -2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (f1) -3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (f1) -4 >Emitted(9, 21) Source(8, 21) + SourceIndex(0) name (f1) -5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) name (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, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(9, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -138,7 +138,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (f1) -2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (f1) +1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index c8b19a1227f99..2b19f844ec02a 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index c8b19a1227f99..2b19f844ec02a 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 31798101a5734..f607f1f54384a 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index b8fe7026610ca..48ee93efbeb8b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map index 014979baf0321..f43236fa96a01 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":"AAAA,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 31798101a5734..f607f1f54384a 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.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=m1.js.map=================================================================== JsFile: test.js @@ -192,7 +192,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -202,16 +202,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -225,8 +225,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) --- @@ -277,11 +277,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(10, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(10, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(10, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(10, 21) Source(9, 21) + SourceIndex(0) +5 >Emitted(10, 22) Source(9, 22) + SourceIndex(0) --- >>>} 1 > @@ -290,7 +290,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(11, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(10, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map index e80a550275c2a..386fdffa417f3 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 791b3dbcecbf8..30aa681bfd206 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map index e80a550275c2a..386fdffa417f3 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.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;ACRD,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 791b3dbcecbf8..30aa681bfd206 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.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 @@ -186,7 +186,7 @@ sourceFile:test.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(14, 5) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -196,16 +196,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(15, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(15, 6) Source(5, 2) + SourceIndex(1) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -219,8 +219,8 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) name (c1) +1 >Emitted(17, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(5, 2) + SourceIndex(1) 3 >Emitted(17, 2) Source(3, 1) + SourceIndex(1) 4 >Emitted(17, 6) Source(5, 2) + SourceIndex(1) --- @@ -271,11 +271,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(20, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(20, 11) Source(9, 11) + SourceIndex(1) +3 >Emitted(20, 12) Source(9, 12) + SourceIndex(1) +4 >Emitted(20, 21) Source(9, 21) + SourceIndex(1) +5 >Emitted(20, 22) Source(9, 22) + SourceIndex(1) --- >>>} 1 > @@ -284,7 +284,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(21, 1) Source(10, 1) + SourceIndex(1) +2 >Emitted(21, 2) Source(10, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/properties.js.map b/tests/baselines/reference/properties.js.map index 6e68d36e346f9..b9820ddba7c6e 100644 --- a/tests/baselines/reference/properties.js.map +++ b/tests/baselines/reference/properties.js.map @@ -1,2 +1,2 @@ //// [properties.js.map] -{"version":3,"file":"properties.js","sourceRoot":"","sources":["properties.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count"],"mappings":"AACA;IAAAA;IAWAC,CAACA;IATGD,sBAAWA,0BAAKA;aAAhBA;YAEIE,MAAMA,CAACA,EAAEA,CAACA;QACdA,CAACA;aAEDF,UAAiBA,KAAaA;YAE1BE,EAAEA;QACNA,CAACA;;;OALAF;IAMLA,cAACA;AAADA,CAACA,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"properties.js","sourceRoot":"","sources":["properties.ts"],"names":[],"mappings":"AACA;IAAA;IAWA,CAAC;IATG,sBAAW,0BAAK;aAAhB;YAEI,MAAM,CAAC,EAAE,CAAC;QACd,CAAC;aAED,UAAiB,KAAa;YAE1B,EAAE;QACN,CAAC;;;OALA;IAML,cAAC;AAAD,CAAC,AAXD,IAWC"} \ No newline at end of file diff --git a/tests/baselines/reference/properties.sourcemap.txt b/tests/baselines/reference/properties.sourcemap.txt index 9ff77cc2c5d80..40245a8976d95 100644 --- a/tests/baselines/reference/properties.sourcemap.txt +++ b/tests/baselines/reference/properties.sourcemap.txt @@ -19,7 +19,7 @@ sourceFile:properties.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (MyClass) +1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -38,8 +38,8 @@ sourceFile:properties.ts > } > 2 > } -1->Emitted(3, 5) Source(13, 1) + SourceIndex(0) name (MyClass.constructor) -2 >Emitted(3, 6) Source(13, 2) + SourceIndex(0) name (MyClass.constructor) +1->Emitted(3, 5) Source(13, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(13, 2) + SourceIndex(0) --- >>> Object.defineProperty(MyClass.prototype, "Count", { 1->^^^^ @@ -48,15 +48,15 @@ sourceFile:properties.ts 1-> 2 > public get 3 > Count -1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (MyClass) -2 >Emitted(4, 27) Source(4, 16) + SourceIndex(0) name (MyClass) -3 >Emitted(4, 53) Source(4, 21) + SourceIndex(0) name (MyClass) +1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(4, 27) Source(4, 16) + SourceIndex(0) +3 >Emitted(4, 53) Source(4, 21) + SourceIndex(0) --- >>> get: function () { 1 >^^^^^^^^^^^^^ 2 > ^^^^^^^^^^-> 1 > -1 >Emitted(5, 14) Source(4, 5) + SourceIndex(0) name (MyClass) +1 >Emitted(5, 14) Source(4, 5) + SourceIndex(0) --- >>> return 42; 1->^^^^^^^^^^^^ @@ -71,11 +71,11 @@ sourceFile:properties.ts 3 > 4 > 42 5 > ; -1->Emitted(6, 13) Source(6, 9) + SourceIndex(0) name (MyClass.Count) -2 >Emitted(6, 19) Source(6, 15) + SourceIndex(0) name (MyClass.Count) -3 >Emitted(6, 20) Source(6, 16) + SourceIndex(0) name (MyClass.Count) -4 >Emitted(6, 22) Source(6, 18) + SourceIndex(0) name (MyClass.Count) -5 >Emitted(6, 23) Source(6, 19) + SourceIndex(0) name (MyClass.Count) +1->Emitted(6, 13) Source(6, 9) + SourceIndex(0) +2 >Emitted(6, 19) Source(6, 15) + SourceIndex(0) +3 >Emitted(6, 20) Source(6, 16) + SourceIndex(0) +4 >Emitted(6, 22) Source(6, 18) + SourceIndex(0) +5 >Emitted(6, 23) Source(6, 19) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -84,8 +84,8 @@ sourceFile:properties.ts 1 > > 2 > } -1 >Emitted(7, 9) Source(7, 5) + SourceIndex(0) name (MyClass.Count) -2 >Emitted(7, 10) Source(7, 6) + SourceIndex(0) name (MyClass.Count) +1 >Emitted(7, 9) Source(7, 5) + SourceIndex(0) +2 >Emitted(7, 10) Source(7, 6) + SourceIndex(0) --- >>> set: function (value) { 1->^^^^^^^^^^^^^ @@ -96,9 +96,9 @@ sourceFile:properties.ts > 2 > public set Count( 3 > value: number -1->Emitted(8, 14) Source(9, 5) + SourceIndex(0) name (MyClass) -2 >Emitted(8, 24) Source(9, 22) + SourceIndex(0) name (MyClass) -3 >Emitted(8, 29) Source(9, 35) + SourceIndex(0) name (MyClass) +1->Emitted(8, 14) Source(9, 5) + SourceIndex(0) +2 >Emitted(8, 24) Source(9, 22) + SourceIndex(0) +3 >Emitted(8, 29) Source(9, 35) + SourceIndex(0) --- >>> // 1 >^^^^^^^^^^^^ @@ -107,8 +107,8 @@ sourceFile:properties.ts > { > 2 > // -1 >Emitted(9, 13) Source(11, 9) + SourceIndex(0) name (MyClass.Count) -2 >Emitted(9, 15) Source(11, 11) + SourceIndex(0) name (MyClass.Count) +1 >Emitted(9, 13) Source(11, 9) + SourceIndex(0) +2 >Emitted(9, 15) Source(11, 11) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -117,8 +117,8 @@ sourceFile:properties.ts 1 > > 2 > } -1 >Emitted(10, 9) Source(12, 5) + SourceIndex(0) name (MyClass.Count) -2 >Emitted(10, 10) Source(12, 6) + SourceIndex(0) name (MyClass.Count) +1 >Emitted(10, 9) Source(12, 5) + SourceIndex(0) +2 >Emitted(10, 10) Source(12, 6) + SourceIndex(0) --- >>> enumerable: true, >>> configurable: true @@ -126,7 +126,7 @@ sourceFile:properties.ts 1->^^^^^^^ 2 > ^^^^^^^^^^^^^-> 1-> -1->Emitted(13, 8) Source(7, 6) + SourceIndex(0) name (MyClass) +1->Emitted(13, 8) Source(7, 6) + SourceIndex(0) --- >>> return MyClass; 1->^^^^ @@ -139,8 +139,8 @@ sourceFile:properties.ts > } > 2 > } -1->Emitted(14, 5) Source(13, 1) + SourceIndex(0) name (MyClass) -2 >Emitted(14, 19) Source(13, 2) + SourceIndex(0) name (MyClass) +1->Emitted(14, 5) Source(13, 1) + SourceIndex(0) +2 >Emitted(14, 19) Source(13, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -163,8 +163,8 @@ sourceFile:properties.ts > // > } > } -1 >Emitted(15, 1) Source(13, 1) + SourceIndex(0) name (MyClass) -2 >Emitted(15, 2) Source(13, 2) + SourceIndex(0) name (MyClass) +1 >Emitted(15, 1) Source(13, 1) + SourceIndex(0) +2 >Emitted(15, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(15, 2) Source(2, 1) + SourceIndex(0) 4 >Emitted(15, 6) Source(13, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index 90ab021de5968..60c5c552d831c 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js.map +++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map @@ -1,2 +1,2 @@ //// [recursiveClassReferenceTest.js.map] -{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,OAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA,cAAiBE,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,YAAIA,KAAJA,YAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAEvBA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA,IAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;gBAAAA,CAACA,CAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAe;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA,cAAmCE,MAAMA,CAACA,IAAIA,CAACA,CAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA,cAA0BI,MAAMA,CAACA,IAAIA,CAACA,CAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,EAA0B,YAAY,EAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt index 3b693f7c282fb..0036b8234d83e 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -117,10 +117,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(10, 5) Source(32, 15) + SourceIndex(0) name (Sample) -2 >Emitted(10, 9) Source(32, 15) + SourceIndex(0) name (Sample) -3 >Emitted(10, 16) Source(32, 22) + SourceIndex(0) name (Sample) -4 >Emitted(10, 17) Source(42, 2) + SourceIndex(0) name (Sample) +1 >Emitted(10, 5) Source(32, 15) + SourceIndex(0) +2 >Emitted(10, 9) Source(32, 15) + SourceIndex(0) +3 >Emitted(10, 16) Source(32, 22) + SourceIndex(0) +4 >Emitted(10, 17) Source(42, 2) + SourceIndex(0) --- >>> (function (Actions) { 1->^^^^ @@ -129,9 +129,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Actions -1->Emitted(11, 5) Source(32, 15) + SourceIndex(0) name (Sample) -2 >Emitted(11, 16) Source(32, 15) + SourceIndex(0) name (Sample) -3 >Emitted(11, 23) Source(32, 22) + SourceIndex(0) name (Sample) +1->Emitted(11, 5) Source(32, 15) + SourceIndex(0) +2 >Emitted(11, 16) Source(32, 15) + SourceIndex(0) +3 >Emitted(11, 23) Source(32, 22) + SourceIndex(0) --- >>> var Thing; 1 >^^^^^^^^ @@ -153,10 +153,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(12, 9) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -2 >Emitted(12, 13) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -3 >Emitted(12, 18) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -4 >Emitted(12, 19) Source(42, 2) + SourceIndex(0) name (Sample.Actions) +1 >Emitted(12, 9) Source(32, 23) + SourceIndex(0) +2 >Emitted(12, 13) Source(32, 23) + SourceIndex(0) +3 >Emitted(12, 18) Source(32, 28) + SourceIndex(0) +4 >Emitted(12, 19) Source(42, 2) + SourceIndex(0) --- >>> (function (Thing_1) { 1->^^^^^^^^ @@ -165,9 +165,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(13, 9) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -2 >Emitted(13, 20) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -3 >Emitted(13, 27) Source(32, 28) + SourceIndex(0) name (Sample.Actions) +1->Emitted(13, 9) Source(32, 23) + SourceIndex(0) +2 >Emitted(13, 20) Source(32, 23) + SourceIndex(0) +3 >Emitted(13, 27) Source(32, 28) + SourceIndex(0) --- >>> var Find; 1 >^^^^^^^^^^^^ @@ -189,10 +189,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(14, 13) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -2 >Emitted(14, 17) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -3 >Emitted(14, 21) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -4 >Emitted(14, 22) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) +1 >Emitted(14, 13) Source(32, 29) + SourceIndex(0) +2 >Emitted(14, 17) Source(32, 29) + SourceIndex(0) +3 >Emitted(14, 21) Source(32, 33) + SourceIndex(0) +4 >Emitted(14, 22) Source(42, 2) + SourceIndex(0) --- >>> (function (Find) { 1->^^^^^^^^^^^^ @@ -206,24 +206,24 @@ sourceFile:recursiveClassReferenceTest.ts 3 > Find 4 > 5 > { -1->Emitted(15, 13) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -2 >Emitted(15, 24) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -3 >Emitted(15, 28) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -4 >Emitted(15, 30) Source(32, 34) + SourceIndex(0) name (Sample.Actions.Thing) -5 >Emitted(15, 31) Source(32, 35) + SourceIndex(0) name (Sample.Actions.Thing) +1->Emitted(15, 13) Source(32, 29) + SourceIndex(0) +2 >Emitted(15, 24) Source(32, 29) + SourceIndex(0) +3 >Emitted(15, 28) Source(32, 33) + SourceIndex(0) +4 >Emitted(15, 30) Source(32, 34) + SourceIndex(0) +5 >Emitted(15, 31) Source(32, 35) + SourceIndex(0) --- >>> var StartFindAction = (function () { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(16, 17) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) +1->Emitted(16, 17) Source(33, 2) + SourceIndex(0) --- >>> function StartFindAction() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(17, 21) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +1->Emitted(17, 21) Source(33, 2) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -239,8 +239,8 @@ sourceFile:recursiveClassReferenceTest.ts > } > 2 > } -1->Emitted(18, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) -2 >Emitted(18, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.constructor) +1->Emitted(18, 21) Source(41, 2) + SourceIndex(0) +2 >Emitted(18, 22) Source(41, 3) + SourceIndex(0) --- >>> StartFindAction.prototype.getId = function () { return "yo"; }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -263,16 +263,16 @@ sourceFile:recursiveClassReferenceTest.ts 8 > ; 9 > 10> } -1->Emitted(19, 21) Source(35, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(19, 52) Source(35, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(19, 55) Source(35, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -4 >Emitted(19, 69) Source(35, 20) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -5 >Emitted(19, 75) Source(35, 26) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -6 >Emitted(19, 76) Source(35, 27) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -7 >Emitted(19, 80) Source(35, 31) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -8 >Emitted(19, 81) Source(35, 32) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -9 >Emitted(19, 82) Source(35, 33) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) -10>Emitted(19, 83) Source(35, 34) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.getId) +1->Emitted(19, 21) Source(35, 10) + SourceIndex(0) +2 >Emitted(19, 52) Source(35, 15) + SourceIndex(0) +3 >Emitted(19, 55) Source(35, 3) + SourceIndex(0) +4 >Emitted(19, 69) Source(35, 20) + SourceIndex(0) +5 >Emitted(19, 75) Source(35, 26) + SourceIndex(0) +6 >Emitted(19, 76) Source(35, 27) + SourceIndex(0) +7 >Emitted(19, 80) Source(35, 31) + SourceIndex(0) +8 >Emitted(19, 81) Source(35, 32) + SourceIndex(0) +9 >Emitted(19, 82) Source(35, 33) + SourceIndex(0) +10>Emitted(19, 83) Source(35, 34) + SourceIndex(0) --- >>> StartFindAction.prototype.run = function (Thing) { 1 >^^^^^^^^^^^^^^^^^^^^ @@ -287,11 +287,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > public run( 5 > Thing:Sample.Thing.ICodeThing -1 >Emitted(20, 21) Source(37, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(20, 50) Source(37, 13) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(20, 53) Source(37, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -4 >Emitted(20, 63) Source(37, 14) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -5 >Emitted(20, 68) Source(37, 43) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +1 >Emitted(20, 21) Source(37, 10) + SourceIndex(0) +2 >Emitted(20, 50) Source(37, 13) + SourceIndex(0) +3 >Emitted(20, 53) Source(37, 3) + SourceIndex(0) +4 >Emitted(20, 63) Source(37, 14) + SourceIndex(0) +5 >Emitted(20, 68) Source(37, 43) + SourceIndex(0) --- >>> return true; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -306,11 +306,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > true 5 > ; -1 >Emitted(21, 25) Source(39, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -2 >Emitted(21, 31) Source(39, 10) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -3 >Emitted(21, 32) Source(39, 11) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -4 >Emitted(21, 36) Source(39, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -5 >Emitted(21, 37) Source(39, 16) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +1 >Emitted(21, 25) Source(39, 4) + SourceIndex(0) +2 >Emitted(21, 31) Source(39, 10) + SourceIndex(0) +3 >Emitted(21, 32) Source(39, 11) + SourceIndex(0) +4 >Emitted(21, 36) Source(39, 15) + SourceIndex(0) +5 >Emitted(21, 37) Source(39, 16) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -319,8 +319,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(22, 21) Source(40, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) -2 >Emitted(22, 22) Source(40, 4) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction.run) +1 >Emitted(22, 21) Source(40, 3) + SourceIndex(0) +2 >Emitted(22, 22) Source(40, 4) + SourceIndex(0) --- >>> return StartFindAction; 1->^^^^^^^^^^^^^^^^^^^^ @@ -328,8 +328,8 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > 2 > } -1->Emitted(23, 21) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(23, 43) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) +1->Emitted(23, 21) Source(41, 2) + SourceIndex(0) +2 >Emitted(23, 43) Source(41, 3) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -349,10 +349,10 @@ sourceFile:recursiveClassReferenceTest.ts > return true; > } > } -1 >Emitted(24, 17) Source(41, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -2 >Emitted(24, 18) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find.StartFindAction) -3 >Emitted(24, 18) Source(33, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) -4 >Emitted(24, 22) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +1 >Emitted(24, 17) Source(41, 2) + SourceIndex(0) +2 >Emitted(24, 18) Source(41, 3) + SourceIndex(0) +3 >Emitted(24, 18) Source(33, 2) + SourceIndex(0) +4 >Emitted(24, 22) Source(41, 3) + SourceIndex(0) --- >>> Find.StartFindAction = StartFindAction; 1->^^^^^^^^^^^^^^^^ @@ -372,10 +372,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > } 4 > -1->Emitted(25, 17) Source(33, 15) + SourceIndex(0) name (Sample.Actions.Thing.Find) -2 >Emitted(25, 37) Source(33, 30) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(25, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) -4 >Emitted(25, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find) +1->Emitted(25, 17) Source(33, 15) + SourceIndex(0) +2 >Emitted(25, 37) Source(33, 30) + SourceIndex(0) +3 >Emitted(25, 55) Source(41, 3) + SourceIndex(0) +4 >Emitted(25, 56) Source(41, 3) + SourceIndex(0) --- >>> })(Find = Thing_1.Find || (Thing_1.Find = {})); 1->^^^^^^^^^^^^ @@ -407,15 +407,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1->Emitted(26, 13) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing.Find) -2 >Emitted(26, 14) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find) -3 >Emitted(26, 16) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -4 >Emitted(26, 20) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -5 >Emitted(26, 23) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -6 >Emitted(26, 35) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -7 >Emitted(26, 40) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing) -8 >Emitted(26, 52) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing) -9 >Emitted(26, 60) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) +1->Emitted(26, 13) Source(42, 1) + SourceIndex(0) +2 >Emitted(26, 14) Source(42, 2) + SourceIndex(0) +3 >Emitted(26, 16) Source(32, 29) + SourceIndex(0) +4 >Emitted(26, 20) Source(32, 33) + SourceIndex(0) +5 >Emitted(26, 23) Source(32, 29) + SourceIndex(0) +6 >Emitted(26, 35) Source(32, 33) + SourceIndex(0) +7 >Emitted(26, 40) Source(32, 29) + SourceIndex(0) +8 >Emitted(26, 52) Source(32, 33) + SourceIndex(0) +9 >Emitted(26, 60) Source(42, 2) + SourceIndex(0) --- >>> })(Thing = Actions.Thing || (Actions.Thing = {})); 1 >^^^^^^^^ @@ -447,15 +447,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(27, 9) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing) -2 >Emitted(27, 10) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing) -3 >Emitted(27, 12) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -4 >Emitted(27, 17) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -5 >Emitted(27, 20) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -6 >Emitted(27, 33) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -7 >Emitted(27, 38) Source(32, 23) + SourceIndex(0) name (Sample.Actions) -8 >Emitted(27, 51) Source(32, 28) + SourceIndex(0) name (Sample.Actions) -9 >Emitted(27, 59) Source(42, 2) + SourceIndex(0) name (Sample.Actions) +1 >Emitted(27, 9) Source(42, 1) + SourceIndex(0) +2 >Emitted(27, 10) Source(42, 2) + SourceIndex(0) +3 >Emitted(27, 12) Source(32, 23) + SourceIndex(0) +4 >Emitted(27, 17) Source(32, 28) + SourceIndex(0) +5 >Emitted(27, 20) Source(32, 23) + SourceIndex(0) +6 >Emitted(27, 33) Source(32, 28) + SourceIndex(0) +7 >Emitted(27, 38) Source(32, 23) + SourceIndex(0) +8 >Emitted(27, 51) Source(32, 28) + SourceIndex(0) +9 >Emitted(27, 59) Source(42, 2) + SourceIndex(0) --- >>> })(Actions = Sample.Actions || (Sample.Actions = {})); 1->^^^^ @@ -486,15 +486,15 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1->Emitted(28, 5) Source(42, 1) + SourceIndex(0) name (Sample.Actions) -2 >Emitted(28, 6) Source(42, 2) + SourceIndex(0) name (Sample.Actions) -3 >Emitted(28, 8) Source(32, 15) + SourceIndex(0) name (Sample) -4 >Emitted(28, 15) Source(32, 22) + SourceIndex(0) name (Sample) -5 >Emitted(28, 18) Source(32, 15) + SourceIndex(0) name (Sample) -6 >Emitted(28, 32) Source(32, 22) + SourceIndex(0) name (Sample) -7 >Emitted(28, 37) Source(32, 15) + SourceIndex(0) name (Sample) -8 >Emitted(28, 51) Source(32, 22) + SourceIndex(0) name (Sample) -9 >Emitted(28, 59) Source(42, 2) + SourceIndex(0) name (Sample) +1->Emitted(28, 5) Source(42, 1) + SourceIndex(0) +2 >Emitted(28, 6) Source(42, 2) + SourceIndex(0) +3 >Emitted(28, 8) Source(32, 15) + SourceIndex(0) +4 >Emitted(28, 15) Source(32, 22) + SourceIndex(0) +5 >Emitted(28, 18) Source(32, 15) + SourceIndex(0) +6 >Emitted(28, 32) Source(32, 22) + SourceIndex(0) +7 >Emitted(28, 37) Source(32, 15) + SourceIndex(0) +8 >Emitted(28, 51) Source(32, 22) + SourceIndex(0) +9 >Emitted(28, 59) Source(42, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); 1 > @@ -521,8 +521,8 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(29, 1) Source(42, 1) + SourceIndex(0) name (Sample) -2 >Emitted(29, 2) Source(42, 2) + SourceIndex(0) name (Sample) +1 >Emitted(29, 1) Source(42, 1) + SourceIndex(0) +2 >Emitted(29, 2) Source(42, 2) + SourceIndex(0) 3 >Emitted(29, 4) Source(32, 8) + SourceIndex(0) 4 >Emitted(29, 10) Source(32, 14) + SourceIndex(0) 5 >Emitted(29, 15) Source(32, 8) + SourceIndex(0) @@ -607,10 +607,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(32, 5) Source(44, 15) + SourceIndex(0) name (Sample) -2 >Emitted(32, 9) Source(44, 15) + SourceIndex(0) name (Sample) -3 >Emitted(32, 14) Source(44, 20) + SourceIndex(0) name (Sample) -4 >Emitted(32, 15) Source(64, 2) + SourceIndex(0) name (Sample) +1 >Emitted(32, 5) Source(44, 15) + SourceIndex(0) +2 >Emitted(32, 9) Source(44, 15) + SourceIndex(0) +3 >Emitted(32, 14) Source(44, 20) + SourceIndex(0) +4 >Emitted(32, 15) Source(64, 2) + SourceIndex(0) --- >>> (function (Thing) { 1->^^^^ @@ -620,9 +620,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(33, 5) Source(44, 15) + SourceIndex(0) name (Sample) -2 >Emitted(33, 16) Source(44, 15) + SourceIndex(0) name (Sample) -3 >Emitted(33, 21) Source(44, 20) + SourceIndex(0) name (Sample) +1->Emitted(33, 5) Source(44, 15) + SourceIndex(0) +2 >Emitted(33, 16) Source(44, 15) + SourceIndex(0) +3 >Emitted(33, 21) Source(44, 20) + SourceIndex(0) --- >>> var Widgets; 1->^^^^^^^^ @@ -654,10 +654,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(34, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(34, 13) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(34, 20) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(34, 21) Source(64, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(34, 9) Source(44, 21) + SourceIndex(0) +2 >Emitted(34, 13) Source(44, 21) + SourceIndex(0) +3 >Emitted(34, 20) Source(44, 28) + SourceIndex(0) +4 >Emitted(34, 21) Source(64, 2) + SourceIndex(0) --- >>> (function (Widgets) { 1->^^^^^^^^ @@ -671,18 +671,18 @@ sourceFile:recursiveClassReferenceTest.ts 3 > Widgets 4 > 5 > { -1->Emitted(35, 9) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(35, 20) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(35, 27) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(35, 29) Source(44, 29) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(35, 30) Source(44, 30) + SourceIndex(0) name (Sample.Thing) +1->Emitted(35, 9) Source(44, 21) + SourceIndex(0) +2 >Emitted(35, 20) Source(44, 21) + SourceIndex(0) +3 >Emitted(35, 27) Source(44, 28) + SourceIndex(0) +4 >Emitted(35, 29) Source(44, 29) + SourceIndex(0) +5 >Emitted(35, 30) Source(44, 30) + SourceIndex(0) --- >>> var FindWidget = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(36, 13) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) +1->Emitted(36, 13) Source(45, 2) + SourceIndex(0) --- >>> function FindWidget(codeThing) { 1->^^^^^^^^^^^^^^^^ @@ -697,9 +697,9 @@ sourceFile:recursiveClassReferenceTest.ts > 2 > constructor(private 3 > codeThing: Sample.Thing.ICodeThing -1->Emitted(37, 17) Source(50, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(37, 37) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(37, 46) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(37, 17) Source(50, 3) + SourceIndex(0) +2 >Emitted(37, 37) Source(50, 23) + SourceIndex(0) +3 >Emitted(37, 46) Source(50, 57) + SourceIndex(0) --- >>> this.codeThing = codeThing; 1->^^^^^^^^^^^^^^^^^^^^ @@ -712,11 +712,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > codeThing 5 > : Sample.Thing.ICodeThing -1->Emitted(38, 21) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(38, 35) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(38, 38) Source(50, 23) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(38, 47) Source(50, 32) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(38, 48) Source(50, 57) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1->Emitted(38, 21) Source(50, 23) + SourceIndex(0) +2 >Emitted(38, 35) Source(50, 32) + SourceIndex(0) +3 >Emitted(38, 38) Source(50, 23) + SourceIndex(0) +4 >Emitted(38, 47) Source(50, 32) + SourceIndex(0) +5 >Emitted(38, 48) Source(50, 57) + SourceIndex(0) --- >>> this.domNode = null; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -729,11 +729,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > :any = 4 > null 5 > ; -1 >Emitted(39, 21) Source(49, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(39, 33) Source(49, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(39, 36) Source(49, 25) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(39, 40) Source(49, 29) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(39, 41) Source(49, 30) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(39, 21) Source(49, 11) + SourceIndex(0) +2 >Emitted(39, 33) Source(49, 18) + SourceIndex(0) +3 >Emitted(39, 36) Source(49, 25) + SourceIndex(0) +4 >Emitted(39, 40) Source(49, 29) + SourceIndex(0) +5 >Emitted(39, 41) Source(49, 30) + SourceIndex(0) --- >>> // scenario 1 1 >^^^^^^^^^^^^^^^^^^^^ @@ -743,8 +743,8 @@ sourceFile:recursiveClassReferenceTest.ts > constructor(private codeThing: Sample.Thing.ICodeThing) { > 2 > // scenario 1 -1 >Emitted(40, 21) Source(51, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(40, 34) Source(51, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(40, 21) Source(51, 7) + SourceIndex(0) +2 >Emitted(40, 34) Source(51, 20) + SourceIndex(0) --- >>> codeThing.addWidget("addWidget", this); 1->^^^^^^^^^^^^^^^^^^^^ @@ -768,16 +768,16 @@ sourceFile:recursiveClassReferenceTest.ts 8 > this 9 > ) 10> ; -1->Emitted(41, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(41, 30) Source(52, 16) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -3 >Emitted(41, 31) Source(52, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -4 >Emitted(41, 40) Source(52, 26) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -5 >Emitted(41, 41) Source(52, 27) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -6 >Emitted(41, 52) Source(52, 38) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -7 >Emitted(41, 54) Source(52, 40) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -8 >Emitted(41, 58) Source(52, 44) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -9 >Emitted(41, 59) Source(52, 45) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -10>Emitted(41, 60) Source(52, 46) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1->Emitted(41, 21) Source(52, 7) + SourceIndex(0) +2 >Emitted(41, 30) Source(52, 16) + SourceIndex(0) +3 >Emitted(41, 31) Source(52, 17) + SourceIndex(0) +4 >Emitted(41, 40) Source(52, 26) + SourceIndex(0) +5 >Emitted(41, 41) Source(52, 27) + SourceIndex(0) +6 >Emitted(41, 52) Source(52, 38) + SourceIndex(0) +7 >Emitted(41, 54) Source(52, 40) + SourceIndex(0) +8 >Emitted(41, 58) Source(52, 44) + SourceIndex(0) +9 >Emitted(41, 59) Source(52, 45) + SourceIndex(0) +10>Emitted(41, 60) Source(52, 46) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -786,8 +786,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(42, 17) Source(53, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) -2 >Emitted(42, 18) Source(53, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor) +1 >Emitted(42, 17) Source(53, 3) + SourceIndex(0) +2 >Emitted(42, 18) Source(53, 4) + SourceIndex(0) --- >>> FindWidget.prototype.gar = function (runner) { if (true) { 1->^^^^^^^^^^^^^^^^ @@ -816,19 +816,19 @@ sourceFile:recursiveClassReferenceTest.ts 11> ) 12> 13> { -1->Emitted(43, 17) Source(47, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(43, 41) Source(47, 13) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(43, 44) Source(47, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -4 >Emitted(43, 54) Source(47, 14) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -5 >Emitted(43, 60) Source(47, 55) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -6 >Emitted(43, 64) Source(47, 59) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -7 >Emitted(43, 66) Source(47, 61) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -8 >Emitted(43, 67) Source(47, 62) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -9 >Emitted(43, 68) Source(47, 63) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -10>Emitted(43, 72) Source(47, 67) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -11>Emitted(43, 73) Source(47, 68) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -12>Emitted(43, 74) Source(47, 69) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -13>Emitted(43, 75) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +1->Emitted(43, 17) Source(47, 10) + SourceIndex(0) +2 >Emitted(43, 41) Source(47, 13) + SourceIndex(0) +3 >Emitted(43, 44) Source(47, 3) + SourceIndex(0) +4 >Emitted(43, 54) Source(47, 14) + SourceIndex(0) +5 >Emitted(43, 60) Source(47, 55) + SourceIndex(0) +6 >Emitted(43, 64) Source(47, 59) + SourceIndex(0) +7 >Emitted(43, 66) Source(47, 61) + SourceIndex(0) +8 >Emitted(43, 67) Source(47, 62) + SourceIndex(0) +9 >Emitted(43, 68) Source(47, 63) + SourceIndex(0) +10>Emitted(43, 72) Source(47, 67) + SourceIndex(0) +11>Emitted(43, 73) Source(47, 68) + SourceIndex(0) +12>Emitted(43, 74) Source(47, 69) + SourceIndex(0) +13>Emitted(43, 75) Source(47, 70) + SourceIndex(0) --- >>> return runner(this); 1 >^^^^^^^^^^^^^^^^^^^^ @@ -847,14 +847,14 @@ sourceFile:recursiveClassReferenceTest.ts 6 > this 7 > ) 8 > ; -1 >Emitted(44, 21) Source(47, 70) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -2 >Emitted(44, 27) Source(47, 76) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -3 >Emitted(44, 28) Source(47, 77) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -4 >Emitted(44, 34) Source(47, 83) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -5 >Emitted(44, 35) Source(47, 84) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -6 >Emitted(44, 39) Source(47, 88) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -7 >Emitted(44, 40) Source(47, 89) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -8 >Emitted(44, 41) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +1 >Emitted(44, 21) Source(47, 70) + SourceIndex(0) +2 >Emitted(44, 27) Source(47, 76) + SourceIndex(0) +3 >Emitted(44, 28) Source(47, 77) + SourceIndex(0) +4 >Emitted(44, 34) Source(47, 83) + SourceIndex(0) +5 >Emitted(44, 35) Source(47, 84) + SourceIndex(0) +6 >Emitted(44, 39) Source(47, 88) + SourceIndex(0) +7 >Emitted(44, 40) Source(47, 89) + SourceIndex(0) +8 >Emitted(44, 41) Source(47, 90) + SourceIndex(0) --- >>> } }; 1 >^^^^^^^^^^^^^^^^ @@ -866,10 +866,10 @@ sourceFile:recursiveClassReferenceTest.ts 2 > } 3 > 4 > } -1 >Emitted(45, 17) Source(47, 90) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -2 >Emitted(45, 18) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -3 >Emitted(45, 19) Source(47, 91) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) -4 >Emitted(45, 20) Source(47, 92) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.gar) +1 >Emitted(45, 17) Source(47, 90) + SourceIndex(0) +2 >Emitted(45, 18) Source(47, 91) + SourceIndex(0) +3 >Emitted(45, 19) Source(47, 91) + SourceIndex(0) +4 >Emitted(45, 20) Source(47, 92) + SourceIndex(0) --- >>> FindWidget.prototype.getDomNode = function () { 1->^^^^^^^^^^^^^^^^ @@ -886,9 +886,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > getDomNode 3 > -1->Emitted(46, 17) Source(55, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(46, 48) Source(55, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(46, 51) Source(55, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(46, 17) Source(55, 10) + SourceIndex(0) +2 >Emitted(46, 48) Source(55, 20) + SourceIndex(0) +3 >Emitted(46, 51) Source(55, 3) + SourceIndex(0) --- >>> return domNode; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -902,11 +902,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > domNode 5 > ; -1 >Emitted(47, 21) Source(56, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -2 >Emitted(47, 27) Source(56, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -3 >Emitted(47, 28) Source(56, 11) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -4 >Emitted(47, 35) Source(56, 18) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -5 >Emitted(47, 36) Source(56, 19) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +1 >Emitted(47, 21) Source(56, 4) + SourceIndex(0) +2 >Emitted(47, 27) Source(56, 10) + SourceIndex(0) +3 >Emitted(47, 28) Source(56, 11) + SourceIndex(0) +4 >Emitted(47, 35) Source(56, 18) + SourceIndex(0) +5 >Emitted(47, 36) Source(56, 19) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^ @@ -915,8 +915,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(48, 17) Source(57, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) -2 >Emitted(48, 18) Source(57, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.getDomNode) +1 >Emitted(48, 17) Source(57, 3) + SourceIndex(0) +2 >Emitted(48, 18) Source(57, 4) + SourceIndex(0) --- >>> FindWidget.prototype.destroy = function () { 1->^^^^^^^^^^^^^^^^ @@ -927,9 +927,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > destroy 3 > -1->Emitted(49, 17) Source(59, 10) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(49, 45) Source(59, 17) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(49, 48) Source(59, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(49, 17) Source(59, 10) + SourceIndex(0) +2 >Emitted(49, 45) Source(59, 17) + SourceIndex(0) +3 >Emitted(49, 48) Source(59, 3) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^ @@ -939,8 +939,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1 >Emitted(50, 17) Source(61, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) -2 >Emitted(50, 18) Source(61, 4) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.destroy) +1 >Emitted(50, 17) Source(61, 3) + SourceIndex(0) +2 >Emitted(50, 18) Source(61, 4) + SourceIndex(0) --- >>> return FindWidget; 1->^^^^^^^^^^^^^^^^ @@ -949,8 +949,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1->Emitted(51, 17) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(51, 34) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) +1->Emitted(51, 17) Source(63, 2) + SourceIndex(0) +2 >Emitted(51, 34) Source(63, 3) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -980,10 +980,10 @@ sourceFile:recursiveClassReferenceTest.ts > } > > } -1 >Emitted(52, 13) Source(63, 2) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -2 >Emitted(52, 14) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget) -3 >Emitted(52, 14) Source(45, 2) + SourceIndex(0) name (Sample.Thing.Widgets) -4 >Emitted(52, 18) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +1 >Emitted(52, 13) Source(63, 2) + SourceIndex(0) +2 >Emitted(52, 14) Source(63, 3) + SourceIndex(0) +3 >Emitted(52, 14) Source(45, 2) + SourceIndex(0) +4 >Emitted(52, 18) Source(63, 3) + SourceIndex(0) --- >>> Widgets.FindWidget = FindWidget; 1->^^^^^^^^^^^^ @@ -1013,10 +1013,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } 4 > -1->Emitted(53, 13) Source(45, 15) + SourceIndex(0) name (Sample.Thing.Widgets) -2 >Emitted(53, 31) Source(45, 25) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(53, 44) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) -4 >Emitted(53, 45) Source(63, 3) + SourceIndex(0) name (Sample.Thing.Widgets) +1->Emitted(53, 13) Source(45, 15) + SourceIndex(0) +2 >Emitted(53, 31) Source(45, 25) + SourceIndex(0) +3 >Emitted(53, 44) Source(63, 3) + SourceIndex(0) +4 >Emitted(53, 45) Source(63, 3) + SourceIndex(0) --- >>> })(Widgets = Thing.Widgets || (Thing.Widgets = {})); 1->^^^^^^^^ @@ -1058,15 +1058,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(54, 9) Source(64, 1) + SourceIndex(0) name (Sample.Thing.Widgets) -2 >Emitted(54, 10) Source(64, 2) + SourceIndex(0) name (Sample.Thing.Widgets) -3 >Emitted(54, 12) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(54, 19) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(54, 22) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -6 >Emitted(54, 35) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -7 >Emitted(54, 40) Source(44, 21) + SourceIndex(0) name (Sample.Thing) -8 >Emitted(54, 53) Source(44, 28) + SourceIndex(0) name (Sample.Thing) -9 >Emitted(54, 61) Source(64, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(54, 9) Source(64, 1) + SourceIndex(0) +2 >Emitted(54, 10) Source(64, 2) + SourceIndex(0) +3 >Emitted(54, 12) Source(44, 21) + SourceIndex(0) +4 >Emitted(54, 19) Source(44, 28) + SourceIndex(0) +5 >Emitted(54, 22) Source(44, 21) + SourceIndex(0) +6 >Emitted(54, 35) Source(44, 28) + SourceIndex(0) +7 >Emitted(54, 40) Source(44, 21) + SourceIndex(0) +8 >Emitted(54, 53) Source(44, 28) + SourceIndex(0) +9 >Emitted(54, 61) Source(64, 2) + SourceIndex(0) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); 1 >^^^^ @@ -1107,15 +1107,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(55, 5) Source(64, 1) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(55, 6) Source(64, 2) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(55, 8) Source(44, 15) + SourceIndex(0) name (Sample) -4 >Emitted(55, 13) Source(44, 20) + SourceIndex(0) name (Sample) -5 >Emitted(55, 16) Source(44, 15) + SourceIndex(0) name (Sample) -6 >Emitted(55, 28) Source(44, 20) + SourceIndex(0) name (Sample) -7 >Emitted(55, 33) Source(44, 15) + SourceIndex(0) name (Sample) -8 >Emitted(55, 45) Source(44, 20) + SourceIndex(0) name (Sample) -9 >Emitted(55, 53) Source(64, 2) + SourceIndex(0) name (Sample) +1 >Emitted(55, 5) Source(64, 1) + SourceIndex(0) +2 >Emitted(55, 6) Source(64, 2) + SourceIndex(0) +3 >Emitted(55, 8) Source(44, 15) + SourceIndex(0) +4 >Emitted(55, 13) Source(44, 20) + SourceIndex(0) +5 >Emitted(55, 16) Source(44, 15) + SourceIndex(0) +6 >Emitted(55, 28) Source(44, 20) + SourceIndex(0) +7 >Emitted(55, 33) Source(44, 15) + SourceIndex(0) +8 >Emitted(55, 45) Source(44, 20) + SourceIndex(0) +9 >Emitted(55, 53) Source(64, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); 1 > @@ -1153,8 +1153,8 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(56, 1) Source(64, 1) + SourceIndex(0) name (Sample) -2 >Emitted(56, 2) Source(64, 2) + SourceIndex(0) name (Sample) +1 >Emitted(56, 1) Source(64, 1) + SourceIndex(0) +2 >Emitted(56, 2) Source(64, 2) + SourceIndex(0) 3 >Emitted(56, 4) Source(44, 8) + SourceIndex(0) 4 >Emitted(56, 10) Source(44, 14) + SourceIndex(0) 5 >Emitted(56, 15) Source(44, 8) + SourceIndex(0) @@ -1174,7 +1174,7 @@ sourceFile:recursiveClassReferenceTest.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(58, 5) Source(67, 1) + SourceIndex(0) name (AbstractMode) +1->Emitted(58, 5) Source(67, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -1182,8 +1182,8 @@ sourceFile:recursiveClassReferenceTest.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 2 > } -1->Emitted(59, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode.constructor) -2 >Emitted(59, 6) Source(67, 89) + SourceIndex(0) name (AbstractMode.constructor) +1->Emitted(59, 5) Source(67, 88) + SourceIndex(0) +2 >Emitted(59, 6) Source(67, 89) + SourceIndex(0) --- >>> AbstractMode.prototype.getInitialState = function () { return null; }; 1->^^^^ @@ -1206,24 +1206,24 @@ sourceFile:recursiveClassReferenceTest.ts 8 > ; 9 > 10> } -1->Emitted(60, 5) Source(67, 46) + SourceIndex(0) name (AbstractMode) -2 >Emitted(60, 43) Source(67, 61) + SourceIndex(0) name (AbstractMode) -3 >Emitted(60, 46) Source(67, 39) + SourceIndex(0) name (AbstractMode) -4 >Emitted(60, 60) Source(67, 74) + SourceIndex(0) name (AbstractMode.getInitialState) -5 >Emitted(60, 66) Source(67, 80) + SourceIndex(0) name (AbstractMode.getInitialState) -6 >Emitted(60, 67) Source(67, 81) + SourceIndex(0) name (AbstractMode.getInitialState) -7 >Emitted(60, 71) Source(67, 85) + SourceIndex(0) name (AbstractMode.getInitialState) -8 >Emitted(60, 72) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) -9 >Emitted(60, 73) Source(67, 86) + SourceIndex(0) name (AbstractMode.getInitialState) -10>Emitted(60, 74) Source(67, 87) + SourceIndex(0) name (AbstractMode.getInitialState) +1->Emitted(60, 5) Source(67, 46) + SourceIndex(0) +2 >Emitted(60, 43) Source(67, 61) + SourceIndex(0) +3 >Emitted(60, 46) Source(67, 39) + SourceIndex(0) +4 >Emitted(60, 60) Source(67, 74) + SourceIndex(0) +5 >Emitted(60, 66) Source(67, 80) + SourceIndex(0) +6 >Emitted(60, 67) Source(67, 81) + SourceIndex(0) +7 >Emitted(60, 71) Source(67, 85) + SourceIndex(0) +8 >Emitted(60, 72) Source(67, 86) + SourceIndex(0) +9 >Emitted(60, 73) Source(67, 86) + SourceIndex(0) +10>Emitted(60, 74) Source(67, 87) + SourceIndex(0) --- >>> return AbstractMode; 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(61, 5) Source(67, 88) + SourceIndex(0) name (AbstractMode) -2 >Emitted(61, 24) Source(67, 89) + SourceIndex(0) name (AbstractMode) +1 >Emitted(61, 5) Source(67, 88) + SourceIndex(0) +2 >Emitted(61, 24) Source(67, 89) + SourceIndex(0) --- >>>})(); 1 > @@ -1235,8 +1235,8 @@ sourceFile:recursiveClassReferenceTest.ts 2 >} 3 > 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} } -1 >Emitted(62, 1) Source(67, 88) + SourceIndex(0) name (AbstractMode) -2 >Emitted(62, 2) Source(67, 89) + SourceIndex(0) name (AbstractMode) +1 >Emitted(62, 1) Source(67, 88) + SourceIndex(0) +2 >Emitted(62, 2) Source(67, 89) + SourceIndex(0) 3 >Emitted(62, 2) Source(67, 1) + SourceIndex(0) 4 >Emitted(62, 6) Source(67, 89) + SourceIndex(0) --- @@ -1333,10 +1333,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(65, 5) Source(76, 15) + SourceIndex(0) name (Sample) -2 >Emitted(65, 9) Source(76, 15) + SourceIndex(0) name (Sample) -3 >Emitted(65, 14) Source(76, 20) + SourceIndex(0) name (Sample) -4 >Emitted(65, 15) Source(100, 2) + SourceIndex(0) name (Sample) +1 >Emitted(65, 5) Source(76, 15) + SourceIndex(0) +2 >Emitted(65, 9) Source(76, 15) + SourceIndex(0) +3 >Emitted(65, 14) Source(76, 20) + SourceIndex(0) +4 >Emitted(65, 15) Source(100, 2) + SourceIndex(0) --- >>> (function (Thing) { 1->^^^^ @@ -1346,9 +1346,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(66, 5) Source(76, 15) + SourceIndex(0) name (Sample) -2 >Emitted(66, 16) Source(76, 15) + SourceIndex(0) name (Sample) -3 >Emitted(66, 21) Source(76, 20) + SourceIndex(0) name (Sample) +1->Emitted(66, 5) Source(76, 15) + SourceIndex(0) +2 >Emitted(66, 16) Source(76, 15) + SourceIndex(0) +3 >Emitted(66, 21) Source(76, 20) + SourceIndex(0) --- >>> var Languages; 1->^^^^^^^^ @@ -1384,10 +1384,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(67, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(67, 13) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(67, 22) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(67, 23) Source(100, 2) + SourceIndex(0) name (Sample.Thing) +1->Emitted(67, 9) Source(76, 21) + SourceIndex(0) +2 >Emitted(67, 13) Source(76, 21) + SourceIndex(0) +3 >Emitted(67, 22) Source(76, 30) + SourceIndex(0) +4 >Emitted(67, 23) Source(100, 2) + SourceIndex(0) --- >>> (function (Languages) { 1->^^^^^^^^ @@ -1396,9 +1396,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Languages -1->Emitted(68, 9) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(68, 20) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(68, 29) Source(76, 30) + SourceIndex(0) name (Sample.Thing) +1->Emitted(68, 9) Source(76, 21) + SourceIndex(0) +2 >Emitted(68, 20) Source(76, 21) + SourceIndex(0) +3 >Emitted(68, 29) Source(76, 30) + SourceIndex(0) --- >>> var PlainText; 1 >^^^^^^^^^^^^ @@ -1434,10 +1434,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(69, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(69, 17) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(69, 26) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(69, 27) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) +1 >Emitted(69, 13) Source(76, 31) + SourceIndex(0) +2 >Emitted(69, 17) Source(76, 31) + SourceIndex(0) +3 >Emitted(69, 26) Source(76, 40) + SourceIndex(0) +4 >Emitted(69, 27) Source(100, 2) + SourceIndex(0) --- >>> (function (PlainText) { 1->^^^^^^^^^^^^ @@ -1451,11 +1451,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > PlainText 4 > 5 > { -1->Emitted(70, 13) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(70, 24) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(70, 33) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(70, 35) Source(76, 41) + SourceIndex(0) name (Sample.Thing.Languages) -5 >Emitted(70, 36) Source(76, 42) + SourceIndex(0) name (Sample.Thing.Languages) +1->Emitted(70, 13) Source(76, 31) + SourceIndex(0) +2 >Emitted(70, 24) Source(76, 31) + SourceIndex(0) +3 >Emitted(70, 33) Source(76, 40) + SourceIndex(0) +4 >Emitted(70, 35) Source(76, 41) + SourceIndex(0) +5 >Emitted(70, 36) Source(76, 42) + SourceIndex(0) --- >>> var State = (function () { 1->^^^^^^^^^^^^^^^^ @@ -1463,7 +1463,7 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > > -1->Emitted(71, 17) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(71, 17) Source(78, 2) + SourceIndex(0) --- >>> function State(mode) { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1474,9 +1474,9 @@ sourceFile:recursiveClassReferenceTest.ts > 2 > constructor(private 3 > mode: IMode -1->Emitted(72, 21) Source(79, 9) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(72, 36) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(72, 40) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(72, 21) Source(79, 9) + SourceIndex(0) +2 >Emitted(72, 36) Source(79, 29) + SourceIndex(0) +3 >Emitted(72, 40) Source(79, 40) + SourceIndex(0) --- >>> this.mode = mode; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1489,11 +1489,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > mode 5 > : IMode -1->Emitted(73, 25) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -2 >Emitted(73, 34) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -3 >Emitted(73, 37) Source(79, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -4 >Emitted(73, 41) Source(79, 33) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -5 >Emitted(73, 42) Source(79, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +1->Emitted(73, 25) Source(79, 29) + SourceIndex(0) +2 >Emitted(73, 34) Source(79, 33) + SourceIndex(0) +3 >Emitted(73, 37) Source(79, 29) + SourceIndex(0) +4 >Emitted(73, 41) Source(79, 33) + SourceIndex(0) +5 >Emitted(73, 42) Source(79, 40) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1501,8 +1501,8 @@ sourceFile:recursiveClassReferenceTest.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >) { 2 > } -1 >Emitted(74, 21) Source(79, 44) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) -2 >Emitted(74, 22) Source(79, 45) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.constructor) +1 >Emitted(74, 21) Source(79, 44) + SourceIndex(0) +2 >Emitted(74, 22) Source(79, 45) + SourceIndex(0) --- >>> State.prototype.clone = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1512,9 +1512,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > clone 3 > -1->Emitted(75, 21) Source(80, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(75, 42) Source(80, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(75, 45) Source(80, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(75, 21) Source(80, 10) + SourceIndex(0) +2 >Emitted(75, 42) Source(80, 15) + SourceIndex(0) +3 >Emitted(75, 45) Source(80, 3) + SourceIndex(0) --- >>> return this; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1528,11 +1528,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > this 5 > ; -1 >Emitted(76, 25) Source(81, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -2 >Emitted(76, 31) Source(81, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -3 >Emitted(76, 32) Source(81, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -4 >Emitted(76, 36) Source(81, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -5 >Emitted(76, 37) Source(81, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +1 >Emitted(76, 25) Source(81, 4) + SourceIndex(0) +2 >Emitted(76, 31) Source(81, 10) + SourceIndex(0) +3 >Emitted(76, 32) Source(81, 11) + SourceIndex(0) +4 >Emitted(76, 36) Source(81, 15) + SourceIndex(0) +5 >Emitted(76, 37) Source(81, 16) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1541,8 +1541,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(77, 21) Source(82, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) -2 >Emitted(77, 22) Source(82, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.clone) +1 >Emitted(77, 21) Source(82, 3) + SourceIndex(0) +2 >Emitted(77, 22) Source(82, 4) + SourceIndex(0) --- >>> State.prototype.equals = function (other) { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1557,11 +1557,11 @@ sourceFile:recursiveClassReferenceTest.ts 3 > 4 > public equals( 5 > other:IState -1->Emitted(78, 21) Source(84, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(78, 43) Source(84, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(78, 46) Source(84, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -4 >Emitted(78, 56) Source(84, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -5 >Emitted(78, 61) Source(84, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1->Emitted(78, 21) Source(84, 10) + SourceIndex(0) +2 >Emitted(78, 43) Source(84, 16) + SourceIndex(0) +3 >Emitted(78, 46) Source(84, 3) + SourceIndex(0) +4 >Emitted(78, 56) Source(84, 17) + SourceIndex(0) +5 >Emitted(78, 61) Source(84, 29) + SourceIndex(0) --- >>> return this === other; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1579,13 +1579,13 @@ sourceFile:recursiveClassReferenceTest.ts 5 > === 6 > other 7 > ; -1 >Emitted(79, 25) Source(85, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -2 >Emitted(79, 31) Source(85, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -3 >Emitted(79, 32) Source(85, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -4 >Emitted(79, 36) Source(85, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -5 >Emitted(79, 41) Source(85, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -6 >Emitted(79, 46) Source(85, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -7 >Emitted(79, 47) Source(85, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +1 >Emitted(79, 25) Source(85, 4) + SourceIndex(0) +2 >Emitted(79, 31) Source(85, 10) + SourceIndex(0) +3 >Emitted(79, 32) Source(85, 11) + SourceIndex(0) +4 >Emitted(79, 36) Source(85, 15) + SourceIndex(0) +5 >Emitted(79, 41) Source(85, 20) + SourceIndex(0) +6 >Emitted(79, 46) Source(85, 25) + SourceIndex(0) +7 >Emitted(79, 47) Source(85, 26) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1594,8 +1594,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(80, 21) Source(86, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) -2 >Emitted(80, 22) Source(86, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.equals) +1 >Emitted(80, 21) Source(86, 3) + SourceIndex(0) +2 >Emitted(80, 22) Source(86, 4) + SourceIndex(0) --- >>> State.prototype.getMode = function () { return mode; }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1620,16 +1620,16 @@ sourceFile:recursiveClassReferenceTest.ts 8 > ; 9 > 10> } -1->Emitted(81, 21) Source(88, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(81, 44) Source(88, 17) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(81, 47) Source(88, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -4 >Emitted(81, 61) Source(88, 29) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -5 >Emitted(81, 67) Source(88, 35) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -6 >Emitted(81, 68) Source(88, 36) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -7 >Emitted(81, 72) Source(88, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -8 >Emitted(81, 73) Source(88, 41) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -9 >Emitted(81, 74) Source(88, 42) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) -10>Emitted(81, 75) Source(88, 43) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State.getMode) +1->Emitted(81, 21) Source(88, 10) + SourceIndex(0) +2 >Emitted(81, 44) Source(88, 17) + SourceIndex(0) +3 >Emitted(81, 47) Source(88, 3) + SourceIndex(0) +4 >Emitted(81, 61) Source(88, 29) + SourceIndex(0) +5 >Emitted(81, 67) Source(88, 35) + SourceIndex(0) +6 >Emitted(81, 68) Source(88, 36) + SourceIndex(0) +7 >Emitted(81, 72) Source(88, 40) + SourceIndex(0) +8 >Emitted(81, 73) Source(88, 41) + SourceIndex(0) +9 >Emitted(81, 74) Source(88, 42) + SourceIndex(0) +10>Emitted(81, 75) Source(88, 43) + SourceIndex(0) --- >>> return State; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1637,8 +1637,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(82, 21) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(82, 33) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) +1 >Emitted(82, 21) Source(89, 2) + SourceIndex(0) +2 >Emitted(82, 33) Source(89, 3) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1661,10 +1661,10 @@ sourceFile:recursiveClassReferenceTest.ts > > public getMode(): IMode { return mode; } > } -1 >Emitted(83, 17) Source(89, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -2 >Emitted(83, 18) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.State) -3 >Emitted(83, 18) Source(78, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(83, 22) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1 >Emitted(83, 17) Source(89, 2) + SourceIndex(0) +2 >Emitted(83, 18) Source(89, 3) + SourceIndex(0) +3 >Emitted(83, 18) Source(78, 2) + SourceIndex(0) +4 >Emitted(83, 22) Source(89, 3) + SourceIndex(0) --- >>> PlainText.State = State; 1->^^^^^^^^^^^^^^^^ @@ -1687,10 +1687,10 @@ sourceFile:recursiveClassReferenceTest.ts > public getMode(): IMode { return mode; } > } 4 > -1->Emitted(84, 17) Source(78, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(84, 32) Source(78, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(84, 40) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(84, 41) Source(89, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(84, 17) Source(78, 15) + SourceIndex(0) +2 >Emitted(84, 32) Source(78, 20) + SourceIndex(0) +3 >Emitted(84, 40) Source(89, 3) + SourceIndex(0) +4 >Emitted(84, 41) Source(89, 3) + SourceIndex(0) --- >>> var Mode = (function (_super) { 1->^^^^^^^^^^^^^^^^ @@ -1698,29 +1698,29 @@ sourceFile:recursiveClassReferenceTest.ts 1-> > > -1->Emitted(85, 17) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(85, 17) Source(91, 2) + SourceIndex(0) --- >>> __extends(Mode, _super); 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class Mode extends 2 > AbstractMode -1->Emitted(86, 21) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(86, 45) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(86, 21) Source(91, 28) + SourceIndex(0) +2 >Emitted(86, 45) Source(91, 40) + SourceIndex(0) --- >>> function Mode() { 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(87, 21) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1 >Emitted(87, 21) Source(91, 2) + SourceIndex(0) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class Mode extends 2 > AbstractMode -1->Emitted(88, 25) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) -2 >Emitted(88, 55) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +1->Emitted(88, 25) Source(91, 28) + SourceIndex(0) +2 >Emitted(88, 55) Source(91, 40) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1736,8 +1736,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1 >Emitted(89, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) -2 >Emitted(89, 22) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.constructor) +1 >Emitted(89, 21) Source(99, 2) + SourceIndex(0) +2 >Emitted(89, 22) Source(99, 3) + SourceIndex(0) --- >>> // scenario 2 1->^^^^^^^^^^^^^^^^^^^^ @@ -1745,8 +1745,8 @@ sourceFile:recursiveClassReferenceTest.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > // scenario 2 -1->Emitted(90, 21) Source(93, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(90, 34) Source(93, 16) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(90, 21) Source(93, 3) + SourceIndex(0) +2 >Emitted(90, 34) Source(93, 16) + SourceIndex(0) --- >>> Mode.prototype.getInitialState = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -1756,9 +1756,9 @@ sourceFile:recursiveClassReferenceTest.ts > public 2 > getInitialState 3 > -1->Emitted(91, 21) Source(94, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(91, 51) Source(94, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(91, 54) Source(94, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(91, 21) Source(94, 10) + SourceIndex(0) +2 >Emitted(91, 51) Source(94, 25) + SourceIndex(0) +3 >Emitted(91, 54) Source(94, 3) + SourceIndex(0) --- >>> return new State(self); 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1780,15 +1780,15 @@ sourceFile:recursiveClassReferenceTest.ts 7 > self 8 > ) 9 > ; -1 >Emitted(92, 25) Source(95, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -2 >Emitted(92, 31) Source(95, 10) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -3 >Emitted(92, 32) Source(95, 11) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -4 >Emitted(92, 36) Source(95, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -5 >Emitted(92, 41) Source(95, 20) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -6 >Emitted(92, 42) Source(95, 21) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -7 >Emitted(92, 46) Source(95, 25) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -8 >Emitted(92, 47) Source(95, 26) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -9 >Emitted(92, 48) Source(95, 27) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +1 >Emitted(92, 25) Source(95, 4) + SourceIndex(0) +2 >Emitted(92, 31) Source(95, 10) + SourceIndex(0) +3 >Emitted(92, 32) Source(95, 11) + SourceIndex(0) +4 >Emitted(92, 36) Source(95, 15) + SourceIndex(0) +5 >Emitted(92, 41) Source(95, 20) + SourceIndex(0) +6 >Emitted(92, 42) Source(95, 21) + SourceIndex(0) +7 >Emitted(92, 46) Source(95, 25) + SourceIndex(0) +8 >Emitted(92, 47) Source(95, 26) + SourceIndex(0) +9 >Emitted(92, 48) Source(95, 27) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1797,8 +1797,8 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > 2 > } -1 >Emitted(93, 21) Source(96, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) -2 >Emitted(93, 22) Source(96, 4) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode.getInitialState) +1 >Emitted(93, 21) Source(96, 3) + SourceIndex(0) +2 >Emitted(93, 22) Source(96, 4) + SourceIndex(0) --- >>> return Mode; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1809,8 +1809,8 @@ sourceFile:recursiveClassReferenceTest.ts > > 2 > } -1->Emitted(94, 21) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(94, 32) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) +1->Emitted(94, 21) Source(99, 2) + SourceIndex(0) +2 >Emitted(94, 32) Source(99, 3) + SourceIndex(0) --- >>> })(AbstractMode); 1->^^^^^^^^^^^^^^^^ @@ -1834,12 +1834,12 @@ sourceFile:recursiveClassReferenceTest.ts > > > } -1->Emitted(95, 17) Source(99, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -2 >Emitted(95, 18) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText.Mode) -3 >Emitted(95, 18) Source(91, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(95, 20) Source(91, 28) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -5 >Emitted(95, 32) Source(91, 40) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -6 >Emitted(95, 34) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(95, 17) Source(99, 2) + SourceIndex(0) +2 >Emitted(95, 18) Source(99, 3) + SourceIndex(0) +3 >Emitted(95, 18) Source(91, 2) + SourceIndex(0) +4 >Emitted(95, 20) Source(91, 28) + SourceIndex(0) +5 >Emitted(95, 32) Source(91, 40) + SourceIndex(0) +6 >Emitted(95, 34) Source(99, 3) + SourceIndex(0) --- >>> PlainText.Mode = Mode; 1->^^^^^^^^^^^^^^^^ @@ -1859,10 +1859,10 @@ sourceFile:recursiveClassReferenceTest.ts > > } 4 > -1->Emitted(96, 17) Source(91, 15) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(96, 31) Source(91, 19) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(96, 38) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -4 >Emitted(96, 39) Source(99, 3) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) +1->Emitted(96, 17) Source(91, 15) + SourceIndex(0) +2 >Emitted(96, 31) Source(91, 19) + SourceIndex(0) +3 >Emitted(96, 38) Source(99, 3) + SourceIndex(0) +4 >Emitted(96, 39) Source(99, 3) + SourceIndex(0) --- >>> })(PlainText = Languages.PlainText || (Languages.PlainText = {})); 1->^^^^^^^^^^^^ @@ -1908,15 +1908,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(97, 13) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -2 >Emitted(97, 14) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages.PlainText) -3 >Emitted(97, 16) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -4 >Emitted(97, 25) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -5 >Emitted(97, 28) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -6 >Emitted(97, 47) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -7 >Emitted(97, 52) Source(76, 31) + SourceIndex(0) name (Sample.Thing.Languages) -8 >Emitted(97, 71) Source(76, 40) + SourceIndex(0) name (Sample.Thing.Languages) -9 >Emitted(97, 79) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) +1->Emitted(97, 13) Source(100, 1) + SourceIndex(0) +2 >Emitted(97, 14) Source(100, 2) + SourceIndex(0) +3 >Emitted(97, 16) Source(76, 31) + SourceIndex(0) +4 >Emitted(97, 25) Source(76, 40) + SourceIndex(0) +5 >Emitted(97, 28) Source(76, 31) + SourceIndex(0) +6 >Emitted(97, 47) Source(76, 40) + SourceIndex(0) +7 >Emitted(97, 52) Source(76, 31) + SourceIndex(0) +8 >Emitted(97, 71) Source(76, 40) + SourceIndex(0) +9 >Emitted(97, 79) Source(100, 2) + SourceIndex(0) --- >>> })(Languages = Thing.Languages || (Thing.Languages = {})); 1 >^^^^^^^^ @@ -1961,15 +1961,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(98, 9) Source(100, 1) + SourceIndex(0) name (Sample.Thing.Languages) -2 >Emitted(98, 10) Source(100, 2) + SourceIndex(0) name (Sample.Thing.Languages) -3 >Emitted(98, 12) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -4 >Emitted(98, 21) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -5 >Emitted(98, 24) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -6 >Emitted(98, 39) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -7 >Emitted(98, 44) Source(76, 21) + SourceIndex(0) name (Sample.Thing) -8 >Emitted(98, 59) Source(76, 30) + SourceIndex(0) name (Sample.Thing) -9 >Emitted(98, 67) Source(100, 2) + SourceIndex(0) name (Sample.Thing) +1 >Emitted(98, 9) Source(100, 1) + SourceIndex(0) +2 >Emitted(98, 10) Source(100, 2) + SourceIndex(0) +3 >Emitted(98, 12) Source(76, 21) + SourceIndex(0) +4 >Emitted(98, 21) Source(76, 30) + SourceIndex(0) +5 >Emitted(98, 24) Source(76, 21) + SourceIndex(0) +6 >Emitted(98, 39) Source(76, 30) + SourceIndex(0) +7 >Emitted(98, 44) Source(76, 21) + SourceIndex(0) +8 >Emitted(98, 59) Source(76, 30) + SourceIndex(0) +9 >Emitted(98, 67) Source(100, 2) + SourceIndex(0) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); 1 >^^^^ @@ -2014,15 +2014,15 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(99, 5) Source(100, 1) + SourceIndex(0) name (Sample.Thing) -2 >Emitted(99, 6) Source(100, 2) + SourceIndex(0) name (Sample.Thing) -3 >Emitted(99, 8) Source(76, 15) + SourceIndex(0) name (Sample) -4 >Emitted(99, 13) Source(76, 20) + SourceIndex(0) name (Sample) -5 >Emitted(99, 16) Source(76, 15) + SourceIndex(0) name (Sample) -6 >Emitted(99, 28) Source(76, 20) + SourceIndex(0) name (Sample) -7 >Emitted(99, 33) Source(76, 15) + SourceIndex(0) name (Sample) -8 >Emitted(99, 45) Source(76, 20) + SourceIndex(0) name (Sample) -9 >Emitted(99, 53) Source(100, 2) + SourceIndex(0) name (Sample) +1 >Emitted(99, 5) Source(100, 1) + SourceIndex(0) +2 >Emitted(99, 6) Source(100, 2) + SourceIndex(0) +3 >Emitted(99, 8) Source(76, 15) + SourceIndex(0) +4 >Emitted(99, 13) Source(76, 20) + SourceIndex(0) +5 >Emitted(99, 16) Source(76, 15) + SourceIndex(0) +6 >Emitted(99, 28) Source(76, 20) + SourceIndex(0) +7 >Emitted(99, 33) Source(76, 15) + SourceIndex(0) +8 >Emitted(99, 45) Source(76, 20) + SourceIndex(0) +9 >Emitted(99, 53) Source(100, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); 1 > @@ -2064,8 +2064,8 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(100, 1) Source(100, 1) + SourceIndex(0) name (Sample) -2 >Emitted(100, 2) Source(100, 2) + SourceIndex(0) name (Sample) +1 >Emitted(100, 1) Source(100, 1) + SourceIndex(0) +2 >Emitted(100, 2) Source(100, 2) + SourceIndex(0) 3 >Emitted(100, 4) Source(76, 8) + SourceIndex(0) 4 >Emitted(100, 10) Source(76, 14) + SourceIndex(0) 5 >Emitted(100, 15) Source(76, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMap-Comments.js.map b/tests/baselines/reference/sourceMap-Comments.js.map index 6e5e0dca07107..7f6c159c6eb26 100644 --- a/tests/baselines/reference/sourceMap-Comments.js.map +++ b/tests/baselines/reference/sourceMap-Comments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-Comments.js.map] -{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":["sas","sas.tools","sas.tools.Test","sas.tools.Test.constructor","sas.tools.Test.doX"],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAACA,IAAAA,KAAKA,CAkBfA;IAlBUA,WAAAA,KAAKA,EAACA,CAACA;QACdC;YAAAC;YAeAC,CAACA;YAdUD,kBAAGA,GAAVA;gBACIE,IAAIA,CAACA,GAAWA,CAACA,CAACA;gBAClBA,MAAMA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;oBACRA,KAAKA,CAACA;wBACFA,KAAKA,CAACA;oBACVA,KAAKA,CAACA;wBACFA,gBAAgBA;wBAChBA,gBAAgBA;wBAChBA,KAAKA,CAACA;oBACVA,KAAKA,CAACA;wBACFA,WAAWA;wBACXA,KAAKA,CAACA;gBACdA,CAACA;YACLA,CAACA;YACLF,WAACA;QAADA,CAACA,AAfDD,IAeCA;QAfYA,UAAIA,OAehBA,CAAAA;IAELA,CAACA,EAlBUD,KAAKA,GAALA,SAAKA,KAALA,SAAKA,QAkBfA;AAADA,CAACA,EAlBM,GAAG,KAAH,GAAG,QAkBT"} \ No newline at end of file +{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,CAkBf;IAlBU,WAAA,KAAK,EAAC,CAAC;QACd;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACR,KAAK,CAAC;wBACF,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,KAAK,CAAC;gBACd,CAAC;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBf;AAAD,CAAC,EAlBM,GAAG,KAAH,GAAG,QAkBT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt index fe0b9276994c5..ed6b510ac9416 100644 --- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt @@ -81,10 +81,10 @@ sourceFile:sourceMap-Comments.ts > } > > } -1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) name (sas) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) name (sas) -3 >Emitted(3, 14) Source(1, 17) + SourceIndex(0) name (sas) -4 >Emitted(3, 15) Source(19, 2) + SourceIndex(0) name (sas) +1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) +3 >Emitted(3, 14) Source(1, 17) + SourceIndex(0) +4 >Emitted(3, 15) Source(19, 2) + SourceIndex(0) --- >>> (function (tools) { 1->^^^^ @@ -98,24 +98,24 @@ sourceFile:sourceMap-Comments.ts 3 > tools 4 > 5 > { -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) name (sas) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) name (sas) -3 >Emitted(4, 21) Source(1, 17) + SourceIndex(0) name (sas) -4 >Emitted(4, 23) Source(1, 18) + SourceIndex(0) name (sas) -5 >Emitted(4, 24) Source(1, 19) + SourceIndex(0) name (sas) +1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) +3 >Emitted(4, 21) Source(1, 17) + SourceIndex(0) +4 >Emitted(4, 23) Source(1, 18) + SourceIndex(0) +5 >Emitted(4, 24) Source(1, 19) + SourceIndex(0) --- >>> var Test = (function () { 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (sas.tools) +1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) --- >>> function Test() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(6, 13) Source(2, 5) + SourceIndex(0) name (sas.tools.Test) +1->Emitted(6, 13) Source(2, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^ @@ -138,8 +138,8 @@ sourceFile:sourceMap-Comments.ts > } > 2 > } -1->Emitted(7, 13) Source(17, 5) + SourceIndex(0) name (sas.tools.Test.constructor) -2 >Emitted(7, 14) Source(17, 6) + SourceIndex(0) name (sas.tools.Test.constructor) +1->Emitted(7, 13) Source(17, 5) + SourceIndex(0) +2 >Emitted(7, 14) Source(17, 6) + SourceIndex(0) --- >>> Test.prototype.doX = function () { 1->^^^^^^^^^^^^ @@ -148,9 +148,9 @@ sourceFile:sourceMap-Comments.ts 1-> 2 > doX 3 > -1->Emitted(8, 13) Source(3, 16) + SourceIndex(0) name (sas.tools.Test) -2 >Emitted(8, 31) Source(3, 19) + SourceIndex(0) name (sas.tools.Test) -3 >Emitted(8, 34) Source(3, 9) + SourceIndex(0) name (sas.tools.Test) +1->Emitted(8, 13) Source(3, 16) + SourceIndex(0) +2 >Emitted(8, 31) Source(3, 19) + SourceIndex(0) +3 >Emitted(8, 34) Source(3, 9) + SourceIndex(0) --- >>> var f = 2; 1 >^^^^^^^^^^^^^^^^ @@ -167,12 +167,12 @@ sourceFile:sourceMap-Comments.ts 4 > : number = 5 > 2 6 > ; -1 >Emitted(9, 17) Source(4, 13) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(9, 21) Source(4, 17) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(9, 22) Source(4, 18) + SourceIndex(0) name (sas.tools.Test.doX) -4 >Emitted(9, 25) Source(4, 29) + SourceIndex(0) name (sas.tools.Test.doX) -5 >Emitted(9, 26) Source(4, 30) + SourceIndex(0) name (sas.tools.Test.doX) -6 >Emitted(9, 27) Source(4, 31) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(9, 17) Source(4, 13) + SourceIndex(0) +2 >Emitted(9, 21) Source(4, 17) + SourceIndex(0) +3 >Emitted(9, 22) Source(4, 18) + SourceIndex(0) +4 >Emitted(9, 25) Source(4, 29) + SourceIndex(0) +5 >Emitted(9, 26) Source(4, 30) + SourceIndex(0) +6 >Emitted(9, 27) Source(4, 31) + SourceIndex(0) --- >>> switch (f) { 1->^^^^^^^^^^^^^^^^ @@ -192,14 +192,14 @@ sourceFile:sourceMap-Comments.ts 6 > ) 7 > 8 > { -1->Emitted(10, 17) Source(5, 13) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(10, 23) Source(5, 19) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(10, 24) Source(5, 20) + SourceIndex(0) name (sas.tools.Test.doX) -4 >Emitted(10, 25) Source(5, 21) + SourceIndex(0) name (sas.tools.Test.doX) -5 >Emitted(10, 26) Source(5, 22) + SourceIndex(0) name (sas.tools.Test.doX) -6 >Emitted(10, 27) Source(5, 23) + SourceIndex(0) name (sas.tools.Test.doX) -7 >Emitted(10, 28) Source(5, 24) + SourceIndex(0) name (sas.tools.Test.doX) -8 >Emitted(10, 29) Source(5, 25) + SourceIndex(0) name (sas.tools.Test.doX) +1->Emitted(10, 17) Source(5, 13) + SourceIndex(0) +2 >Emitted(10, 23) Source(5, 19) + SourceIndex(0) +3 >Emitted(10, 24) Source(5, 20) + SourceIndex(0) +4 >Emitted(10, 25) Source(5, 21) + SourceIndex(0) +5 >Emitted(10, 26) Source(5, 22) + SourceIndex(0) +6 >Emitted(10, 27) Source(5, 23) + SourceIndex(0) +7 >Emitted(10, 28) Source(5, 24) + SourceIndex(0) +8 >Emitted(10, 29) Source(5, 25) + SourceIndex(0) --- >>> case 1: 1 >^^^^^^^^^^^^^^^^^^^^ @@ -210,9 +210,9 @@ sourceFile:sourceMap-Comments.ts > 2 > case 3 > 1 -1 >Emitted(11, 21) Source(6, 17) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(11, 26) Source(6, 22) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(11, 27) Source(6, 23) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(11, 21) Source(6, 17) + SourceIndex(0) +2 >Emitted(11, 26) Source(6, 22) + SourceIndex(0) +3 >Emitted(11, 27) Source(6, 23) + SourceIndex(0) --- >>> break; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -222,9 +222,9 @@ sourceFile:sourceMap-Comments.ts > 2 > break 3 > ; -1->Emitted(12, 25) Source(7, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(12, 30) Source(7, 26) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(12, 31) Source(7, 27) + SourceIndex(0) name (sas.tools.Test.doX) +1->Emitted(12, 25) Source(7, 21) + SourceIndex(0) +2 >Emitted(12, 30) Source(7, 26) + SourceIndex(0) +3 >Emitted(12, 31) Source(7, 27) + SourceIndex(0) --- >>> case 2: 1 >^^^^^^^^^^^^^^^^^^^^ @@ -235,9 +235,9 @@ sourceFile:sourceMap-Comments.ts > 2 > case 3 > 2 -1 >Emitted(13, 21) Source(8, 17) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(13, 26) Source(8, 22) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(13, 27) Source(8, 23) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(13, 21) Source(8, 17) + SourceIndex(0) +2 >Emitted(13, 26) Source(8, 22) + SourceIndex(0) +3 >Emitted(13, 27) Source(8, 23) + SourceIndex(0) --- >>> //line comment 1 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -246,8 +246,8 @@ sourceFile:sourceMap-Comments.ts 1->: > 2 > //line comment 1 -1->Emitted(14, 25) Source(9, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(14, 41) Source(9, 37) + SourceIndex(0) name (sas.tools.Test.doX) +1->Emitted(14, 25) Source(9, 21) + SourceIndex(0) +2 >Emitted(14, 41) Source(9, 37) + SourceIndex(0) --- >>> //line comment 2 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -255,8 +255,8 @@ sourceFile:sourceMap-Comments.ts 1-> > 2 > //line comment 2 -1->Emitted(15, 25) Source(10, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(15, 41) Source(10, 37) + SourceIndex(0) name (sas.tools.Test.doX) +1->Emitted(15, 25) Source(10, 21) + SourceIndex(0) +2 >Emitted(15, 41) Source(10, 37) + SourceIndex(0) --- >>> break; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -266,9 +266,9 @@ sourceFile:sourceMap-Comments.ts > 2 > break 3 > ; -1 >Emitted(16, 25) Source(11, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(16, 30) Source(11, 26) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(16, 31) Source(11, 27) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(16, 25) Source(11, 21) + SourceIndex(0) +2 >Emitted(16, 30) Source(11, 26) + SourceIndex(0) +3 >Emitted(16, 31) Source(11, 27) + SourceIndex(0) --- >>> case 3: 1 >^^^^^^^^^^^^^^^^^^^^ @@ -279,9 +279,9 @@ sourceFile:sourceMap-Comments.ts > 2 > case 3 > 3 -1 >Emitted(17, 21) Source(12, 17) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(17, 26) Source(12, 22) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(17, 27) Source(12, 23) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(17, 21) Source(12, 17) + SourceIndex(0) +2 >Emitted(17, 26) Source(12, 22) + SourceIndex(0) +3 >Emitted(17, 27) Source(12, 23) + SourceIndex(0) --- >>> //a comment 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -289,8 +289,8 @@ sourceFile:sourceMap-Comments.ts 1->: > 2 > //a comment -1->Emitted(18, 25) Source(13, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(18, 36) Source(13, 32) + SourceIndex(0) name (sas.tools.Test.doX) +1->Emitted(18, 25) Source(13, 21) + SourceIndex(0) +2 >Emitted(18, 36) Source(13, 32) + SourceIndex(0) --- >>> break; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -300,9 +300,9 @@ sourceFile:sourceMap-Comments.ts > 2 > break 3 > ; -1 >Emitted(19, 25) Source(14, 21) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(19, 30) Source(14, 26) + SourceIndex(0) name (sas.tools.Test.doX) -3 >Emitted(19, 31) Source(14, 27) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(19, 25) Source(14, 21) + SourceIndex(0) +2 >Emitted(19, 30) Source(14, 26) + SourceIndex(0) +3 >Emitted(19, 31) Source(14, 27) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -310,8 +310,8 @@ sourceFile:sourceMap-Comments.ts 1 > > 2 > } -1 >Emitted(20, 17) Source(15, 13) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(20, 18) Source(15, 14) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(20, 17) Source(15, 13) + SourceIndex(0) +2 >Emitted(20, 18) Source(15, 14) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^ @@ -320,8 +320,8 @@ sourceFile:sourceMap-Comments.ts 1 > > 2 > } -1 >Emitted(21, 13) Source(16, 9) + SourceIndex(0) name (sas.tools.Test.doX) -2 >Emitted(21, 14) Source(16, 10) + SourceIndex(0) name (sas.tools.Test.doX) +1 >Emitted(21, 13) Source(16, 9) + SourceIndex(0) +2 >Emitted(21, 14) Source(16, 10) + SourceIndex(0) --- >>> return Test; 1->^^^^^^^^^^^^ @@ -329,8 +329,8 @@ sourceFile:sourceMap-Comments.ts 1-> > 2 > } -1->Emitted(22, 13) Source(17, 5) + SourceIndex(0) name (sas.tools.Test) -2 >Emitted(22, 24) Source(17, 6) + SourceIndex(0) name (sas.tools.Test) +1->Emitted(22, 13) Source(17, 5) + SourceIndex(0) +2 >Emitted(22, 24) Source(17, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^ @@ -357,10 +357,10 @@ sourceFile:sourceMap-Comments.ts > } > } > } -1 >Emitted(23, 9) Source(17, 5) + SourceIndex(0) name (sas.tools.Test) -2 >Emitted(23, 10) Source(17, 6) + SourceIndex(0) name (sas.tools.Test) -3 >Emitted(23, 10) Source(2, 5) + SourceIndex(0) name (sas.tools) -4 >Emitted(23, 14) Source(17, 6) + SourceIndex(0) name (sas.tools) +1 >Emitted(23, 9) Source(17, 5) + SourceIndex(0) +2 >Emitted(23, 10) Source(17, 6) + SourceIndex(0) +3 >Emitted(23, 10) Source(2, 5) + SourceIndex(0) +4 >Emitted(23, 14) Source(17, 6) + SourceIndex(0) --- >>> tools.Test = Test; 1->^^^^^^^^ @@ -387,10 +387,10 @@ sourceFile:sourceMap-Comments.ts > } > } 4 > -1->Emitted(24, 9) Source(2, 18) + SourceIndex(0) name (sas.tools) -2 >Emitted(24, 19) Source(2, 22) + SourceIndex(0) name (sas.tools) -3 >Emitted(24, 26) Source(17, 6) + SourceIndex(0) name (sas.tools) -4 >Emitted(24, 27) Source(17, 6) + SourceIndex(0) name (sas.tools) +1->Emitted(24, 9) Source(2, 18) + SourceIndex(0) +2 >Emitted(24, 19) Source(2, 22) + SourceIndex(0) +3 >Emitted(24, 26) Source(17, 6) + SourceIndex(0) +4 >Emitted(24, 27) Source(17, 6) + SourceIndex(0) --- >>> })(tools = sas.tools || (sas.tools = {})); 1->^^^^ @@ -431,15 +431,15 @@ sourceFile:sourceMap-Comments.ts > } > > } -1->Emitted(25, 5) Source(19, 1) + SourceIndex(0) name (sas.tools) -2 >Emitted(25, 6) Source(19, 2) + SourceIndex(0) name (sas.tools) -3 >Emitted(25, 8) Source(1, 12) + SourceIndex(0) name (sas) -4 >Emitted(25, 13) Source(1, 17) + SourceIndex(0) name (sas) -5 >Emitted(25, 16) Source(1, 12) + SourceIndex(0) name (sas) -6 >Emitted(25, 25) Source(1, 17) + SourceIndex(0) name (sas) -7 >Emitted(25, 30) Source(1, 12) + SourceIndex(0) name (sas) -8 >Emitted(25, 39) Source(1, 17) + SourceIndex(0) name (sas) -9 >Emitted(25, 47) Source(19, 2) + SourceIndex(0) name (sas) +1->Emitted(25, 5) Source(19, 1) + SourceIndex(0) +2 >Emitted(25, 6) Source(19, 2) + SourceIndex(0) +3 >Emitted(25, 8) Source(1, 12) + SourceIndex(0) +4 >Emitted(25, 13) Source(1, 17) + SourceIndex(0) +5 >Emitted(25, 16) Source(1, 12) + SourceIndex(0) +6 >Emitted(25, 25) Source(1, 17) + SourceIndex(0) +7 >Emitted(25, 30) Source(1, 12) + SourceIndex(0) +8 >Emitted(25, 39) Source(1, 17) + SourceIndex(0) +9 >Emitted(25, 47) Source(19, 2) + SourceIndex(0) --- >>>})(sas || (sas = {})); 1 > @@ -475,8 +475,8 @@ sourceFile:sourceMap-Comments.ts > } > > } -1 >Emitted(26, 1) Source(19, 1) + SourceIndex(0) name (sas) -2 >Emitted(26, 2) Source(19, 2) + SourceIndex(0) name (sas) +1 >Emitted(26, 1) Source(19, 1) + SourceIndex(0) +2 >Emitted(26, 2) Source(19, 2) + SourceIndex(0) 3 >Emitted(26, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(26, 7) Source(1, 11) + SourceIndex(0) 5 >Emitted(26, 12) Source(1, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMap-Comments2.js.map b/tests/baselines/reference/sourceMap-Comments2.js.map index be5a88d795d7e..e5a5387a72f2e 100644 --- a/tests/baselines/reference/sourceMap-Comments2.js.map +++ b/tests/baselines/reference/sourceMap-Comments2.js.map @@ -1,2 +1,2 @@ //// [sourceMap-Comments2.js.map] -{"version":3,"file":"sourceMap-Comments2.js","sourceRoot":"","sources":["sourceMap-Comments2.ts"],"names":["foo","bar","baz","qat"],"mappings":"AAAA,aAAa,GAAW,EAAE,GAAW;IACjCA,MAAMA,CAACA;AACXA,CAACA;AAED;;GAEG;AACH,aAAa,GAAW,EAAE,GAAW;IACjCC,MAAMA,CAACA;AACXA,CAACA;AAED,uBAAuB;AACvB,aAAa,GAAW,EAAE,GAAW;IACjCC,MAAMA,CAACA;AACXA,CAACA;AAED,aAAa,GAAW,EAAE,GAAW;IACjCC,MAAMA,CAACA;AACXA,CAACA"} \ No newline at end of file +{"version":3,"file":"sourceMap-Comments2.js","sourceRoot":"","sources":["sourceMap-Comments2.ts"],"names":[],"mappings":"AAAA,aAAa,GAAW,EAAE,GAAW;IACjC,MAAM,CAAC;AACX,CAAC;AAED;;GAEG;AACH,aAAa,GAAW,EAAE,GAAW;IACjC,MAAM,CAAC;AACX,CAAC;AAED,uBAAuB;AACvB,aAAa,GAAW,EAAE,GAAW;IACjC,MAAM,CAAC;AACX,CAAC;AAED,aAAa,GAAW,EAAE,GAAW;IACjC,MAAM,CAAC;AACX,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-Comments2.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments2.sourcemap.txt index d6230b83dfbc5..88c78671f0f14 100644 --- a/tests/baselines/reference/sourceMap-Comments2.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-Comments2.sourcemap.txt @@ -33,9 +33,9 @@ sourceFile:sourceMap-Comments2.ts > 2 > return 3 > ; -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) +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) --- >>>} 1 > @@ -44,8 +44,8 @@ sourceFile:sourceMap-Comments2.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) --- >>>/** 1-> @@ -90,9 +90,9 @@ sourceFile:sourceMap-Comments2.ts > 2 > return 3 > ; -1 >Emitted(8, 5) Source(9, 5) + SourceIndex(0) name (bar) -2 >Emitted(8, 11) Source(9, 11) + SourceIndex(0) name (bar) -3 >Emitted(8, 12) Source(9, 12) + SourceIndex(0) name (bar) +1 >Emitted(8, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(8, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(8, 12) Source(9, 12) + SourceIndex(0) --- >>>} 1 > @@ -101,8 +101,8 @@ sourceFile:sourceMap-Comments2.ts 1 > > 2 >} -1 >Emitted(9, 1) Source(10, 1) + SourceIndex(0) name (bar) -2 >Emitted(9, 2) Source(10, 2) + SourceIndex(0) name (bar) +1 >Emitted(9, 1) Source(10, 1) + SourceIndex(0) +2 >Emitted(9, 2) Source(10, 2) + SourceIndex(0) --- >>>// some sort of comment 1-> @@ -141,9 +141,9 @@ sourceFile:sourceMap-Comments2.ts > 2 > return 3 > ; -1 >Emitted(12, 5) Source(14, 5) + SourceIndex(0) name (baz) -2 >Emitted(12, 11) Source(14, 11) + SourceIndex(0) name (baz) -3 >Emitted(12, 12) Source(14, 12) + SourceIndex(0) name (baz) +1 >Emitted(12, 5) Source(14, 5) + SourceIndex(0) +2 >Emitted(12, 11) Source(14, 11) + SourceIndex(0) +3 >Emitted(12, 12) Source(14, 12) + SourceIndex(0) --- >>>} 1 > @@ -152,8 +152,8 @@ sourceFile:sourceMap-Comments2.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(15, 1) + SourceIndex(0) name (baz) -2 >Emitted(13, 2) Source(15, 2) + SourceIndex(0) name (baz) +1 >Emitted(13, 1) Source(15, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(15, 2) + SourceIndex(0) --- >>>function qat(str, num) { 1-> @@ -182,9 +182,9 @@ sourceFile:sourceMap-Comments2.ts > 2 > return 3 > ; -1 >Emitted(15, 5) Source(18, 5) + SourceIndex(0) name (qat) -2 >Emitted(15, 11) Source(18, 11) + SourceIndex(0) name (qat) -3 >Emitted(15, 12) Source(18, 12) + SourceIndex(0) name (qat) +1 >Emitted(15, 5) Source(18, 5) + SourceIndex(0) +2 >Emitted(15, 11) Source(18, 11) + SourceIndex(0) +3 >Emitted(15, 12) Source(18, 12) + SourceIndex(0) --- >>>} 1 > @@ -193,7 +193,7 @@ sourceFile:sourceMap-Comments2.ts 1 > > 2 >} -1 >Emitted(16, 1) Source(19, 1) + SourceIndex(0) name (qat) -2 >Emitted(16, 2) Source(19, 2) + SourceIndex(0) name (qat) +1 >Emitted(16, 1) Source(19, 1) + SourceIndex(0) +2 >Emitted(16, 2) Source(19, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-Comments2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map index 7e38a53a90226..f3e9674336df7 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js.map +++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-FileWithComments.js.map] -{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist","Shapes.foo"],"mappings":"AAMA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAEXA,QAAQA;IACRA;QACIC,cAAcA;QACdA,eAAmBA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA,cAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,QASjBA,CAAAA;IAEDA,+BAA+BA;IAC/BA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IAEXA;IACAI,CAACA;IADeJ,UAAGA,MAClBA,CAAAA;IAEDA;;MAEEA;IACFA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAMA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAEX,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;IAAD,CAAC,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX;IACA,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index 8f8fd8e84b375..c3909571fdddc 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -88,15 +88,15 @@ sourceFile:sourceMap-FileWithComments.ts > > 2 > // Class -1 >Emitted(4, 5) Source(10, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(4, 13) Source(10, 13) + SourceIndex(0) name (Shapes) +1 >Emitted(4, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(4, 13) Source(10, 13) + SourceIndex(0) --- >>> var Point = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(5, 5) Source(11, 5) + SourceIndex(0) name (Shapes) +1->Emitted(5, 5) Source(11, 5) + SourceIndex(0) --- >>> // Constructor 1->^^^^^^^^ @@ -105,8 +105,8 @@ sourceFile:sourceMap-FileWithComments.ts 1->export class Point implements IPoint { > 2 > // Constructor -1->Emitted(6, 9) Source(12, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(6, 23) Source(12, 23) + SourceIndex(0) name (Shapes.Point) +1->Emitted(6, 9) Source(12, 9) + SourceIndex(0) +2 >Emitted(6, 23) Source(12, 23) + SourceIndex(0) --- >>> function Point(x, y) { 1->^^^^^^^^ @@ -120,11 +120,11 @@ sourceFile:sourceMap-FileWithComments.ts 3 > x: number 4 > , public 5 > y: number -1->Emitted(7, 9) Source(13, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(7, 24) Source(13, 28) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(7, 25) Source(13, 37) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(7, 27) Source(13, 46) + SourceIndex(0) name (Shapes.Point) -5 >Emitted(7, 28) Source(13, 55) + SourceIndex(0) name (Shapes.Point) +1->Emitted(7, 9) Source(13, 9) + SourceIndex(0) +2 >Emitted(7, 24) Source(13, 28) + SourceIndex(0) +3 >Emitted(7, 25) Source(13, 37) + SourceIndex(0) +4 >Emitted(7, 27) Source(13, 46) + SourceIndex(0) +5 >Emitted(7, 28) Source(13, 55) + SourceIndex(0) --- >>> this.x = x; 1 >^^^^^^^^^^^^ @@ -138,11 +138,11 @@ sourceFile:sourceMap-FileWithComments.ts 3 > 4 > x 5 > : number -1 >Emitted(8, 13) Source(13, 28) + SourceIndex(0) name (Shapes.Point.constructor) -2 >Emitted(8, 19) Source(13, 29) + SourceIndex(0) name (Shapes.Point.constructor) -3 >Emitted(8, 22) Source(13, 28) + SourceIndex(0) name (Shapes.Point.constructor) -4 >Emitted(8, 23) Source(13, 29) + SourceIndex(0) name (Shapes.Point.constructor) -5 >Emitted(8, 24) Source(13, 37) + SourceIndex(0) name (Shapes.Point.constructor) +1 >Emitted(8, 13) Source(13, 28) + SourceIndex(0) +2 >Emitted(8, 19) Source(13, 29) + SourceIndex(0) +3 >Emitted(8, 22) Source(13, 28) + SourceIndex(0) +4 >Emitted(8, 23) Source(13, 29) + SourceIndex(0) +5 >Emitted(8, 24) Source(13, 37) + SourceIndex(0) --- >>> this.y = y; 1->^^^^^^^^^^^^ @@ -155,11 +155,11 @@ sourceFile:sourceMap-FileWithComments.ts 3 > 4 > y 5 > : number -1->Emitted(9, 13) Source(13, 46) + SourceIndex(0) name (Shapes.Point.constructor) -2 >Emitted(9, 19) Source(13, 47) + SourceIndex(0) name (Shapes.Point.constructor) -3 >Emitted(9, 22) Source(13, 46) + SourceIndex(0) name (Shapes.Point.constructor) -4 >Emitted(9, 23) Source(13, 47) + SourceIndex(0) name (Shapes.Point.constructor) -5 >Emitted(9, 24) Source(13, 55) + SourceIndex(0) name (Shapes.Point.constructor) +1->Emitted(9, 13) Source(13, 46) + SourceIndex(0) +2 >Emitted(9, 19) Source(13, 47) + SourceIndex(0) +3 >Emitted(9, 22) Source(13, 46) + SourceIndex(0) +4 >Emitted(9, 23) Source(13, 47) + SourceIndex(0) +5 >Emitted(9, 24) Source(13, 55) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -167,8 +167,8 @@ sourceFile:sourceMap-FileWithComments.ts 3 > ^^^^^^^^^^^^^^^^^^-> 1 >) { 2 > } -1 >Emitted(10, 9) Source(13, 59) + SourceIndex(0) name (Shapes.Point.constructor) -2 >Emitted(10, 10) Source(13, 60) + SourceIndex(0) name (Shapes.Point.constructor) +1 >Emitted(10, 9) Source(13, 59) + SourceIndex(0) +2 >Emitted(10, 10) Source(13, 60) + SourceIndex(0) --- >>> // Instance member 1->^^^^^^^^ @@ -178,8 +178,8 @@ sourceFile:sourceMap-FileWithComments.ts > > 2 > // Instance member -1->Emitted(11, 9) Source(15, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(11, 27) Source(15, 27) + SourceIndex(0) name (Shapes.Point) +1->Emitted(11, 9) Source(15, 9) + SourceIndex(0) +2 >Emitted(11, 27) Source(15, 27) + SourceIndex(0) --- >>> Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); }; 1->^^^^^^^^ @@ -241,35 +241,35 @@ sourceFile:sourceMap-FileWithComments.ts 27> ; 28> 29> } -1->Emitted(12, 9) Source(16, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(12, 32) Source(16, 16) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(12, 35) Source(16, 9) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(12, 49) Source(16, 21) + SourceIndex(0) name (Shapes.Point.getDist) -5 >Emitted(12, 55) Source(16, 27) + SourceIndex(0) name (Shapes.Point.getDist) -6 >Emitted(12, 56) Source(16, 28) + SourceIndex(0) name (Shapes.Point.getDist) -7 >Emitted(12, 60) Source(16, 32) + SourceIndex(0) name (Shapes.Point.getDist) -8 >Emitted(12, 61) Source(16, 33) + SourceIndex(0) name (Shapes.Point.getDist) -9 >Emitted(12, 65) Source(16, 37) + SourceIndex(0) name (Shapes.Point.getDist) -10>Emitted(12, 66) Source(16, 38) + SourceIndex(0) name (Shapes.Point.getDist) -11>Emitted(12, 70) Source(16, 42) + SourceIndex(0) name (Shapes.Point.getDist) -12>Emitted(12, 71) Source(16, 43) + SourceIndex(0) name (Shapes.Point.getDist) -13>Emitted(12, 72) Source(16, 44) + SourceIndex(0) name (Shapes.Point.getDist) -14>Emitted(12, 75) Source(16, 47) + SourceIndex(0) name (Shapes.Point.getDist) -15>Emitted(12, 79) Source(16, 51) + SourceIndex(0) name (Shapes.Point.getDist) -16>Emitted(12, 80) Source(16, 52) + SourceIndex(0) name (Shapes.Point.getDist) -17>Emitted(12, 81) Source(16, 53) + SourceIndex(0) name (Shapes.Point.getDist) -18>Emitted(12, 84) Source(16, 56) + SourceIndex(0) name (Shapes.Point.getDist) -19>Emitted(12, 88) Source(16, 60) + SourceIndex(0) name (Shapes.Point.getDist) -20>Emitted(12, 89) Source(16, 61) + SourceIndex(0) name (Shapes.Point.getDist) -21>Emitted(12, 90) Source(16, 62) + SourceIndex(0) name (Shapes.Point.getDist) -22>Emitted(12, 93) Source(16, 65) + SourceIndex(0) name (Shapes.Point.getDist) -23>Emitted(12, 97) Source(16, 69) + SourceIndex(0) name (Shapes.Point.getDist) -24>Emitted(12, 98) Source(16, 70) + SourceIndex(0) name (Shapes.Point.getDist) -25>Emitted(12, 99) Source(16, 71) + SourceIndex(0) name (Shapes.Point.getDist) -26>Emitted(12, 100) Source(16, 72) + SourceIndex(0) name (Shapes.Point.getDist) -27>Emitted(12, 101) Source(16, 73) + SourceIndex(0) name (Shapes.Point.getDist) -28>Emitted(12, 102) Source(16, 74) + SourceIndex(0) name (Shapes.Point.getDist) -29>Emitted(12, 103) Source(16, 75) + SourceIndex(0) name (Shapes.Point.getDist) +1->Emitted(12, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(12, 32) Source(16, 16) + SourceIndex(0) +3 >Emitted(12, 35) Source(16, 9) + SourceIndex(0) +4 >Emitted(12, 49) Source(16, 21) + SourceIndex(0) +5 >Emitted(12, 55) Source(16, 27) + SourceIndex(0) +6 >Emitted(12, 56) Source(16, 28) + SourceIndex(0) +7 >Emitted(12, 60) Source(16, 32) + SourceIndex(0) +8 >Emitted(12, 61) Source(16, 33) + SourceIndex(0) +9 >Emitted(12, 65) Source(16, 37) + SourceIndex(0) +10>Emitted(12, 66) Source(16, 38) + SourceIndex(0) +11>Emitted(12, 70) Source(16, 42) + SourceIndex(0) +12>Emitted(12, 71) Source(16, 43) + SourceIndex(0) +13>Emitted(12, 72) Source(16, 44) + SourceIndex(0) +14>Emitted(12, 75) Source(16, 47) + SourceIndex(0) +15>Emitted(12, 79) Source(16, 51) + SourceIndex(0) +16>Emitted(12, 80) Source(16, 52) + SourceIndex(0) +17>Emitted(12, 81) Source(16, 53) + SourceIndex(0) +18>Emitted(12, 84) Source(16, 56) + SourceIndex(0) +19>Emitted(12, 88) Source(16, 60) + SourceIndex(0) +20>Emitted(12, 89) Source(16, 61) + SourceIndex(0) +21>Emitted(12, 90) Source(16, 62) + SourceIndex(0) +22>Emitted(12, 93) Source(16, 65) + SourceIndex(0) +23>Emitted(12, 97) Source(16, 69) + SourceIndex(0) +24>Emitted(12, 98) Source(16, 70) + SourceIndex(0) +25>Emitted(12, 99) Source(16, 71) + SourceIndex(0) +26>Emitted(12, 100) Source(16, 72) + SourceIndex(0) +27>Emitted(12, 101) Source(16, 73) + SourceIndex(0) +28>Emitted(12, 102) Source(16, 74) + SourceIndex(0) +29>Emitted(12, 103) Source(16, 75) + SourceIndex(0) --- >>> // Static member 1 >^^^^^^^^ @@ -279,8 +279,8 @@ sourceFile:sourceMap-FileWithComments.ts > > 2 > // Static member -1 >Emitted(13, 9) Source(18, 9) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(13, 25) Source(18, 25) + SourceIndex(0) name (Shapes.Point) +1 >Emitted(13, 9) Source(18, 9) + SourceIndex(0) +2 >Emitted(13, 25) Source(18, 25) + SourceIndex(0) --- >>> Point.origin = new Point(0, 0); 1->^^^^^^^^ @@ -306,17 +306,17 @@ sourceFile:sourceMap-FileWithComments.ts 9 > 0 10> ) 11> ; -1->Emitted(14, 9) Source(19, 16) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(14, 21) Source(19, 22) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(14, 24) Source(19, 25) + SourceIndex(0) name (Shapes.Point) -4 >Emitted(14, 28) Source(19, 29) + SourceIndex(0) name (Shapes.Point) -5 >Emitted(14, 33) Source(19, 34) + SourceIndex(0) name (Shapes.Point) -6 >Emitted(14, 34) Source(19, 35) + SourceIndex(0) name (Shapes.Point) -7 >Emitted(14, 35) Source(19, 36) + SourceIndex(0) name (Shapes.Point) -8 >Emitted(14, 37) Source(19, 38) + SourceIndex(0) name (Shapes.Point) -9 >Emitted(14, 38) Source(19, 39) + SourceIndex(0) name (Shapes.Point) -10>Emitted(14, 39) Source(19, 40) + SourceIndex(0) name (Shapes.Point) -11>Emitted(14, 40) Source(19, 41) + SourceIndex(0) name (Shapes.Point) +1->Emitted(14, 9) Source(19, 16) + SourceIndex(0) +2 >Emitted(14, 21) Source(19, 22) + SourceIndex(0) +3 >Emitted(14, 24) Source(19, 25) + SourceIndex(0) +4 >Emitted(14, 28) Source(19, 29) + SourceIndex(0) +5 >Emitted(14, 33) Source(19, 34) + SourceIndex(0) +6 >Emitted(14, 34) Source(19, 35) + SourceIndex(0) +7 >Emitted(14, 35) Source(19, 36) + SourceIndex(0) +8 >Emitted(14, 37) Source(19, 38) + SourceIndex(0) +9 >Emitted(14, 38) Source(19, 39) + SourceIndex(0) +10>Emitted(14, 39) Source(19, 40) + SourceIndex(0) +11>Emitted(14, 40) Source(19, 41) + SourceIndex(0) --- >>> return Point; 1 >^^^^^^^^ @@ -324,8 +324,8 @@ sourceFile:sourceMap-FileWithComments.ts 1 > > 2 > } -1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0) name (Shapes.Point) +1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0) +2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -346,10 +346,10 @@ sourceFile:sourceMap-FileWithComments.ts > // Static member > static origin = new Point(0, 0); > } -1 >Emitted(16, 5) Source(20, 5) + SourceIndex(0) name (Shapes.Point) -2 >Emitted(16, 6) Source(20, 6) + SourceIndex(0) name (Shapes.Point) -3 >Emitted(16, 6) Source(11, 5) + SourceIndex(0) name (Shapes) -4 >Emitted(16, 10) Source(20, 6) + SourceIndex(0) name (Shapes) +1 >Emitted(16, 5) Source(20, 5) + SourceIndex(0) +2 >Emitted(16, 6) Source(20, 6) + SourceIndex(0) +3 >Emitted(16, 6) Source(11, 5) + SourceIndex(0) +4 >Emitted(16, 10) Source(20, 6) + SourceIndex(0) --- >>> Shapes.Point = Point; 1->^^^^ @@ -370,10 +370,10 @@ sourceFile:sourceMap-FileWithComments.ts > static origin = new Point(0, 0); > } 4 > -1->Emitted(17, 5) Source(11, 18) + SourceIndex(0) name (Shapes) -2 >Emitted(17, 17) Source(11, 23) + SourceIndex(0) name (Shapes) -3 >Emitted(17, 25) Source(20, 6) + SourceIndex(0) name (Shapes) -4 >Emitted(17, 26) Source(20, 6) + SourceIndex(0) name (Shapes) +1->Emitted(17, 5) Source(11, 18) + SourceIndex(0) +2 >Emitted(17, 17) Source(11, 23) + SourceIndex(0) +3 >Emitted(17, 25) Source(20, 6) + SourceIndex(0) +4 >Emitted(17, 26) Source(20, 6) + SourceIndex(0) --- >>> // Variable comment after class 1->^^^^ @@ -382,8 +382,8 @@ sourceFile:sourceMap-FileWithComments.ts > > 2 > // Variable comment after class -1->Emitted(18, 5) Source(22, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(18, 36) Source(22, 36) + SourceIndex(0) name (Shapes) +1->Emitted(18, 5) Source(22, 5) + SourceIndex(0) +2 >Emitted(18, 36) Source(22, 36) + SourceIndex(0) --- >>> var a = 10; 1 >^^^^ @@ -400,12 +400,12 @@ sourceFile:sourceMap-FileWithComments.ts 4 > = 5 > 10 6 > ; -1 >Emitted(19, 5) Source(23, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(19, 9) Source(23, 9) + SourceIndex(0) name (Shapes) -3 >Emitted(19, 10) Source(23, 10) + SourceIndex(0) name (Shapes) -4 >Emitted(19, 13) Source(23, 13) + SourceIndex(0) name (Shapes) -5 >Emitted(19, 15) Source(23, 15) + SourceIndex(0) name (Shapes) -6 >Emitted(19, 16) Source(23, 16) + SourceIndex(0) name (Shapes) +1 >Emitted(19, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(19, 9) Source(23, 9) + SourceIndex(0) +3 >Emitted(19, 10) Source(23, 10) + SourceIndex(0) +4 >Emitted(19, 13) Source(23, 13) + SourceIndex(0) +5 >Emitted(19, 15) Source(23, 15) + SourceIndex(0) +6 >Emitted(19, 16) Source(23, 16) + SourceIndex(0) --- >>> function foo() { 1->^^^^ @@ -413,7 +413,7 @@ sourceFile:sourceMap-FileWithComments.ts 1-> > > -1->Emitted(20, 5) Source(25, 5) + SourceIndex(0) name (Shapes) +1->Emitted(20, 5) Source(25, 5) + SourceIndex(0) --- >>> } 1->^^^^ @@ -422,8 +422,8 @@ sourceFile:sourceMap-FileWithComments.ts 1->export function foo() { > 2 > } -1->Emitted(21, 5) Source(26, 5) + SourceIndex(0) name (Shapes.foo) -2 >Emitted(21, 6) Source(26, 6) + SourceIndex(0) name (Shapes.foo) +1->Emitted(21, 5) Source(26, 5) + SourceIndex(0) +2 >Emitted(21, 6) Source(26, 6) + SourceIndex(0) --- >>> Shapes.foo = foo; 1->^^^^ @@ -436,10 +436,10 @@ sourceFile:sourceMap-FileWithComments.ts 3 > () { > } 4 > -1->Emitted(22, 5) Source(25, 21) + SourceIndex(0) name (Shapes) -2 >Emitted(22, 15) Source(25, 24) + SourceIndex(0) name (Shapes) -3 >Emitted(22, 21) Source(26, 6) + SourceIndex(0) name (Shapes) -4 >Emitted(22, 22) Source(26, 6) + SourceIndex(0) name (Shapes) +1->Emitted(22, 5) Source(25, 21) + SourceIndex(0) +2 >Emitted(22, 15) Source(25, 24) + SourceIndex(0) +3 >Emitted(22, 21) Source(26, 6) + SourceIndex(0) +4 >Emitted(22, 22) Source(26, 6) + SourceIndex(0) --- >>> /** comment after function 1->^^^^ @@ -447,7 +447,7 @@ sourceFile:sourceMap-FileWithComments.ts 1-> > > -1->Emitted(23, 5) Source(28, 5) + SourceIndex(0) name (Shapes) +1->Emitted(23, 5) Source(28, 5) + SourceIndex(0) --- >>> * this is another comment >>> */ @@ -456,7 +456,7 @@ sourceFile:sourceMap-FileWithComments.ts 1->/** comment after function > * this is another comment > */ -1->Emitted(25, 7) Source(30, 7) + SourceIndex(0) name (Shapes) +1->Emitted(25, 7) Source(30, 7) + SourceIndex(0) --- >>> var b = 10; 1->^^^^ @@ -473,12 +473,12 @@ sourceFile:sourceMap-FileWithComments.ts 4 > = 5 > 10 6 > ; -1->Emitted(26, 5) Source(31, 5) + SourceIndex(0) name (Shapes) -2 >Emitted(26, 9) Source(31, 9) + SourceIndex(0) name (Shapes) -3 >Emitted(26, 10) Source(31, 10) + SourceIndex(0) name (Shapes) -4 >Emitted(26, 13) Source(31, 13) + SourceIndex(0) name (Shapes) -5 >Emitted(26, 15) Source(31, 15) + SourceIndex(0) name (Shapes) -6 >Emitted(26, 16) Source(31, 16) + SourceIndex(0) name (Shapes) +1->Emitted(26, 5) Source(31, 5) + SourceIndex(0) +2 >Emitted(26, 9) Source(31, 9) + SourceIndex(0) +3 >Emitted(26, 10) Source(31, 10) + SourceIndex(0) +4 >Emitted(26, 13) Source(31, 13) + SourceIndex(0) +5 >Emitted(26, 15) Source(31, 15) + SourceIndex(0) +6 >Emitted(26, 16) Source(31, 16) + SourceIndex(0) --- >>>})(Shapes || (Shapes = {})); 1-> @@ -520,8 +520,8 @@ sourceFile:sourceMap-FileWithComments.ts > */ > var b = 10; > } -1->Emitted(27, 1) Source(32, 1) + SourceIndex(0) name (Shapes) -2 >Emitted(27, 2) Source(32, 2) + SourceIndex(0) name (Shapes) +1->Emitted(27, 1) Source(32, 1) + SourceIndex(0) +2 >Emitted(27, 2) Source(32, 2) + SourceIndex(0) 3 >Emitted(27, 4) Source(8, 8) + SourceIndex(0) 4 >Emitted(27, 10) Source(8, 14) + SourceIndex(0) 5 >Emitted(27, 15) Source(8, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map index a590744eddf00..27ec5d732b840 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map @@ -1,2 +1,2 @@ //// [sourceMap-StringLiteralWithNewLine.js.map] -{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":["Foo"],"mappings":"AAQA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG,EAAC,CAAC;IACRA,IAAIA,CAACA,GAAGA,OAAOA,CAACA;IAChBA,IAAIA,CAACA,GAAGA;wBACYA,CAACA;IACrBA,IAAIA,CAACA,GAAGA,MAAMA,CAACA,QAAQA,CAACA;AAC5BA,CAACA,EALM,GAAG,KAAH,GAAG,QAKT"} \ No newline at end of file +{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAQA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG,EAAC,CAAC;IACR,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,KAAH,GAAG,QAKT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt index 864cf2647843d..dd0ccd40c27e8 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt @@ -68,12 +68,12 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 4 > = 5 > "test1" 6 > ; -1->Emitted(3, 5) Source(10, 5) + SourceIndex(0) name (Foo) -2 >Emitted(3, 9) Source(10, 9) + SourceIndex(0) name (Foo) -3 >Emitted(3, 10) Source(10, 10) + SourceIndex(0) name (Foo) -4 >Emitted(3, 13) Source(10, 13) + SourceIndex(0) name (Foo) -5 >Emitted(3, 20) Source(10, 20) + SourceIndex(0) name (Foo) -6 >Emitted(3, 21) Source(10, 21) + SourceIndex(0) name (Foo) +1->Emitted(3, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(10, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(10, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(10, 13) + SourceIndex(0) +5 >Emitted(3, 20) Source(10, 20) + SourceIndex(0) +6 >Emitted(3, 21) Source(10, 21) + SourceIndex(0) --- >>> var y = "test 2\ 1 >^^^^ @@ -86,10 +86,10 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 2 > var 3 > y 4 > = -1 >Emitted(4, 5) Source(11, 5) + SourceIndex(0) name (Foo) -2 >Emitted(4, 9) Source(11, 9) + SourceIndex(0) name (Foo) -3 >Emitted(4, 10) Source(11, 10) + SourceIndex(0) name (Foo) -4 >Emitted(4, 13) Source(11, 13) + SourceIndex(0) name (Foo) +1 >Emitted(4, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(4, 9) Source(11, 9) + SourceIndex(0) +3 >Emitted(4, 10) Source(11, 10) + SourceIndex(0) +4 >Emitted(4, 13) Source(11, 13) + SourceIndex(0) --- >>>isn't this a lot of fun"; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -98,8 +98,8 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 1->"test 2\ >isn't this a lot of fun" 2 > ; -1->Emitted(5, 25) Source(12, 25) + SourceIndex(0) name (Foo) -2 >Emitted(5, 26) Source(12, 26) + SourceIndex(0) name (Foo) +1->Emitted(5, 25) Source(12, 25) + SourceIndex(0) +2 >Emitted(5, 26) Source(12, 26) + SourceIndex(0) --- >>> var z = window.document; 1->^^^^ @@ -119,14 +119,14 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 6 > . 7 > document 8 > ; -1->Emitted(6, 5) Source(13, 5) + SourceIndex(0) name (Foo) -2 >Emitted(6, 9) Source(13, 9) + SourceIndex(0) name (Foo) -3 >Emitted(6, 10) Source(13, 10) + SourceIndex(0) name (Foo) -4 >Emitted(6, 13) Source(13, 13) + SourceIndex(0) name (Foo) -5 >Emitted(6, 19) Source(13, 19) + SourceIndex(0) name (Foo) -6 >Emitted(6, 20) Source(13, 20) + SourceIndex(0) name (Foo) -7 >Emitted(6, 28) Source(13, 28) + SourceIndex(0) name (Foo) -8 >Emitted(6, 29) Source(13, 29) + SourceIndex(0) name (Foo) +1->Emitted(6, 5) Source(13, 5) + SourceIndex(0) +2 >Emitted(6, 9) Source(13, 9) + SourceIndex(0) +3 >Emitted(6, 10) Source(13, 10) + SourceIndex(0) +4 >Emitted(6, 13) Source(13, 13) + SourceIndex(0) +5 >Emitted(6, 19) Source(13, 19) + SourceIndex(0) +6 >Emitted(6, 20) Source(13, 20) + SourceIndex(0) +7 >Emitted(6, 28) Source(13, 28) + SourceIndex(0) +8 >Emitted(6, 29) Source(13, 29) + SourceIndex(0) --- >>>})(Foo || (Foo = {})); 1 > @@ -150,8 +150,8 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts > isn't this a lot of fun"; > var z = window.document; > } -1 >Emitted(7, 1) Source(14, 1) + SourceIndex(0) name (Foo) -2 >Emitted(7, 2) Source(14, 2) + SourceIndex(0) name (Foo) +1 >Emitted(7, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(14, 2) + SourceIndex(0) 3 >Emitted(7, 4) Source(9, 8) + SourceIndex(0) 4 >Emitted(7, 7) Source(9, 11) + SourceIndex(0) 5 >Emitted(7, 12) Source(9, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map index 7f6604004701c..7c97d8f302f9b 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map @@ -1,2 +1,2 @@ //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map] -{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":["Q","Q.P"],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC,EAAC,CAAC;IACNA;QACIC,YAAYA;QACZA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACdA,CAACA;AACLD,CAACA,EALM,CAAC,KAAD,CAAC,QAKP"} \ No newline at end of file +{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC,EAAC,CAAC;IACN;QACI,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,KAAD,CAAC,QAKP"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt index 5413f4bbc2322..0872b1f31eb6c 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt @@ -51,7 +51,7 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 2 > ^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (Q) +1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) --- >>> // Test this 1->^^^^^^^^ @@ -59,8 +59,8 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 1->function P() { > 2 > // Test this -1->Emitted(4, 9) Source(3, 9) + SourceIndex(0) name (Q.P) -2 >Emitted(4, 21) Source(3, 21) + SourceIndex(0) name (Q.P) +1->Emitted(4, 9) Source(3, 9) + SourceIndex(0) +2 >Emitted(4, 21) Source(3, 21) + SourceIndex(0) --- >>> var a = 1; 1 >^^^^^^^^ @@ -76,12 +76,12 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 4 > = 5 > 1 6 > ; -1 >Emitted(5, 9) Source(4, 9) + SourceIndex(0) name (Q.P) -2 >Emitted(5, 13) Source(4, 13) + SourceIndex(0) name (Q.P) -3 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (Q.P) -4 >Emitted(5, 17) Source(4, 17) + SourceIndex(0) name (Q.P) -5 >Emitted(5, 18) Source(4, 18) + SourceIndex(0) name (Q.P) -6 >Emitted(5, 19) Source(4, 19) + SourceIndex(0) name (Q.P) +1 >Emitted(5, 9) Source(4, 9) + SourceIndex(0) +2 >Emitted(5, 13) Source(4, 13) + SourceIndex(0) +3 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) +4 >Emitted(5, 17) Source(4, 17) + SourceIndex(0) +5 >Emitted(5, 18) Source(4, 18) + SourceIndex(0) +6 >Emitted(5, 19) Source(4, 19) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -90,8 +90,8 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 1 > > 2 > } -1 >Emitted(6, 5) Source(5, 5) + SourceIndex(0) name (Q.P) -2 >Emitted(6, 6) Source(5, 6) + SourceIndex(0) name (Q.P) +1 >Emitted(6, 5) Source(5, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(5, 6) + SourceIndex(0) --- >>>})(Q || (Q = {})); 1-> @@ -115,8 +115,8 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t > var a = 1; > } > } -1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) name (Q) -2 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) name (Q) +1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(7, 5) Source(1, 9) + SourceIndex(0) 5 >Emitted(7, 10) Source(1, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.js.map b/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.js.map index bdfba243ab673..57f022d5ccc0e 100644 --- a/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.js.map +++ b/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.js.map @@ -1,2 +1,2 @@ //// [sourceMapForFunctionWithCommentPrecedingStatement01.js.map] -{"version":3,"file":"sourceMapForFunctionWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionWithCommentPrecedingStatement01.ts"],"names":["P"],"mappings":"AAAA;IACIA,YAAYA;IACZA,IAAIA,CAACA,GAAGA,CAACA,CAACA;AACdA,CAACA"} \ No newline at end of file +{"version":3,"file":"sourceMapForFunctionWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA;IACI,YAAY;IACZ,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.sourcemap.txt b/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.sourcemap.txt index 65037c694374c..3c16823387c9b 100644 --- a/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.sourcemap.txt +++ b/tests/baselines/reference/sourceMapForFunctionWithCommentPrecedingStatement01.sourcemap.txt @@ -20,8 +20,8 @@ sourceFile:sourceMapForFunctionWithCommentPrecedingStatement01.ts 1->function P() { > 2 > // Test this -1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (P) -2 >Emitted(2, 17) Source(2, 17) + SourceIndex(0) name (P) +1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(2, 17) Source(2, 17) + SourceIndex(0) --- >>> var a = 1; 1 >^^^^ @@ -37,12 +37,12 @@ sourceFile:sourceMapForFunctionWithCommentPrecedingStatement01.ts 4 > = 5 > 1 6 > ; -1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) name (P) -2 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (P) -3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0) name (P) -4 >Emitted(3, 13) Source(3, 13) + SourceIndex(0) name (P) -5 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) name (P) -6 >Emitted(3, 15) Source(3, 15) + SourceIndex(0) name (P) +1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(3, 13) + SourceIndex(0) +5 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) +6 >Emitted(3, 15) Source(3, 15) + SourceIndex(0) --- >>>} 1 > @@ -51,7 +51,7 @@ sourceFile:sourceMapForFunctionWithCommentPrecedingStatement01.ts 1 > > 2 >} -1 >Emitted(4, 1) Source(4, 1) + SourceIndex(0) name (P) -2 >Emitted(4, 2) Source(4, 2) + SourceIndex(0) name (P) +1 >Emitted(4, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(4, 2) Source(4, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapForFunctionWithCommentPrecedingStatement01.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map index 615db73973a74..2429a04c88b9e 100644 --- a/tests/baselines/reference/sourceMapSample.js.map +++ b/tests/baselines/reference/sourceMapSample.js.map @@ -1,2 +1,2 @@ //// [sourceMapSample.js.map] -{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAkCbA;IAlCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA;YACIC,iBAAmBA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,aAAaA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,cAAcA,QAAgBA;YAAEK,uBAA0BA;iBAA1BA,WAA0BA,CAA1BA,sBAA0BA,CAA1BA,IAA0BA;gBAA1BA,sCAA0BA;;YACtDA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAlCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAkCbA;AAADA,CAACA,EAlCM,GAAG,KAAH,GAAG,QAkCT"} \ No newline at end of file +{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAkCb;IAlCU,WAAA,GAAG,EAAC,CAAC;QACZ,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,uBAA0B;iBAA1B,WAA0B,CAA1B,sBAA0B,CAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAlCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAkCb;AAAD,CAAC,EAlCM,GAAG,KAAH,GAAG,QAkCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt index df35ff4257fe4..8ea198b312949 100644 --- a/tests/baselines/reference/sourceMapSample.sourcemap.txt +++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt @@ -112,10 +112,10 @@ sourceFile:sourceMapSample.ts > b[j].greet(); > } > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) name (Foo) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) name (Foo) -3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) name (Foo) -4 >Emitted(3, 13) Source(35, 2) + SourceIndex(0) name (Foo) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) +3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) +4 >Emitted(3, 13) Source(35, 2) + SourceIndex(0) --- >>> (function (Bar) { 1->^^^^ @@ -129,11 +129,11 @@ sourceFile:sourceMapSample.ts 3 > Bar 4 > 5 > { -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) name (Foo) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) name (Foo) -3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) name (Foo) -4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0) name (Foo) -5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0) name (Foo) +1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) +3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) +4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0) +5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0) --- >>> "use strict"; 1->^^^^^^^^ @@ -144,9 +144,9 @@ sourceFile:sourceMapSample.ts > 2 > "use strict" 3 > ; -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(5, 21) Source(2, 17) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(5, 22) Source(2, 18) + SourceIndex(0) name (Foo.Bar) +1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(5, 21) Source(2, 17) + SourceIndex(0) +3 >Emitted(5, 22) Source(2, 18) + SourceIndex(0) --- >>> var Greeter = (function () { 1->^^^^^^^^ @@ -154,7 +154,7 @@ sourceFile:sourceMapSample.ts 1-> > > -1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (Foo.Bar) +1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) --- >>> function Greeter(greeting) { 1->^^^^^^^^^^^^ @@ -165,9 +165,9 @@ sourceFile:sourceMapSample.ts > 2 > constructor(public 3 > greeting: string -1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) +2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) +3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) --- >>> this.greeting = greeting; 1->^^^^^^^^^^^^^^^^ @@ -180,11 +180,11 @@ sourceFile:sourceMapSample.ts 3 > 4 > greeting 5 > : string -1->Emitted(8, 17) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -2 >Emitted(8, 30) Source(5, 36) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -3 >Emitted(8, 33) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -4 >Emitted(8, 41) Source(5, 36) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -5 >Emitted(8, 42) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) +1->Emitted(8, 17) Source(5, 28) + SourceIndex(0) +2 >Emitted(8, 30) Source(5, 36) + SourceIndex(0) +3 >Emitted(8, 33) Source(5, 28) + SourceIndex(0) +4 >Emitted(8, 41) Source(5, 36) + SourceIndex(0) +5 >Emitted(8, 42) Source(5, 44) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^ @@ -193,8 +193,8 @@ sourceFile:sourceMapSample.ts 1 >) { > 2 > } -1 >Emitted(9, 13) Source(6, 9) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -2 >Emitted(9, 14) Source(6, 10) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) +1 >Emitted(9, 13) Source(6, 9) + SourceIndex(0) +2 >Emitted(9, 14) Source(6, 10) + SourceIndex(0) --- >>> Greeter.prototype.greet = function () { 1->^^^^^^^^^^^^ @@ -206,9 +206,9 @@ sourceFile:sourceMapSample.ts > 2 > greet 3 > -1->Emitted(10, 13) Source(8, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(10, 36) Source(8, 14) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(10, 39) Source(8, 9) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(10, 13) Source(8, 9) + SourceIndex(0) +2 >Emitted(10, 36) Source(8, 14) + SourceIndex(0) +3 >Emitted(10, 39) Source(8, 9) + SourceIndex(0) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^^^^^^^^^ @@ -234,17 +234,17 @@ sourceFile:sourceMapSample.ts 9 > + 10> "" 11> ; -1->Emitted(11, 17) Source(9, 13) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -2 >Emitted(11, 23) Source(9, 19) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -3 >Emitted(11, 24) Source(9, 20) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -4 >Emitted(11, 30) Source(9, 26) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -5 >Emitted(11, 33) Source(9, 29) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -6 >Emitted(11, 37) Source(9, 33) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -7 >Emitted(11, 38) Source(9, 34) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -8 >Emitted(11, 46) Source(9, 42) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -9 >Emitted(11, 49) Source(9, 45) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -10>Emitted(11, 56) Source(9, 52) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -11>Emitted(11, 57) Source(9, 53) + SourceIndex(0) name (Foo.Bar.Greeter.greet) +1->Emitted(11, 17) Source(9, 13) + SourceIndex(0) +2 >Emitted(11, 23) Source(9, 19) + SourceIndex(0) +3 >Emitted(11, 24) Source(9, 20) + SourceIndex(0) +4 >Emitted(11, 30) Source(9, 26) + SourceIndex(0) +5 >Emitted(11, 33) Source(9, 29) + SourceIndex(0) +6 >Emitted(11, 37) Source(9, 33) + SourceIndex(0) +7 >Emitted(11, 38) Source(9, 34) + SourceIndex(0) +8 >Emitted(11, 46) Source(9, 42) + SourceIndex(0) +9 >Emitted(11, 49) Source(9, 45) + SourceIndex(0) +10>Emitted(11, 56) Source(9, 52) + SourceIndex(0) +11>Emitted(11, 57) Source(9, 53) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^ @@ -253,8 +253,8 @@ sourceFile:sourceMapSample.ts 1 > > 2 > } -1 >Emitted(12, 13) Source(10, 9) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -2 >Emitted(12, 14) Source(10, 10) + SourceIndex(0) name (Foo.Bar.Greeter.greet) +1 >Emitted(12, 13) Source(10, 9) + SourceIndex(0) +2 >Emitted(12, 14) Source(10, 10) + SourceIndex(0) --- >>> return Greeter; 1->^^^^^^^^^^^^ @@ -262,8 +262,8 @@ sourceFile:sourceMapSample.ts 1-> > 2 > } -1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) +2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^ @@ -282,10 +282,10 @@ sourceFile:sourceMapSample.ts > return "

" + this.greeting + "

"; > } > } -1 >Emitted(14, 9) Source(11, 5) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(14, 10) Source(11, 6) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(14, 10) Source(4, 5) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(14, 14) Source(11, 6) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(14, 9) Source(11, 5) + SourceIndex(0) +2 >Emitted(14, 10) Source(11, 6) + SourceIndex(0) +3 >Emitted(14, 10) Source(4, 5) + SourceIndex(0) +4 >Emitted(14, 14) Source(11, 6) + SourceIndex(0) --- >>> function foo(greeting) { 1->^^^^^^^^ @@ -298,9 +298,9 @@ sourceFile:sourceMapSample.ts > 2 > function foo( 3 > greeting: string -1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) +1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) +2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) +3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) --- >>> return new Greeter(greeting); 1->^^^^^^^^^^^^ @@ -322,15 +322,15 @@ sourceFile:sourceMapSample.ts 7 > greeting 8 > ) 9 > ; -1->Emitted(16, 13) Source(15, 9) + SourceIndex(0) name (Foo.Bar.foo) -2 >Emitted(16, 19) Source(15, 15) + SourceIndex(0) name (Foo.Bar.foo) -3 >Emitted(16, 20) Source(15, 16) + SourceIndex(0) name (Foo.Bar.foo) -4 >Emitted(16, 24) Source(15, 20) + SourceIndex(0) name (Foo.Bar.foo) -5 >Emitted(16, 31) Source(15, 27) + SourceIndex(0) name (Foo.Bar.foo) -6 >Emitted(16, 32) Source(15, 28) + SourceIndex(0) name (Foo.Bar.foo) -7 >Emitted(16, 40) Source(15, 36) + SourceIndex(0) name (Foo.Bar.foo) -8 >Emitted(16, 41) Source(15, 37) + SourceIndex(0) name (Foo.Bar.foo) -9 >Emitted(16, 42) Source(15, 38) + SourceIndex(0) name (Foo.Bar.foo) +1->Emitted(16, 13) Source(15, 9) + SourceIndex(0) +2 >Emitted(16, 19) Source(15, 15) + SourceIndex(0) +3 >Emitted(16, 20) Source(15, 16) + SourceIndex(0) +4 >Emitted(16, 24) Source(15, 20) + SourceIndex(0) +5 >Emitted(16, 31) Source(15, 27) + SourceIndex(0) +6 >Emitted(16, 32) Source(15, 28) + SourceIndex(0) +7 >Emitted(16, 40) Source(15, 36) + SourceIndex(0) +8 >Emitted(16, 41) Source(15, 37) + SourceIndex(0) +9 >Emitted(16, 42) Source(15, 38) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -339,8 +339,8 @@ sourceFile:sourceMapSample.ts 1 > > 2 > } -1 >Emitted(17, 9) Source(16, 5) + SourceIndex(0) name (Foo.Bar.foo) -2 >Emitted(17, 10) Source(16, 6) + SourceIndex(0) name (Foo.Bar.foo) +1 >Emitted(17, 9) Source(16, 5) + SourceIndex(0) +2 >Emitted(17, 10) Source(16, 6) + SourceIndex(0) --- >>> var greeter = new Greeter("Hello, world!"); 1->^^^^^^^^ @@ -365,16 +365,16 @@ sourceFile:sourceMapSample.ts 8 > "Hello, world!" 9 > ) 10> ; -1->Emitted(18, 9) Source(18, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(18, 13) Source(18, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(18, 20) Source(18, 16) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(18, 23) Source(18, 19) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(18, 27) Source(18, 23) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(18, 34) Source(18, 30) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(18, 35) Source(18, 31) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(18, 50) Source(18, 46) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(18, 51) Source(18, 47) + SourceIndex(0) name (Foo.Bar) -10>Emitted(18, 52) Source(18, 48) + SourceIndex(0) name (Foo.Bar) +1->Emitted(18, 9) Source(18, 5) + SourceIndex(0) +2 >Emitted(18, 13) Source(18, 9) + SourceIndex(0) +3 >Emitted(18, 20) Source(18, 16) + SourceIndex(0) +4 >Emitted(18, 23) Source(18, 19) + SourceIndex(0) +5 >Emitted(18, 27) Source(18, 23) + SourceIndex(0) +6 >Emitted(18, 34) Source(18, 30) + SourceIndex(0) +7 >Emitted(18, 35) Source(18, 31) + SourceIndex(0) +8 >Emitted(18, 50) Source(18, 46) + SourceIndex(0) +9 >Emitted(18, 51) Source(18, 47) + SourceIndex(0) +10>Emitted(18, 52) Source(18, 48) + SourceIndex(0) --- >>> var str = greeter.greet(); 1 >^^^^^^^^ @@ -396,15 +396,15 @@ sourceFile:sourceMapSample.ts 7 > greet 8 > () 9 > ; -1 >Emitted(19, 9) Source(19, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(19, 13) Source(19, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(19, 16) Source(19, 12) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(19, 19) Source(19, 15) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(19, 26) Source(19, 22) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(19, 27) Source(19, 23) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(19, 32) Source(19, 28) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(19, 34) Source(19, 30) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(19, 35) Source(19, 31) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(19, 9) Source(19, 5) + SourceIndex(0) +2 >Emitted(19, 13) Source(19, 9) + SourceIndex(0) +3 >Emitted(19, 16) Source(19, 12) + SourceIndex(0) +4 >Emitted(19, 19) Source(19, 15) + SourceIndex(0) +5 >Emitted(19, 26) Source(19, 22) + SourceIndex(0) +6 >Emitted(19, 27) Source(19, 23) + SourceIndex(0) +7 >Emitted(19, 32) Source(19, 28) + SourceIndex(0) +8 >Emitted(19, 34) Source(19, 30) + SourceIndex(0) +9 >Emitted(19, 35) Source(19, 31) + SourceIndex(0) --- >>> function foo2(greeting) { 1 >^^^^^^^^ @@ -416,9 +416,9 @@ sourceFile:sourceMapSample.ts > 2 > function foo2( 3 > greeting: string -1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) +2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) +3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) --- >>> var restGreetings = []; 1->^^^^^^^^^^^^ @@ -426,8 +426,8 @@ sourceFile:sourceMapSample.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->, 2 > ...restGreetings: string[] -1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(21, 36) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) +2 >Emitted(21, 36) Source(21, 63) + SourceIndex(0) --- >>> for (var _i = 1; _i < arguments.length; _i++) { 1->^^^^^^^^^^^^^^^^^ @@ -442,20 +442,20 @@ sourceFile:sourceMapSample.ts 4 > ...restGreetings: string[] 5 > 6 > ...restGreetings: string[] -1->Emitted(22, 18) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(22, 29) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(22, 52) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(22, 57) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(22, 18) Source(21, 37) + SourceIndex(0) +2 >Emitted(22, 29) Source(21, 63) + SourceIndex(0) +3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0) +4 >Emitted(22, 52) Source(21, 63) + SourceIndex(0) +5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0) +6 >Emitted(22, 57) Source(21, 63) + SourceIndex(0) --- >>> restGreetings[_i - 1] = arguments[_i]; 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 > ...restGreetings: string[] -1 >Emitted(23, 17) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(23, 55) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(23, 17) Source(21, 37) + SourceIndex(0) +2 >Emitted(23, 55) Source(21, 63) + SourceIndex(0) --- >>> } >>> var greeters = []; @@ -473,12 +473,12 @@ sourceFile:sourceMapSample.ts 4 > : Greeter[] = 5 > [] 6 > ; -1 >Emitted(25, 13) Source(22, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(25, 17) Source(22, 13) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(25, 25) Source(22, 21) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(25, 28) Source(22, 35) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(25, 30) Source(22, 37) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(25, 31) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(25, 13) Source(22, 9) + SourceIndex(0) +2 >Emitted(25, 17) Source(22, 13) + SourceIndex(0) +3 >Emitted(25, 25) Source(22, 21) + SourceIndex(0) +4 >Emitted(25, 28) Source(22, 35) + SourceIndex(0) +5 >Emitted(25, 30) Source(22, 37) + SourceIndex(0) +6 >Emitted(25, 31) Source(22, 38) + SourceIndex(0) --- >>> greeters[0] = new Greeter(greeting); 1->^^^^^^^^^^^^ @@ -507,18 +507,18 @@ sourceFile:sourceMapSample.ts 10> greeting 11> ) 12> ; -1->Emitted(26, 13) Source(23, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(26, 21) Source(23, 17) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(26, 22) Source(23, 18) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(26, 23) Source(23, 19) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(26, 24) Source(23, 20) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(26, 27) Source(23, 23) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(26, 31) Source(23, 27) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(26, 38) Source(23, 34) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(26, 39) Source(23, 35) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(26, 47) Source(23, 43) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(26, 48) Source(23, 44) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(26, 49) Source(23, 45) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(26, 13) Source(23, 9) + SourceIndex(0) +2 >Emitted(26, 21) Source(23, 17) + SourceIndex(0) +3 >Emitted(26, 22) Source(23, 18) + SourceIndex(0) +4 >Emitted(26, 23) Source(23, 19) + SourceIndex(0) +5 >Emitted(26, 24) Source(23, 20) + SourceIndex(0) +6 >Emitted(26, 27) Source(23, 23) + SourceIndex(0) +7 >Emitted(26, 31) Source(23, 27) + SourceIndex(0) +8 >Emitted(26, 38) Source(23, 34) + SourceIndex(0) +9 >Emitted(26, 39) Source(23, 35) + SourceIndex(0) +10>Emitted(26, 47) Source(23, 43) + SourceIndex(0) +11>Emitted(26, 48) Source(23, 44) + SourceIndex(0) +12>Emitted(26, 49) Source(23, 45) + SourceIndex(0) --- >>> for (var i = 0; i < restGreetings.length; i++) { 1->^^^^^^^^^^^^ @@ -563,26 +563,26 @@ sourceFile:sourceMapSample.ts 18> ++ 19> ) 20> { -1->Emitted(27, 13) Source(24, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(27, 16) Source(24, 12) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(27, 17) Source(24, 13) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(27, 18) Source(24, 14) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(27, 21) Source(24, 17) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(27, 22) Source(24, 18) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(27, 23) Source(24, 19) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(27, 26) Source(24, 22) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(27, 27) Source(24, 23) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(27, 29) Source(24, 25) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(27, 30) Source(24, 26) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(27, 33) Source(24, 29) + SourceIndex(0) name (Foo.Bar.foo2) -13>Emitted(27, 46) Source(24, 42) + SourceIndex(0) name (Foo.Bar.foo2) -14>Emitted(27, 47) Source(24, 43) + SourceIndex(0) name (Foo.Bar.foo2) -15>Emitted(27, 53) Source(24, 49) + SourceIndex(0) name (Foo.Bar.foo2) -16>Emitted(27, 55) Source(24, 51) + SourceIndex(0) name (Foo.Bar.foo2) -17>Emitted(27, 56) Source(24, 52) + SourceIndex(0) name (Foo.Bar.foo2) -18>Emitted(27, 58) Source(24, 54) + SourceIndex(0) name (Foo.Bar.foo2) -19>Emitted(27, 60) Source(24, 56) + SourceIndex(0) name (Foo.Bar.foo2) -20>Emitted(27, 61) Source(24, 57) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(27, 13) Source(24, 9) + SourceIndex(0) +2 >Emitted(27, 16) Source(24, 12) + SourceIndex(0) +3 >Emitted(27, 17) Source(24, 13) + SourceIndex(0) +4 >Emitted(27, 18) Source(24, 14) + SourceIndex(0) +5 >Emitted(27, 21) Source(24, 17) + SourceIndex(0) +6 >Emitted(27, 22) Source(24, 18) + SourceIndex(0) +7 >Emitted(27, 23) Source(24, 19) + SourceIndex(0) +8 >Emitted(27, 26) Source(24, 22) + SourceIndex(0) +9 >Emitted(27, 27) Source(24, 23) + SourceIndex(0) +10>Emitted(27, 29) Source(24, 25) + SourceIndex(0) +11>Emitted(27, 30) Source(24, 26) + SourceIndex(0) +12>Emitted(27, 33) Source(24, 29) + SourceIndex(0) +13>Emitted(27, 46) Source(24, 42) + SourceIndex(0) +14>Emitted(27, 47) Source(24, 43) + SourceIndex(0) +15>Emitted(27, 53) Source(24, 49) + SourceIndex(0) +16>Emitted(27, 55) Source(24, 51) + SourceIndex(0) +17>Emitted(27, 56) Source(24, 52) + SourceIndex(0) +18>Emitted(27, 58) Source(24, 54) + SourceIndex(0) +19>Emitted(27, 60) Source(24, 56) + SourceIndex(0) +20>Emitted(27, 61) Source(24, 57) + SourceIndex(0) --- >>> greeters.push(new Greeter(restGreetings[i])); 1->^^^^^^^^^^^^^^^^ @@ -616,21 +616,21 @@ sourceFile:sourceMapSample.ts 13> ) 14> ) 15> ; -1->Emitted(28, 17) Source(25, 13) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(28, 25) Source(25, 21) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(28, 26) Source(25, 22) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(28, 30) Source(25, 26) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(28, 31) Source(25, 27) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(28, 35) Source(25, 31) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(28, 42) Source(25, 38) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(28, 43) Source(25, 39) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(28, 56) Source(25, 52) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(28, 57) Source(25, 53) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(28, 58) Source(25, 54) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(28, 59) Source(25, 55) + SourceIndex(0) name (Foo.Bar.foo2) -13>Emitted(28, 60) Source(25, 56) + SourceIndex(0) name (Foo.Bar.foo2) -14>Emitted(28, 61) Source(25, 57) + SourceIndex(0) name (Foo.Bar.foo2) -15>Emitted(28, 62) Source(25, 58) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(28, 17) Source(25, 13) + SourceIndex(0) +2 >Emitted(28, 25) Source(25, 21) + SourceIndex(0) +3 >Emitted(28, 26) Source(25, 22) + SourceIndex(0) +4 >Emitted(28, 30) Source(25, 26) + SourceIndex(0) +5 >Emitted(28, 31) Source(25, 27) + SourceIndex(0) +6 >Emitted(28, 35) Source(25, 31) + SourceIndex(0) +7 >Emitted(28, 42) Source(25, 38) + SourceIndex(0) +8 >Emitted(28, 43) Source(25, 39) + SourceIndex(0) +9 >Emitted(28, 56) Source(25, 52) + SourceIndex(0) +10>Emitted(28, 57) Source(25, 53) + SourceIndex(0) +11>Emitted(28, 58) Source(25, 54) + SourceIndex(0) +12>Emitted(28, 59) Source(25, 55) + SourceIndex(0) +13>Emitted(28, 60) Source(25, 56) + SourceIndex(0) +14>Emitted(28, 61) Source(25, 57) + SourceIndex(0) +15>Emitted(28, 62) Source(25, 58) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^ @@ -639,8 +639,8 @@ sourceFile:sourceMapSample.ts 1 > > 2 > } -1 >Emitted(29, 13) Source(26, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(29, 14) Source(26, 10) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(29, 13) Source(26, 9) + SourceIndex(0) +2 >Emitted(29, 14) Source(26, 10) + SourceIndex(0) --- >>> return greeters; 1->^^^^^^^^^^^^ @@ -655,11 +655,11 @@ sourceFile:sourceMapSample.ts 3 > 4 > greeters 5 > ; -1->Emitted(30, 13) Source(28, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(30, 19) Source(28, 15) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(30, 20) Source(28, 16) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(30, 28) Source(28, 24) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(30, 29) Source(28, 25) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(30, 13) Source(28, 9) + SourceIndex(0) +2 >Emitted(30, 19) Source(28, 15) + SourceIndex(0) +3 >Emitted(30, 20) Source(28, 16) + SourceIndex(0) +4 >Emitted(30, 28) Source(28, 24) + SourceIndex(0) +5 >Emitted(30, 29) Source(28, 25) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -668,8 +668,8 @@ sourceFile:sourceMapSample.ts 1 > > 2 > } -1 >Emitted(31, 9) Source(29, 5) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(31, 10) Source(29, 6) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(31, 9) Source(29, 5) + SourceIndex(0) +2 >Emitted(31, 10) Source(29, 6) + SourceIndex(0) --- >>> var b = foo2("Hello", "World", "!"); 1->^^^^^^^^ @@ -701,19 +701,19 @@ sourceFile:sourceMapSample.ts 11> "!" 12> ) 13> ; -1->Emitted(32, 9) Source(31, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(32, 13) Source(31, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(32, 14) Source(31, 10) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(32, 17) Source(31, 13) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(32, 21) Source(31, 17) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(32, 22) Source(31, 18) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(32, 29) Source(31, 25) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(32, 31) Source(31, 27) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(32, 38) Source(31, 34) + SourceIndex(0) name (Foo.Bar) -10>Emitted(32, 40) Source(31, 36) + SourceIndex(0) name (Foo.Bar) -11>Emitted(32, 43) Source(31, 39) + SourceIndex(0) name (Foo.Bar) -12>Emitted(32, 44) Source(31, 40) + SourceIndex(0) name (Foo.Bar) -13>Emitted(32, 45) Source(31, 41) + SourceIndex(0) name (Foo.Bar) +1->Emitted(32, 9) Source(31, 5) + SourceIndex(0) +2 >Emitted(32, 13) Source(31, 9) + SourceIndex(0) +3 >Emitted(32, 14) Source(31, 10) + SourceIndex(0) +4 >Emitted(32, 17) Source(31, 13) + SourceIndex(0) +5 >Emitted(32, 21) Source(31, 17) + SourceIndex(0) +6 >Emitted(32, 22) Source(31, 18) + SourceIndex(0) +7 >Emitted(32, 29) Source(31, 25) + SourceIndex(0) +8 >Emitted(32, 31) Source(31, 27) + SourceIndex(0) +9 >Emitted(32, 38) Source(31, 34) + SourceIndex(0) +10>Emitted(32, 40) Source(31, 36) + SourceIndex(0) +11>Emitted(32, 43) Source(31, 39) + SourceIndex(0) +12>Emitted(32, 44) Source(31, 40) + SourceIndex(0) +13>Emitted(32, 45) Source(31, 41) + SourceIndex(0) --- >>> for (var j = 0; j < b.length; j++) { 1->^^^^^^^^ @@ -757,26 +757,26 @@ sourceFile:sourceMapSample.ts 18> ++ 19> ) 20> { -1->Emitted(33, 9) Source(32, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(33, 12) Source(32, 8) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(33, 13) Source(32, 9) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(33, 14) Source(32, 10) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(33, 17) Source(32, 13) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(33, 18) Source(32, 14) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(33, 19) Source(32, 15) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(33, 22) Source(32, 18) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(33, 23) Source(32, 19) + SourceIndex(0) name (Foo.Bar) -10>Emitted(33, 25) Source(32, 21) + SourceIndex(0) name (Foo.Bar) -11>Emitted(33, 26) Source(32, 22) + SourceIndex(0) name (Foo.Bar) -12>Emitted(33, 29) Source(32, 25) + SourceIndex(0) name (Foo.Bar) -13>Emitted(33, 30) Source(32, 26) + SourceIndex(0) name (Foo.Bar) -14>Emitted(33, 31) Source(32, 27) + SourceIndex(0) name (Foo.Bar) -15>Emitted(33, 37) Source(32, 33) + SourceIndex(0) name (Foo.Bar) -16>Emitted(33, 39) Source(32, 35) + SourceIndex(0) name (Foo.Bar) -17>Emitted(33, 40) Source(32, 36) + SourceIndex(0) name (Foo.Bar) -18>Emitted(33, 42) Source(32, 38) + SourceIndex(0) name (Foo.Bar) -19>Emitted(33, 44) Source(32, 40) + SourceIndex(0) name (Foo.Bar) -20>Emitted(33, 45) Source(32, 41) + SourceIndex(0) name (Foo.Bar) +1->Emitted(33, 9) Source(32, 5) + SourceIndex(0) +2 >Emitted(33, 12) Source(32, 8) + SourceIndex(0) +3 >Emitted(33, 13) Source(32, 9) + SourceIndex(0) +4 >Emitted(33, 14) Source(32, 10) + SourceIndex(0) +5 >Emitted(33, 17) Source(32, 13) + SourceIndex(0) +6 >Emitted(33, 18) Source(32, 14) + SourceIndex(0) +7 >Emitted(33, 19) Source(32, 15) + SourceIndex(0) +8 >Emitted(33, 22) Source(32, 18) + SourceIndex(0) +9 >Emitted(33, 23) Source(32, 19) + SourceIndex(0) +10>Emitted(33, 25) Source(32, 21) + SourceIndex(0) +11>Emitted(33, 26) Source(32, 22) + SourceIndex(0) +12>Emitted(33, 29) Source(32, 25) + SourceIndex(0) +13>Emitted(33, 30) Source(32, 26) + SourceIndex(0) +14>Emitted(33, 31) Source(32, 27) + SourceIndex(0) +15>Emitted(33, 37) Source(32, 33) + SourceIndex(0) +16>Emitted(33, 39) Source(32, 35) + SourceIndex(0) +17>Emitted(33, 40) Source(32, 36) + SourceIndex(0) +18>Emitted(33, 42) Source(32, 38) + SourceIndex(0) +19>Emitted(33, 44) Source(32, 40) + SourceIndex(0) +20>Emitted(33, 45) Source(32, 41) + SourceIndex(0) --- >>> b[j].greet(); 1 >^^^^^^^^^^^^ @@ -798,15 +798,15 @@ sourceFile:sourceMapSample.ts 7 > greet 8 > () 9 > ; -1 >Emitted(34, 13) Source(33, 9) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(34, 14) Source(33, 10) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(34, 15) Source(33, 11) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(34, 16) Source(33, 12) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(34, 17) Source(33, 13) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(34, 18) Source(33, 14) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(34, 23) Source(33, 19) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(34, 25) Source(33, 21) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(34, 26) Source(33, 22) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(34, 13) Source(33, 9) + SourceIndex(0) +2 >Emitted(34, 14) Source(33, 10) + SourceIndex(0) +3 >Emitted(34, 15) Source(33, 11) + SourceIndex(0) +4 >Emitted(34, 16) Source(33, 12) + SourceIndex(0) +5 >Emitted(34, 17) Source(33, 13) + SourceIndex(0) +6 >Emitted(34, 18) Source(33, 14) + SourceIndex(0) +7 >Emitted(34, 23) Source(33, 19) + SourceIndex(0) +8 >Emitted(34, 25) Source(33, 21) + SourceIndex(0) +9 >Emitted(34, 26) Source(33, 22) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -815,8 +815,8 @@ sourceFile:sourceMapSample.ts 1 > > 2 > } -1 >Emitted(35, 9) Source(34, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(35, 10) Source(34, 6) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(35, 9) Source(34, 5) + SourceIndex(0) +2 >Emitted(35, 10) Source(34, 6) + SourceIndex(0) --- >>> })(Bar = Foo.Bar || (Foo.Bar = {})); 1->^^^^ @@ -872,15 +872,15 @@ sourceFile:sourceMapSample.ts > b[j].greet(); > } > } -1->Emitted(36, 5) Source(35, 1) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(36, 6) Source(35, 2) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(36, 8) Source(1, 12) + SourceIndex(0) name (Foo) -4 >Emitted(36, 11) Source(1, 15) + SourceIndex(0) name (Foo) -5 >Emitted(36, 14) Source(1, 12) + SourceIndex(0) name (Foo) -6 >Emitted(36, 21) Source(1, 15) + SourceIndex(0) name (Foo) -7 >Emitted(36, 26) Source(1, 12) + SourceIndex(0) name (Foo) -8 >Emitted(36, 33) Source(1, 15) + SourceIndex(0) name (Foo) -9 >Emitted(36, 41) Source(35, 2) + SourceIndex(0) name (Foo) +1->Emitted(36, 5) Source(35, 1) + SourceIndex(0) +2 >Emitted(36, 6) Source(35, 2) + SourceIndex(0) +3 >Emitted(36, 8) Source(1, 12) + SourceIndex(0) +4 >Emitted(36, 11) Source(1, 15) + SourceIndex(0) +5 >Emitted(36, 14) Source(1, 12) + SourceIndex(0) +6 >Emitted(36, 21) Source(1, 15) + SourceIndex(0) +7 >Emitted(36, 26) Source(1, 12) + SourceIndex(0) +8 >Emitted(36, 33) Source(1, 15) + SourceIndex(0) +9 >Emitted(36, 41) Source(35, 2) + SourceIndex(0) --- >>>})(Foo || (Foo = {})); 1 > @@ -932,8 +932,8 @@ sourceFile:sourceMapSample.ts > b[j].greet(); > } > } -1 >Emitted(37, 1) Source(35, 1) + SourceIndex(0) name (Foo) -2 >Emitted(37, 2) Source(35, 2) + SourceIndex(0) name (Foo) +1 >Emitted(37, 1) Source(35, 1) + SourceIndex(0) +2 >Emitted(37, 2) Source(35, 2) + SourceIndex(0) 3 >Emitted(37, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(37, 7) Source(1, 11) + SourceIndex(0) 5 >Emitted(37, 12) Source(1, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map index 8693cf5d0fe67..6176f13bc517e 100644 --- a/tests/baselines/reference/sourceMapValidationClass.js.map +++ b/tests/baselines/reference/sourceMapValidationClass.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClass.js.map] -{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA;IACIA,iBAAmBA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":[],"mappings":"AAAA;IACI,iBAAmB,QAAgB;QAAE,WAAc;aAAd,WAAc,CAAd,sBAAc,CAAd,IAAc;YAAd,0BAAc;;QAAhC,aAAQ,GAAR,QAAQ,CAAQ;QAM3B,OAAE,GAAW,EAAE,CAAC;IALxB,CAAC;IACD,uBAAK,GAAL;QACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAGO,oBAAE,GAAV;QACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD,sBAAI,8BAAS;aAAb;YACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aACD,UAAc,SAAiB;YAC3B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAHA;IAIL,cAAC;AAAD,CAAC,AAjBD,IAiBC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt index 0e019b487bbca..3b726492c8fd4 100644 --- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt @@ -22,9 +22,9 @@ sourceFile:sourceMapValidationClass.ts > 2 > constructor(public 3 > greeting: string -1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) name (Greeter) -3 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) name (Greeter) +1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) +3 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) --- >>> var b = []; 1 >^^^^^^^^ @@ -32,8 +32,8 @@ sourceFile:sourceMapValidationClass.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >, 2 > ...b: string[] -1 >Emitted(3, 9) Source(2, 42) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(3, 9) Source(2, 42) + SourceIndex(0) +2 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) --- >>> for (var _i = 1; _i < arguments.length; _i++) { 1->^^^^^^^^^^^^^ @@ -48,20 +48,20 @@ sourceFile:sourceMapValidationClass.ts 4 > ...b: string[] 5 > 6 > ...b: string[] -1->Emitted(4, 14) Source(2, 42) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(4, 25) Source(2, 56) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(4, 26) Source(2, 42) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(4, 48) Source(2, 56) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(4, 49) Source(2, 42) + SourceIndex(0) name (Greeter.constructor) -6 >Emitted(4, 53) Source(2, 56) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(4, 14) Source(2, 42) + SourceIndex(0) +2 >Emitted(4, 25) Source(2, 56) + SourceIndex(0) +3 >Emitted(4, 26) Source(2, 42) + SourceIndex(0) +4 >Emitted(4, 48) Source(2, 56) + SourceIndex(0) +5 >Emitted(4, 49) Source(2, 42) + SourceIndex(0) +6 >Emitted(4, 53) Source(2, 56) + SourceIndex(0) --- >>> b[_i - 1] = arguments[_i]; 1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 > ...b: string[] -1 >Emitted(5, 13) Source(2, 42) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(5, 39) Source(2, 56) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(5, 13) Source(2, 42) + SourceIndex(0) +2 >Emitted(5, 39) Source(2, 56) + SourceIndex(0) --- >>> } >>> this.greeting = greeting; @@ -75,11 +75,11 @@ sourceFile:sourceMapValidationClass.ts 3 > 4 > greeting 5 > : string -1 >Emitted(7, 9) Source(2, 24) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(7, 22) Source(2, 32) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(7, 25) Source(2, 24) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(7, 33) Source(2, 32) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(7, 34) Source(2, 40) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(7, 9) Source(2, 24) + SourceIndex(0) +2 >Emitted(7, 22) Source(2, 32) + SourceIndex(0) +3 >Emitted(7, 25) Source(2, 24) + SourceIndex(0) +4 >Emitted(7, 33) Source(2, 32) + SourceIndex(0) +5 >Emitted(7, 34) Source(2, 40) + SourceIndex(0) --- >>> this.x1 = 10; 1 >^^^^^^^^ @@ -98,11 +98,11 @@ sourceFile:sourceMapValidationClass.ts 3 > : number = 4 > 10 5 > ; -1 >Emitted(8, 9) Source(8, 13) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(8, 16) Source(8, 15) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(8, 19) Source(8, 26) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(8, 21) Source(8, 28) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(8, 22) Source(8, 29) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(8, 9) Source(8, 13) + SourceIndex(0) +2 >Emitted(8, 16) Source(8, 15) + SourceIndex(0) +3 >Emitted(8, 19) Source(8, 26) + SourceIndex(0) +4 >Emitted(8, 21) Source(8, 28) + SourceIndex(0) +5 >Emitted(8, 22) Source(8, 29) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -110,8 +110,8 @@ sourceFile:sourceMapValidationClass.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 > } -1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0) --- >>> Greeter.prototype.greet = function () { 1->^^^^ @@ -122,9 +122,9 @@ sourceFile:sourceMapValidationClass.ts > 2 > greet 3 > -1->Emitted(10, 5) Source(4, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(10, 28) Source(4, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(10, 31) Source(4, 5) + SourceIndex(0) name (Greeter) +1->Emitted(10, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(10, 28) Source(4, 10) + SourceIndex(0) +3 >Emitted(10, 31) Source(4, 5) + SourceIndex(0) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^ @@ -150,17 +150,17 @@ sourceFile:sourceMapValidationClass.ts 9 > + 10> "" 11> ; -1->Emitted(11, 9) Source(5, 9) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(11, 15) Source(5, 15) + SourceIndex(0) name (Greeter.greet) -3 >Emitted(11, 16) Source(5, 16) + SourceIndex(0) name (Greeter.greet) -4 >Emitted(11, 22) Source(5, 22) + SourceIndex(0) name (Greeter.greet) -5 >Emitted(11, 25) Source(5, 25) + SourceIndex(0) name (Greeter.greet) -6 >Emitted(11, 29) Source(5, 29) + SourceIndex(0) name (Greeter.greet) -7 >Emitted(11, 30) Source(5, 30) + SourceIndex(0) name (Greeter.greet) -8 >Emitted(11, 38) Source(5, 38) + SourceIndex(0) name (Greeter.greet) -9 >Emitted(11, 41) Source(5, 41) + SourceIndex(0) name (Greeter.greet) -10>Emitted(11, 48) Source(5, 48) + SourceIndex(0) name (Greeter.greet) -11>Emitted(11, 49) Source(5, 49) + SourceIndex(0) name (Greeter.greet) +1->Emitted(11, 9) Source(5, 9) + SourceIndex(0) +2 >Emitted(11, 15) Source(5, 15) + SourceIndex(0) +3 >Emitted(11, 16) Source(5, 16) + SourceIndex(0) +4 >Emitted(11, 22) Source(5, 22) + SourceIndex(0) +5 >Emitted(11, 25) Source(5, 25) + SourceIndex(0) +6 >Emitted(11, 29) Source(5, 29) + SourceIndex(0) +7 >Emitted(11, 30) Source(5, 30) + SourceIndex(0) +8 >Emitted(11, 38) Source(5, 38) + SourceIndex(0) +9 >Emitted(11, 41) Source(5, 41) + SourceIndex(0) +10>Emitted(11, 48) Source(5, 48) + SourceIndex(0) +11>Emitted(11, 49) Source(5, 49) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -169,8 +169,8 @@ sourceFile:sourceMapValidationClass.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(6, 5) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(12, 6) Source(6, 6) + SourceIndex(0) name (Greeter.greet) +1 >Emitted(12, 5) Source(6, 5) + SourceIndex(0) +2 >Emitted(12, 6) Source(6, 6) + SourceIndex(0) --- >>> Greeter.prototype.fn = function () { 1->^^^^ @@ -183,9 +183,9 @@ sourceFile:sourceMapValidationClass.ts > private 2 > fn 3 > -1->Emitted(13, 5) Source(9, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(13, 25) Source(9, 15) + SourceIndex(0) name (Greeter) -3 >Emitted(13, 28) Source(9, 5) + SourceIndex(0) name (Greeter) +1->Emitted(13, 5) Source(9, 13) + SourceIndex(0) +2 >Emitted(13, 25) Source(9, 15) + SourceIndex(0) +3 >Emitted(13, 28) Source(9, 5) + SourceIndex(0) --- >>> return this.greeting; 1->^^^^^^^^ @@ -203,13 +203,13 @@ sourceFile:sourceMapValidationClass.ts 5 > . 6 > greeting 7 > ; -1->Emitted(14, 9) Source(10, 9) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(14, 15) Source(10, 15) + SourceIndex(0) name (Greeter.fn) -3 >Emitted(14, 16) Source(10, 16) + SourceIndex(0) name (Greeter.fn) -4 >Emitted(14, 20) Source(10, 20) + SourceIndex(0) name (Greeter.fn) -5 >Emitted(14, 21) Source(10, 21) + SourceIndex(0) name (Greeter.fn) -6 >Emitted(14, 29) Source(10, 29) + SourceIndex(0) name (Greeter.fn) -7 >Emitted(14, 30) Source(10, 30) + SourceIndex(0) name (Greeter.fn) +1->Emitted(14, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(14, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(14, 20) Source(10, 20) + SourceIndex(0) +5 >Emitted(14, 21) Source(10, 21) + SourceIndex(0) +6 >Emitted(14, 29) Source(10, 29) + SourceIndex(0) +7 >Emitted(14, 30) Source(10, 30) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -218,8 +218,8 @@ sourceFile:sourceMapValidationClass.ts 1 > > 2 > } -1 >Emitted(15, 5) Source(11, 5) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(15, 6) Source(11, 6) + SourceIndex(0) name (Greeter.fn) +1 >Emitted(15, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(15, 6) Source(11, 6) + SourceIndex(0) --- >>> Object.defineProperty(Greeter.prototype, "greetings", { 1->^^^^ @@ -229,15 +229,15 @@ sourceFile:sourceMapValidationClass.ts > 2 > get 3 > greetings -1->Emitted(16, 5) Source(12, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(16, 27) Source(12, 9) + SourceIndex(0) name (Greeter) -3 >Emitted(16, 57) Source(12, 18) + SourceIndex(0) name (Greeter) +1->Emitted(16, 5) Source(12, 5) + SourceIndex(0) +2 >Emitted(16, 27) Source(12, 9) + SourceIndex(0) +3 >Emitted(16, 57) Source(12, 18) + SourceIndex(0) --- >>> get: function () { 1 >^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(17, 14) Source(12, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(17, 14) Source(12, 5) + SourceIndex(0) --- >>> return this.greeting; 1->^^^^^^^^^^^^ @@ -255,13 +255,13 @@ sourceFile:sourceMapValidationClass.ts 5 > . 6 > greeting 7 > ; -1->Emitted(18, 13) Source(13, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(18, 19) Source(13, 15) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(18, 20) Source(13, 16) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(18, 24) Source(13, 20) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(18, 25) Source(13, 21) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(18, 33) Source(13, 29) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(18, 34) Source(13, 30) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(18, 13) Source(13, 9) + SourceIndex(0) +2 >Emitted(18, 19) Source(13, 15) + SourceIndex(0) +3 >Emitted(18, 20) Source(13, 16) + SourceIndex(0) +4 >Emitted(18, 24) Source(13, 20) + SourceIndex(0) +5 >Emitted(18, 25) Source(13, 21) + SourceIndex(0) +6 >Emitted(18, 33) Source(13, 29) + SourceIndex(0) +7 >Emitted(18, 34) Source(13, 30) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -270,8 +270,8 @@ sourceFile:sourceMapValidationClass.ts 1 > > 2 > } -1 >Emitted(19, 9) Source(14, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(19, 10) Source(14, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(19, 9) Source(14, 5) + SourceIndex(0) +2 >Emitted(19, 10) Source(14, 6) + SourceIndex(0) --- >>> set: function (greetings) { 1->^^^^^^^^^^^^^ @@ -282,9 +282,9 @@ sourceFile:sourceMapValidationClass.ts > 2 > set greetings( 3 > greetings: string -1->Emitted(20, 14) Source(15, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(20, 24) Source(15, 19) + SourceIndex(0) name (Greeter) -3 >Emitted(20, 33) Source(15, 36) + SourceIndex(0) name (Greeter) +1->Emitted(20, 14) Source(15, 5) + SourceIndex(0) +2 >Emitted(20, 24) Source(15, 19) + SourceIndex(0) +3 >Emitted(20, 33) Source(15, 36) + SourceIndex(0) --- >>> this.greeting = greetings; 1->^^^^^^^^^^^^ @@ -302,13 +302,13 @@ sourceFile:sourceMapValidationClass.ts 5 > = 6 > greetings 7 > ; -1->Emitted(21, 13) Source(16, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(21, 17) Source(16, 13) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(21, 18) Source(16, 14) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(21, 26) Source(16, 22) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(21, 29) Source(16, 25) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(21, 38) Source(16, 34) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(21, 39) Source(16, 35) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(21, 13) Source(16, 9) + SourceIndex(0) +2 >Emitted(21, 17) Source(16, 13) + SourceIndex(0) +3 >Emitted(21, 18) Source(16, 14) + SourceIndex(0) +4 >Emitted(21, 26) Source(16, 22) + SourceIndex(0) +5 >Emitted(21, 29) Source(16, 25) + SourceIndex(0) +6 >Emitted(21, 38) Source(16, 34) + SourceIndex(0) +7 >Emitted(21, 39) Source(16, 35) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -317,8 +317,8 @@ sourceFile:sourceMapValidationClass.ts 1 > > 2 > } -1 >Emitted(22, 9) Source(17, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(22, 10) Source(17, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(22, 9) Source(17, 5) + SourceIndex(0) +2 >Emitted(22, 10) Source(17, 6) + SourceIndex(0) --- >>> enumerable: true, >>> configurable: true @@ -326,7 +326,7 @@ sourceFile:sourceMapValidationClass.ts 1->^^^^^^^ 2 > ^^^^^^^^^^^^^-> 1-> -1->Emitted(25, 8) Source(14, 6) + SourceIndex(0) name (Greeter) +1->Emitted(25, 8) Source(14, 6) + SourceIndex(0) --- >>> return Greeter; 1->^^^^ @@ -337,8 +337,8 @@ sourceFile:sourceMapValidationClass.ts > } > 2 > } -1->Emitted(26, 5) Source(18, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0) name (Greeter) +1->Emitted(26, 5) Source(18, 1) + SourceIndex(0) +2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -367,8 +367,8 @@ sourceFile:sourceMapValidationClass.ts > this.greeting = greetings; > } > } -1 >Emitted(27, 1) Source(18, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(27, 2) Source(18, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(27, 1) Source(18, 1) + SourceIndex(0) +2 >Emitted(27, 2) Source(18, 2) + SourceIndex(0) 3 >Emitted(27, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(27, 6) Source(18, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map index 07abb96ca91bd..86601e215d5ac 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructor.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructor.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructor.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QACWC,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructor.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructor.ts"],"names":[],"mappings":"AAAA;IAAA;QACW,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt index ede638b64d972..f07dbf92120e2 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (Greeter) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> this.a = 10; 1->^^^^^^^^ @@ -33,11 +33,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 3 > = 4 > 10 5 > ; -1->Emitted(3, 9) Source(2, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(3, 15) Source(2, 13) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(3, 18) Source(2, 16) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(3, 20) Source(2, 18) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(3, 21) Source(2, 19) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(3, 9) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 13) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 16) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 18) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 19) + SourceIndex(0) --- >>> this.nameA = "Ten"; 1->^^^^^^^^ @@ -51,11 +51,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 3 > = 4 > "Ten" 5 > ; -1->Emitted(4, 9) Source(3, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(4, 19) Source(3, 17) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(4, 22) Source(3, 20) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(4, 27) Source(3, 25) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(4, 28) Source(3, 26) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(4, 9) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 19) Source(3, 17) + SourceIndex(0) +3 >Emitted(4, 22) Source(3, 20) + SourceIndex(0) +4 >Emitted(4, 27) Source(3, 25) + SourceIndex(0) +5 >Emitted(4, 28) Source(3, 26) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -64,16 +64,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 1 > > 2 > } -1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) --- >>> return Greeter; 1->^^^^ 2 > ^^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(6, 19) Source(4, 2) + SourceIndex(0) name (Greeter) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 19) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -88,8 +88,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts > public a = 10; > public nameA = "Ten"; > } -1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map index b0325217c7a54..00bdfcdba6071 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":["Greeter","Greeter.constructor"],"mappings":"AAAA;IAAAA;QAAAC,iBAGCA;QAFUA,MAACA,GAAGA,EAAEA,CAACA;QACPA,YAAOA,GAAGA,cAAMA,OAAAA,KAAIA,CAACA,CAACA,EAANA,CAAMA,CAACA;IAClCA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts"],"names":[],"mappings":"AAAA;IAAA;QAAA,iBAGC;QAFU,MAAC,GAAG,EAAE,CAAC;QACP,YAAO,GAAG,cAAM,OAAA,KAAI,CAAC,CAAC,EAAN,CAAM,CAAC;IAClC,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt index 555f1c096c242..fb58003ddcf2b 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (Greeter) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> var _this = this; 1->^^^^^^^^ @@ -28,8 +28,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen > public a = 10; > public returnA = () => this.a; > } -1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(3, 26) Source(4, 2) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 26) Source(4, 2) + SourceIndex(0) --- >>> this.a = 10; 1 >^^^^^^^^ @@ -43,11 +43,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 3 > = 4 > 10 5 > ; -1 >Emitted(4, 9) Source(2, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(4, 15) Source(2, 13) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(4, 18) Source(2, 16) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(4, 20) Source(2, 18) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(4, 21) Source(2, 19) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(4, 9) Source(2, 12) + SourceIndex(0) +2 >Emitted(4, 15) Source(2, 13) + SourceIndex(0) +3 >Emitted(4, 18) Source(2, 16) + SourceIndex(0) +4 >Emitted(4, 20) Source(2, 18) + SourceIndex(0) +5 >Emitted(4, 21) Source(2, 19) + SourceIndex(0) --- >>> this.returnA = function () { return _this.a; }; 1->^^^^^^^^ @@ -73,17 +73,17 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 9 > 10> this.a 11> ; -1->Emitted(5, 9) Source(3, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(5, 21) Source(3, 19) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(5, 24) Source(3, 22) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(5, 38) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(5, 45) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -6 >Emitted(5, 50) Source(3, 32) + SourceIndex(0) name (Greeter.constructor) -7 >Emitted(5, 51) Source(3, 33) + SourceIndex(0) name (Greeter.constructor) -8 >Emitted(5, 52) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) -9 >Emitted(5, 54) Source(3, 28) + SourceIndex(0) name (Greeter.constructor) -10>Emitted(5, 55) Source(3, 34) + SourceIndex(0) name (Greeter.constructor) -11>Emitted(5, 56) Source(3, 35) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(5, 9) Source(3, 12) + SourceIndex(0) +2 >Emitted(5, 21) Source(3, 19) + SourceIndex(0) +3 >Emitted(5, 24) Source(3, 22) + SourceIndex(0) +4 >Emitted(5, 38) Source(3, 28) + SourceIndex(0) +5 >Emitted(5, 45) Source(3, 28) + SourceIndex(0) +6 >Emitted(5, 50) Source(3, 32) + SourceIndex(0) +7 >Emitted(5, 51) Source(3, 33) + SourceIndex(0) +8 >Emitted(5, 52) Source(3, 34) + SourceIndex(0) +9 >Emitted(5, 54) Source(3, 28) + SourceIndex(0) +10>Emitted(5, 55) Source(3, 34) + SourceIndex(0) +11>Emitted(5, 56) Source(3, 35) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -92,16 +92,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 1 > > 2 > } -1 >Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) --- >>> return Greeter; 1->^^^^ 2 > ^^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(7, 19) Source(4, 2) + SourceIndex(0) name (Greeter) +1->Emitted(7, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 19) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -116,8 +116,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen > public a = 10; > public returnA = () => this.a; > } -1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(8, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map index fad366e8ebbf0..cf0a189bef355 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":["AbstractGreeter","AbstractGreeter.constructor","Greeter","Greeter.constructor"],"mappings":";;;;;AAAA;IAAAA;IACAC,CAACA;IAADD,sBAACA;AAADA,CAACA,AADD,IACC;AAED;IAAsBE,2BAAeA;IAArCA;QAAsBC,8BAAeA;QAC1BA,MAACA,GAAGA,EAAEA,CAACA;QACPA,UAAKA,GAAGA,KAAKA,CAACA;IACzBA,CAACA;IAADD,cAACA;AAADA,CAACA,AAHD,EAAsB,eAAe,EAGpC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,EAAsB,eAAe,EAGpC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt index aba9861a23039..86bbba306ff61 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt @@ -23,7 +23,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(7, 5) Source(1, 1) + SourceIndex(0) name (AbstractGreeter) +1->Emitted(7, 5) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -32,16 +32,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 1->class AbstractGreeter { > 2 > } -1->Emitted(8, 5) Source(2, 1) + SourceIndex(0) name (AbstractGreeter.constructor) -2 >Emitted(8, 6) Source(2, 2) + SourceIndex(0) name (AbstractGreeter.constructor) +1->Emitted(8, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(8, 6) Source(2, 2) + SourceIndex(0) --- >>> return AbstractGreeter; 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(9, 5) Source(2, 1) + SourceIndex(0) name (AbstractGreeter) -2 >Emitted(9, 27) Source(2, 2) + SourceIndex(0) name (AbstractGreeter) +1->Emitted(9, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(9, 27) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -54,8 +54,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 3 > 4 > class AbstractGreeter { > } -1 >Emitted(10, 1) Source(2, 1) + SourceIndex(0) name (AbstractGreeter) -2 >Emitted(10, 2) Source(2, 2) + SourceIndex(0) name (AbstractGreeter) +1 >Emitted(10, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(10, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(10, 6) Source(2, 2) + SourceIndex(0) --- @@ -72,22 +72,22 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->class Greeter extends 2 > AbstractGreeter -1->Emitted(12, 5) Source(4, 23) + SourceIndex(0) name (Greeter) -2 >Emitted(12, 32) Source(4, 38) + SourceIndex(0) name (Greeter) +1->Emitted(12, 5) Source(4, 23) + SourceIndex(0) +2 >Emitted(12, 32) Source(4, 38) + SourceIndex(0) --- >>> function Greeter() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(13, 5) Source(4, 1) + SourceIndex(0) name (Greeter) +1 >Emitted(13, 5) Source(4, 1) + SourceIndex(0) --- >>> _super.apply(this, arguments); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->class Greeter extends 2 > AbstractGreeter -1->Emitted(14, 9) Source(4, 23) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(14, 39) Source(4, 38) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(14, 9) Source(4, 23) + SourceIndex(0) +2 >Emitted(14, 39) Source(4, 38) + SourceIndex(0) --- >>> this.a = 10; 1 >^^^^^^^^ @@ -102,11 +102,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 3 > = 4 > 10 5 > ; -1 >Emitted(15, 9) Source(5, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(15, 15) Source(5, 13) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(15, 18) Source(5, 16) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(15, 20) Source(5, 18) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(15, 21) Source(5, 19) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(15, 9) Source(5, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(5, 13) + SourceIndex(0) +3 >Emitted(15, 18) Source(5, 16) + SourceIndex(0) +4 >Emitted(15, 20) Source(5, 18) + SourceIndex(0) +5 >Emitted(15, 21) Source(5, 19) + SourceIndex(0) --- >>> this.nameA = "Ten"; 1->^^^^^^^^ @@ -120,11 +120,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 3 > = 4 > "Ten" 5 > ; -1->Emitted(16, 9) Source(6, 12) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(16, 19) Source(6, 17) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(16, 22) Source(6, 20) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(16, 27) Source(6, 25) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(16, 28) Source(6, 26) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(16, 9) Source(6, 12) + SourceIndex(0) +2 >Emitted(16, 19) Source(6, 17) + SourceIndex(0) +3 >Emitted(16, 22) Source(6, 20) + SourceIndex(0) +4 >Emitted(16, 27) Source(6, 25) + SourceIndex(0) +5 >Emitted(16, 28) Source(6, 26) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -133,8 +133,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 1 > > 2 > } -1 >Emitted(17, 5) Source(7, 1) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(17, 6) Source(7, 2) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(17, 5) Source(7, 1) + SourceIndex(0) +2 >Emitted(17, 6) Source(7, 2) + SourceIndex(0) --- >>> return Greeter; 1->^^^^ @@ -142,8 +142,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 3 > ^^^-> 1-> 2 > } -1->Emitted(18, 5) Source(7, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(18, 19) Source(7, 2) + SourceIndex(0) name (Greeter) +1->Emitted(18, 5) Source(7, 1) + SourceIndex(0) +2 >Emitted(18, 19) Source(7, 2) + SourceIndex(0) --- >>>})(AbstractGreeter); 1-> @@ -162,8 +162,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts > public a = 10; > public nameA = "Ten"; > } -1->Emitted(19, 1) Source(7, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(19, 2) Source(7, 2) + SourceIndex(0) name (Greeter) +1->Emitted(19, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(19, 2) Source(7, 2) + SourceIndex(0) 3 >Emitted(19, 2) Source(4, 1) + SourceIndex(0) 4 >Emitted(19, 4) Source(4, 23) + SourceIndex(0) 5 >Emitted(19, 19) Source(4, 38) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map index fcba248ef1a00..08ed68ebca70e 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js.map +++ b/tests/baselines/reference/sourceMapValidationClasses.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClasses.js.map] -{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAmCbA;IAnCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA;YACIC,iBAAmBA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,aAAaA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,cAAcA,QAAgBA;YAAEK,kBAAiBA,mBAAmBA,MAAUA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,cAAiBA,mBAAmBA,yBAAUA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA,CAACA,0BAA0BA;YACxDA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,qCAAqCA;QACrCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAmCbA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAmCb;IAnCU,WAAA,GAAG,EAAC,CAAC;QACZ,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,WAA8C,CAA9C,sBAA8C,CAA9C,IAA8C;gBAA9C,cAAiB,mBAAmB,yBAAU;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAnCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAmCb;AAAD,CAAC,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index 4eb5e300422b5..bbf9aa3eb2ea3 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -114,10 +114,10 @@ sourceFile:sourceMapValidationClasses.ts > b[j].greet(); > } > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) name (Foo) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) name (Foo) -3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) name (Foo) -4 >Emitted(3, 13) Source(36, 2) + SourceIndex(0) name (Foo) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) +3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) +4 >Emitted(3, 13) Source(36, 2) + SourceIndex(0) --- >>> (function (Bar) { 1->^^^^ @@ -131,11 +131,11 @@ sourceFile:sourceMapValidationClasses.ts 3 > Bar 4 > 5 > { -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) name (Foo) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) name (Foo) -3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) name (Foo) -4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0) name (Foo) -5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0) name (Foo) +1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) +3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) +4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0) +5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0) --- >>> "use strict"; 1->^^^^^^^^ @@ -146,9 +146,9 @@ sourceFile:sourceMapValidationClasses.ts > 2 > "use strict" 3 > ; -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(5, 21) Source(2, 17) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(5, 22) Source(2, 18) + SourceIndex(0) name (Foo.Bar) +1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(5, 21) Source(2, 17) + SourceIndex(0) +3 >Emitted(5, 22) Source(2, 18) + SourceIndex(0) --- >>> var Greeter = (function () { 1->^^^^^^^^ @@ -156,7 +156,7 @@ sourceFile:sourceMapValidationClasses.ts 1-> > > -1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (Foo.Bar) +1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) --- >>> function Greeter(greeting) { 1->^^^^^^^^^^^^ @@ -167,9 +167,9 @@ sourceFile:sourceMapValidationClasses.ts > 2 > constructor(public 3 > greeting: string -1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(7, 13) Source(5, 9) + SourceIndex(0) +2 >Emitted(7, 30) Source(5, 28) + SourceIndex(0) +3 >Emitted(7, 38) Source(5, 44) + SourceIndex(0) --- >>> this.greeting = greeting; 1->^^^^^^^^^^^^^^^^ @@ -182,11 +182,11 @@ sourceFile:sourceMapValidationClasses.ts 3 > 4 > greeting 5 > : string -1->Emitted(8, 17) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -2 >Emitted(8, 30) Source(5, 36) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -3 >Emitted(8, 33) Source(5, 28) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -4 >Emitted(8, 41) Source(5, 36) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -5 >Emitted(8, 42) Source(5, 44) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) +1->Emitted(8, 17) Source(5, 28) + SourceIndex(0) +2 >Emitted(8, 30) Source(5, 36) + SourceIndex(0) +3 >Emitted(8, 33) Source(5, 28) + SourceIndex(0) +4 >Emitted(8, 41) Source(5, 36) + SourceIndex(0) +5 >Emitted(8, 42) Source(5, 44) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^ @@ -195,8 +195,8 @@ sourceFile:sourceMapValidationClasses.ts 1 >) { > 2 > } -1 >Emitted(9, 13) Source(6, 9) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) -2 >Emitted(9, 14) Source(6, 10) + SourceIndex(0) name (Foo.Bar.Greeter.constructor) +1 >Emitted(9, 13) Source(6, 9) + SourceIndex(0) +2 >Emitted(9, 14) Source(6, 10) + SourceIndex(0) --- >>> Greeter.prototype.greet = function () { 1->^^^^^^^^^^^^ @@ -208,9 +208,9 @@ sourceFile:sourceMapValidationClasses.ts > 2 > greet 3 > -1->Emitted(10, 13) Source(8, 9) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(10, 36) Source(8, 14) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(10, 39) Source(8, 9) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(10, 13) Source(8, 9) + SourceIndex(0) +2 >Emitted(10, 36) Source(8, 14) + SourceIndex(0) +3 >Emitted(10, 39) Source(8, 9) + SourceIndex(0) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^^^^^^^^^ @@ -236,17 +236,17 @@ sourceFile:sourceMapValidationClasses.ts 9 > + 10> "" 11> ; -1->Emitted(11, 17) Source(9, 13) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -2 >Emitted(11, 23) Source(9, 19) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -3 >Emitted(11, 24) Source(9, 20) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -4 >Emitted(11, 30) Source(9, 26) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -5 >Emitted(11, 33) Source(9, 29) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -6 >Emitted(11, 37) Source(9, 33) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -7 >Emitted(11, 38) Source(9, 34) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -8 >Emitted(11, 46) Source(9, 42) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -9 >Emitted(11, 49) Source(9, 45) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -10>Emitted(11, 56) Source(9, 52) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -11>Emitted(11, 57) Source(9, 53) + SourceIndex(0) name (Foo.Bar.Greeter.greet) +1->Emitted(11, 17) Source(9, 13) + SourceIndex(0) +2 >Emitted(11, 23) Source(9, 19) + SourceIndex(0) +3 >Emitted(11, 24) Source(9, 20) + SourceIndex(0) +4 >Emitted(11, 30) Source(9, 26) + SourceIndex(0) +5 >Emitted(11, 33) Source(9, 29) + SourceIndex(0) +6 >Emitted(11, 37) Source(9, 33) + SourceIndex(0) +7 >Emitted(11, 38) Source(9, 34) + SourceIndex(0) +8 >Emitted(11, 46) Source(9, 42) + SourceIndex(0) +9 >Emitted(11, 49) Source(9, 45) + SourceIndex(0) +10>Emitted(11, 56) Source(9, 52) + SourceIndex(0) +11>Emitted(11, 57) Source(9, 53) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^ @@ -255,8 +255,8 @@ sourceFile:sourceMapValidationClasses.ts 1 > > 2 > } -1 >Emitted(12, 13) Source(10, 9) + SourceIndex(0) name (Foo.Bar.Greeter.greet) -2 >Emitted(12, 14) Source(10, 10) + SourceIndex(0) name (Foo.Bar.Greeter.greet) +1 >Emitted(12, 13) Source(10, 9) + SourceIndex(0) +2 >Emitted(12, 14) Source(10, 10) + SourceIndex(0) --- >>> return Greeter; 1->^^^^^^^^^^^^ @@ -264,8 +264,8 @@ sourceFile:sourceMapValidationClasses.ts 1-> > 2 > } -1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) name (Foo.Bar.Greeter) +1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) +2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^ @@ -284,10 +284,10 @@ sourceFile:sourceMapValidationClasses.ts > return "

" + this.greeting + "

"; > } > } -1 >Emitted(14, 9) Source(11, 5) + SourceIndex(0) name (Foo.Bar.Greeter) -2 >Emitted(14, 10) Source(11, 6) + SourceIndex(0) name (Foo.Bar.Greeter) -3 >Emitted(14, 10) Source(4, 5) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(14, 14) Source(11, 6) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(14, 9) Source(11, 5) + SourceIndex(0) +2 >Emitted(14, 10) Source(11, 6) + SourceIndex(0) +3 >Emitted(14, 10) Source(4, 5) + SourceIndex(0) +4 >Emitted(14, 14) Source(11, 6) + SourceIndex(0) --- >>> function foo(greeting) { 1->^^^^^^^^ @@ -300,9 +300,9 @@ sourceFile:sourceMapValidationClasses.ts > 2 > function foo( 3 > greeting: string -1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) name (Foo.Bar) +1->Emitted(15, 9) Source(14, 5) + SourceIndex(0) +2 >Emitted(15, 22) Source(14, 18) + SourceIndex(0) +3 >Emitted(15, 30) Source(14, 34) + SourceIndex(0) --- >>> return new Greeter(greeting); 1->^^^^^^^^^^^^ @@ -324,15 +324,15 @@ sourceFile:sourceMapValidationClasses.ts 7 > greeting 8 > ) 9 > ; -1->Emitted(16, 13) Source(15, 9) + SourceIndex(0) name (Foo.Bar.foo) -2 >Emitted(16, 19) Source(15, 15) + SourceIndex(0) name (Foo.Bar.foo) -3 >Emitted(16, 20) Source(15, 16) + SourceIndex(0) name (Foo.Bar.foo) -4 >Emitted(16, 24) Source(15, 20) + SourceIndex(0) name (Foo.Bar.foo) -5 >Emitted(16, 31) Source(15, 27) + SourceIndex(0) name (Foo.Bar.foo) -6 >Emitted(16, 32) Source(15, 28) + SourceIndex(0) name (Foo.Bar.foo) -7 >Emitted(16, 40) Source(15, 36) + SourceIndex(0) name (Foo.Bar.foo) -8 >Emitted(16, 41) Source(15, 37) + SourceIndex(0) name (Foo.Bar.foo) -9 >Emitted(16, 42) Source(15, 38) + SourceIndex(0) name (Foo.Bar.foo) +1->Emitted(16, 13) Source(15, 9) + SourceIndex(0) +2 >Emitted(16, 19) Source(15, 15) + SourceIndex(0) +3 >Emitted(16, 20) Source(15, 16) + SourceIndex(0) +4 >Emitted(16, 24) Source(15, 20) + SourceIndex(0) +5 >Emitted(16, 31) Source(15, 27) + SourceIndex(0) +6 >Emitted(16, 32) Source(15, 28) + SourceIndex(0) +7 >Emitted(16, 40) Source(15, 36) + SourceIndex(0) +8 >Emitted(16, 41) Source(15, 37) + SourceIndex(0) +9 >Emitted(16, 42) Source(15, 38) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -341,8 +341,8 @@ sourceFile:sourceMapValidationClasses.ts 1 > > 2 > } -1 >Emitted(17, 9) Source(16, 5) + SourceIndex(0) name (Foo.Bar.foo) -2 >Emitted(17, 10) Source(16, 6) + SourceIndex(0) name (Foo.Bar.foo) +1 >Emitted(17, 9) Source(16, 5) + SourceIndex(0) +2 >Emitted(17, 10) Source(16, 6) + SourceIndex(0) --- >>> var greeter = new Greeter("Hello, world!"); 1->^^^^^^^^ @@ -367,16 +367,16 @@ sourceFile:sourceMapValidationClasses.ts 8 > "Hello, world!" 9 > ) 10> ; -1->Emitted(18, 9) Source(18, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(18, 13) Source(18, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(18, 20) Source(18, 16) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(18, 23) Source(18, 19) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(18, 27) Source(18, 23) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(18, 34) Source(18, 30) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(18, 35) Source(18, 31) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(18, 50) Source(18, 46) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(18, 51) Source(18, 47) + SourceIndex(0) name (Foo.Bar) -10>Emitted(18, 52) Source(18, 48) + SourceIndex(0) name (Foo.Bar) +1->Emitted(18, 9) Source(18, 5) + SourceIndex(0) +2 >Emitted(18, 13) Source(18, 9) + SourceIndex(0) +3 >Emitted(18, 20) Source(18, 16) + SourceIndex(0) +4 >Emitted(18, 23) Source(18, 19) + SourceIndex(0) +5 >Emitted(18, 27) Source(18, 23) + SourceIndex(0) +6 >Emitted(18, 34) Source(18, 30) + SourceIndex(0) +7 >Emitted(18, 35) Source(18, 31) + SourceIndex(0) +8 >Emitted(18, 50) Source(18, 46) + SourceIndex(0) +9 >Emitted(18, 51) Source(18, 47) + SourceIndex(0) +10>Emitted(18, 52) Source(18, 48) + SourceIndex(0) --- >>> var str = greeter.greet(); 1 >^^^^^^^^ @@ -398,15 +398,15 @@ sourceFile:sourceMapValidationClasses.ts 7 > greet 8 > () 9 > ; -1 >Emitted(19, 9) Source(19, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(19, 13) Source(19, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(19, 16) Source(19, 12) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(19, 19) Source(19, 15) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(19, 26) Source(19, 22) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(19, 27) Source(19, 23) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(19, 32) Source(19, 28) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(19, 34) Source(19, 30) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(19, 35) Source(19, 31) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(19, 9) Source(19, 5) + SourceIndex(0) +2 >Emitted(19, 13) Source(19, 9) + SourceIndex(0) +3 >Emitted(19, 16) Source(19, 12) + SourceIndex(0) +4 >Emitted(19, 19) Source(19, 15) + SourceIndex(0) +5 >Emitted(19, 26) Source(19, 22) + SourceIndex(0) +6 >Emitted(19, 27) Source(19, 23) + SourceIndex(0) +7 >Emitted(19, 32) Source(19, 28) + SourceIndex(0) +8 >Emitted(19, 34) Source(19, 30) + SourceIndex(0) +9 >Emitted(19, 35) Source(19, 31) + SourceIndex(0) --- >>> function foo2(greeting) { 1 >^^^^^^^^ @@ -418,9 +418,9 @@ sourceFile:sourceMapValidationClasses.ts > 2 > function foo2( 3 > greeting: string -1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(20, 9) Source(21, 5) + SourceIndex(0) +2 >Emitted(20, 23) Source(21, 19) + SourceIndex(0) +3 >Emitted(20, 31) Source(21, 35) + SourceIndex(0) --- >>> var restGreetings /* more greeting */ = []; 1->^^^^^^^^^^^^ @@ -432,10 +432,10 @@ sourceFile:sourceMapValidationClasses.ts 2 > ...restGreetings 3 > /* more greeting */ 4 > : string[] -1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(21, 31) Source(21, 54) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(21, 50) Source(21, 73) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(21, 56) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) +2 >Emitted(21, 31) Source(21, 54) + SourceIndex(0) +3 >Emitted(21, 50) Source(21, 73) + SourceIndex(0) +4 >Emitted(21, 56) Source(21, 83) + SourceIndex(0) --- >>> for (var _i = 1; _i < arguments.length; _i++) { 1->^^^^^^^^^^^^^^^^^ @@ -451,12 +451,12 @@ sourceFile:sourceMapValidationClasses.ts 4 > ...restGreetings /* more greeting */: string[] 5 > 6 > ...restGreetings /* more greeting */: string[] -1->Emitted(22, 18) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(22, 29) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(22, 52) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(22, 57) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(22, 18) Source(21, 37) + SourceIndex(0) +2 >Emitted(22, 29) Source(21, 83) + SourceIndex(0) +3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0) +4 >Emitted(22, 52) Source(21, 83) + SourceIndex(0) +5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0) +6 >Emitted(22, 57) Source(21, 83) + SourceIndex(0) --- >>> restGreetings /* more greeting */[_i - 1] = arguments[_i]; 1->^^^^^^^^^^^^^^^^ @@ -467,10 +467,10 @@ sourceFile:sourceMapValidationClasses.ts 2 > ...restGreetings 3 > /* more greeting */ 4 > : string[] -1->Emitted(23, 17) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(23, 31) Source(21, 54) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(23, 50) Source(21, 73) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(23, 75) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(23, 17) Source(21, 37) + SourceIndex(0) +2 >Emitted(23, 31) Source(21, 54) + SourceIndex(0) +3 >Emitted(23, 50) Source(21, 73) + SourceIndex(0) +4 >Emitted(23, 75) Source(21, 83) + SourceIndex(0) --- >>> } >>> var greeters = []; /* inline block comment */ @@ -491,14 +491,14 @@ sourceFile:sourceMapValidationClasses.ts 6 > ; 7 > 8 > /* inline block comment */ -1 >Emitted(25, 13) Source(22, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(25, 17) Source(22, 13) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(25, 25) Source(22, 21) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(25, 28) Source(22, 35) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(25, 30) Source(22, 37) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(25, 31) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(25, 32) Source(22, 39) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(25, 58) Source(22, 65) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(25, 13) Source(22, 9) + SourceIndex(0) +2 >Emitted(25, 17) Source(22, 13) + SourceIndex(0) +3 >Emitted(25, 25) Source(22, 21) + SourceIndex(0) +4 >Emitted(25, 28) Source(22, 35) + SourceIndex(0) +5 >Emitted(25, 30) Source(22, 37) + SourceIndex(0) +6 >Emitted(25, 31) Source(22, 38) + SourceIndex(0) +7 >Emitted(25, 32) Source(22, 39) + SourceIndex(0) +8 >Emitted(25, 58) Source(22, 65) + SourceIndex(0) --- >>> greeters[0] = new Greeter(greeting); 1 >^^^^^^^^^^^^ @@ -527,18 +527,18 @@ sourceFile:sourceMapValidationClasses.ts 10> greeting 11> ) 12> ; -1 >Emitted(26, 13) Source(23, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(26, 21) Source(23, 17) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(26, 22) Source(23, 18) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(26, 23) Source(23, 19) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(26, 24) Source(23, 20) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(26, 27) Source(23, 23) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(26, 31) Source(23, 27) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(26, 38) Source(23, 34) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(26, 39) Source(23, 35) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(26, 47) Source(23, 43) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(26, 48) Source(23, 44) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(26, 49) Source(23, 45) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(26, 13) Source(23, 9) + SourceIndex(0) +2 >Emitted(26, 21) Source(23, 17) + SourceIndex(0) +3 >Emitted(26, 22) Source(23, 18) + SourceIndex(0) +4 >Emitted(26, 23) Source(23, 19) + SourceIndex(0) +5 >Emitted(26, 24) Source(23, 20) + SourceIndex(0) +6 >Emitted(26, 27) Source(23, 23) + SourceIndex(0) +7 >Emitted(26, 31) Source(23, 27) + SourceIndex(0) +8 >Emitted(26, 38) Source(23, 34) + SourceIndex(0) +9 >Emitted(26, 39) Source(23, 35) + SourceIndex(0) +10>Emitted(26, 47) Source(23, 43) + SourceIndex(0) +11>Emitted(26, 48) Source(23, 44) + SourceIndex(0) +12>Emitted(26, 49) Source(23, 45) + SourceIndex(0) --- >>> for (var i = 0; i < restGreetings.length; i++) { 1->^^^^^^^^^^^^ @@ -583,26 +583,26 @@ sourceFile:sourceMapValidationClasses.ts 18> ++ 19> ) 20> { -1->Emitted(27, 13) Source(24, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(27, 16) Source(24, 12) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(27, 17) Source(24, 13) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(27, 18) Source(24, 14) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(27, 21) Source(24, 17) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(27, 22) Source(24, 18) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(27, 23) Source(24, 19) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(27, 26) Source(24, 22) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(27, 27) Source(24, 23) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(27, 29) Source(24, 25) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(27, 30) Source(24, 26) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(27, 33) Source(24, 29) + SourceIndex(0) name (Foo.Bar.foo2) -13>Emitted(27, 46) Source(24, 42) + SourceIndex(0) name (Foo.Bar.foo2) -14>Emitted(27, 47) Source(24, 43) + SourceIndex(0) name (Foo.Bar.foo2) -15>Emitted(27, 53) Source(24, 49) + SourceIndex(0) name (Foo.Bar.foo2) -16>Emitted(27, 55) Source(24, 51) + SourceIndex(0) name (Foo.Bar.foo2) -17>Emitted(27, 56) Source(24, 52) + SourceIndex(0) name (Foo.Bar.foo2) -18>Emitted(27, 58) Source(24, 54) + SourceIndex(0) name (Foo.Bar.foo2) -19>Emitted(27, 60) Source(24, 56) + SourceIndex(0) name (Foo.Bar.foo2) -20>Emitted(27, 61) Source(24, 57) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(27, 13) Source(24, 9) + SourceIndex(0) +2 >Emitted(27, 16) Source(24, 12) + SourceIndex(0) +3 >Emitted(27, 17) Source(24, 13) + SourceIndex(0) +4 >Emitted(27, 18) Source(24, 14) + SourceIndex(0) +5 >Emitted(27, 21) Source(24, 17) + SourceIndex(0) +6 >Emitted(27, 22) Source(24, 18) + SourceIndex(0) +7 >Emitted(27, 23) Source(24, 19) + SourceIndex(0) +8 >Emitted(27, 26) Source(24, 22) + SourceIndex(0) +9 >Emitted(27, 27) Source(24, 23) + SourceIndex(0) +10>Emitted(27, 29) Source(24, 25) + SourceIndex(0) +11>Emitted(27, 30) Source(24, 26) + SourceIndex(0) +12>Emitted(27, 33) Source(24, 29) + SourceIndex(0) +13>Emitted(27, 46) Source(24, 42) + SourceIndex(0) +14>Emitted(27, 47) Source(24, 43) + SourceIndex(0) +15>Emitted(27, 53) Source(24, 49) + SourceIndex(0) +16>Emitted(27, 55) Source(24, 51) + SourceIndex(0) +17>Emitted(27, 56) Source(24, 52) + SourceIndex(0) +18>Emitted(27, 58) Source(24, 54) + SourceIndex(0) +19>Emitted(27, 60) Source(24, 56) + SourceIndex(0) +20>Emitted(27, 61) Source(24, 57) + SourceIndex(0) --- >>> greeters.push(new Greeter(restGreetings[i])); 1->^^^^^^^^^^^^^^^^ @@ -636,21 +636,21 @@ sourceFile:sourceMapValidationClasses.ts 13> ) 14> ) 15> ; -1->Emitted(28, 17) Source(25, 13) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(28, 25) Source(25, 21) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(28, 26) Source(25, 22) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(28, 30) Source(25, 26) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(28, 31) Source(25, 27) + SourceIndex(0) name (Foo.Bar.foo2) -6 >Emitted(28, 35) Source(25, 31) + SourceIndex(0) name (Foo.Bar.foo2) -7 >Emitted(28, 42) Source(25, 38) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(28, 43) Source(25, 39) + SourceIndex(0) name (Foo.Bar.foo2) -9 >Emitted(28, 56) Source(25, 52) + SourceIndex(0) name (Foo.Bar.foo2) -10>Emitted(28, 57) Source(25, 53) + SourceIndex(0) name (Foo.Bar.foo2) -11>Emitted(28, 58) Source(25, 54) + SourceIndex(0) name (Foo.Bar.foo2) -12>Emitted(28, 59) Source(25, 55) + SourceIndex(0) name (Foo.Bar.foo2) -13>Emitted(28, 60) Source(25, 56) + SourceIndex(0) name (Foo.Bar.foo2) -14>Emitted(28, 61) Source(25, 57) + SourceIndex(0) name (Foo.Bar.foo2) -15>Emitted(28, 62) Source(25, 58) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(28, 17) Source(25, 13) + SourceIndex(0) +2 >Emitted(28, 25) Source(25, 21) + SourceIndex(0) +3 >Emitted(28, 26) Source(25, 22) + SourceIndex(0) +4 >Emitted(28, 30) Source(25, 26) + SourceIndex(0) +5 >Emitted(28, 31) Source(25, 27) + SourceIndex(0) +6 >Emitted(28, 35) Source(25, 31) + SourceIndex(0) +7 >Emitted(28, 42) Source(25, 38) + SourceIndex(0) +8 >Emitted(28, 43) Source(25, 39) + SourceIndex(0) +9 >Emitted(28, 56) Source(25, 52) + SourceIndex(0) +10>Emitted(28, 57) Source(25, 53) + SourceIndex(0) +11>Emitted(28, 58) Source(25, 54) + SourceIndex(0) +12>Emitted(28, 59) Source(25, 55) + SourceIndex(0) +13>Emitted(28, 60) Source(25, 56) + SourceIndex(0) +14>Emitted(28, 61) Source(25, 57) + SourceIndex(0) +15>Emitted(28, 62) Source(25, 58) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^ @@ -659,8 +659,8 @@ sourceFile:sourceMapValidationClasses.ts 1 > > 2 > } -1 >Emitted(29, 13) Source(26, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(29, 14) Source(26, 10) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(29, 13) Source(26, 9) + SourceIndex(0) +2 >Emitted(29, 14) Source(26, 10) + SourceIndex(0) --- >>> return greeters; 1->^^^^^^^^^^^^ @@ -675,11 +675,11 @@ sourceFile:sourceMapValidationClasses.ts 3 > 4 > greeters 5 > ; -1->Emitted(30, 13) Source(28, 9) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(30, 19) Source(28, 15) + SourceIndex(0) name (Foo.Bar.foo2) -3 >Emitted(30, 20) Source(28, 16) + SourceIndex(0) name (Foo.Bar.foo2) -4 >Emitted(30, 28) Source(28, 24) + SourceIndex(0) name (Foo.Bar.foo2) -5 >Emitted(30, 29) Source(28, 25) + SourceIndex(0) name (Foo.Bar.foo2) +1->Emitted(30, 13) Source(28, 9) + SourceIndex(0) +2 >Emitted(30, 19) Source(28, 15) + SourceIndex(0) +3 >Emitted(30, 20) Source(28, 16) + SourceIndex(0) +4 >Emitted(30, 28) Source(28, 24) + SourceIndex(0) +5 >Emitted(30, 29) Source(28, 25) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -688,8 +688,8 @@ sourceFile:sourceMapValidationClasses.ts 1 > > 2 > } -1 >Emitted(31, 9) Source(29, 5) + SourceIndex(0) name (Foo.Bar.foo2) -2 >Emitted(31, 10) Source(29, 6) + SourceIndex(0) name (Foo.Bar.foo2) +1 >Emitted(31, 9) Source(29, 5) + SourceIndex(0) +2 >Emitted(31, 10) Source(29, 6) + SourceIndex(0) --- >>> var b = foo2("Hello", "World", "!"); 1->^^^^^^^^ @@ -721,19 +721,19 @@ sourceFile:sourceMapValidationClasses.ts 11> "!" 12> ) 13> ; -1->Emitted(32, 9) Source(31, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(32, 13) Source(31, 9) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(32, 14) Source(31, 10) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(32, 17) Source(31, 13) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(32, 21) Source(31, 17) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(32, 22) Source(31, 18) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(32, 29) Source(31, 25) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(32, 31) Source(31, 27) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(32, 38) Source(31, 34) + SourceIndex(0) name (Foo.Bar) -10>Emitted(32, 40) Source(31, 36) + SourceIndex(0) name (Foo.Bar) -11>Emitted(32, 43) Source(31, 39) + SourceIndex(0) name (Foo.Bar) -12>Emitted(32, 44) Source(31, 40) + SourceIndex(0) name (Foo.Bar) -13>Emitted(32, 45) Source(31, 41) + SourceIndex(0) name (Foo.Bar) +1->Emitted(32, 9) Source(31, 5) + SourceIndex(0) +2 >Emitted(32, 13) Source(31, 9) + SourceIndex(0) +3 >Emitted(32, 14) Source(31, 10) + SourceIndex(0) +4 >Emitted(32, 17) Source(31, 13) + SourceIndex(0) +5 >Emitted(32, 21) Source(31, 17) + SourceIndex(0) +6 >Emitted(32, 22) Source(31, 18) + SourceIndex(0) +7 >Emitted(32, 29) Source(31, 25) + SourceIndex(0) +8 >Emitted(32, 31) Source(31, 27) + SourceIndex(0) +9 >Emitted(32, 38) Source(31, 34) + SourceIndex(0) +10>Emitted(32, 40) Source(31, 36) + SourceIndex(0) +11>Emitted(32, 43) Source(31, 39) + SourceIndex(0) +12>Emitted(32, 44) Source(31, 40) + SourceIndex(0) +13>Emitted(32, 45) Source(31, 41) + SourceIndex(0) --- >>> // This is simple signle line comment 1->^^^^^^^^ @@ -741,8 +741,8 @@ sourceFile:sourceMapValidationClasses.ts 1-> > 2 > // This is simple signle line comment -1->Emitted(33, 9) Source(32, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(33, 46) Source(32, 42) + SourceIndex(0) name (Foo.Bar) +1->Emitted(33, 9) Source(32, 5) + SourceIndex(0) +2 >Emitted(33, 46) Source(32, 42) + SourceIndex(0) --- >>> for (var j = 0; j < b.length; j++) { 1 >^^^^^^^^ @@ -786,26 +786,26 @@ sourceFile:sourceMapValidationClasses.ts 18> ++ 19> ) 20> { -1 >Emitted(34, 9) Source(33, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(34, 12) Source(33, 8) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(34, 13) Source(33, 9) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(34, 14) Source(33, 10) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(34, 17) Source(33, 13) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(34, 18) Source(33, 14) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(34, 19) Source(33, 15) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(34, 22) Source(33, 18) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(34, 23) Source(33, 19) + SourceIndex(0) name (Foo.Bar) -10>Emitted(34, 25) Source(33, 21) + SourceIndex(0) name (Foo.Bar) -11>Emitted(34, 26) Source(33, 22) + SourceIndex(0) name (Foo.Bar) -12>Emitted(34, 29) Source(33, 25) + SourceIndex(0) name (Foo.Bar) -13>Emitted(34, 30) Source(33, 26) + SourceIndex(0) name (Foo.Bar) -14>Emitted(34, 31) Source(33, 27) + SourceIndex(0) name (Foo.Bar) -15>Emitted(34, 37) Source(33, 33) + SourceIndex(0) name (Foo.Bar) -16>Emitted(34, 39) Source(33, 35) + SourceIndex(0) name (Foo.Bar) -17>Emitted(34, 40) Source(33, 36) + SourceIndex(0) name (Foo.Bar) -18>Emitted(34, 42) Source(33, 38) + SourceIndex(0) name (Foo.Bar) -19>Emitted(34, 44) Source(33, 40) + SourceIndex(0) name (Foo.Bar) -20>Emitted(34, 45) Source(33, 41) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(34, 9) Source(33, 5) + SourceIndex(0) +2 >Emitted(34, 12) Source(33, 8) + SourceIndex(0) +3 >Emitted(34, 13) Source(33, 9) + SourceIndex(0) +4 >Emitted(34, 14) Source(33, 10) + SourceIndex(0) +5 >Emitted(34, 17) Source(33, 13) + SourceIndex(0) +6 >Emitted(34, 18) Source(33, 14) + SourceIndex(0) +7 >Emitted(34, 19) Source(33, 15) + SourceIndex(0) +8 >Emitted(34, 22) Source(33, 18) + SourceIndex(0) +9 >Emitted(34, 23) Source(33, 19) + SourceIndex(0) +10>Emitted(34, 25) Source(33, 21) + SourceIndex(0) +11>Emitted(34, 26) Source(33, 22) + SourceIndex(0) +12>Emitted(34, 29) Source(33, 25) + SourceIndex(0) +13>Emitted(34, 30) Source(33, 26) + SourceIndex(0) +14>Emitted(34, 31) Source(33, 27) + SourceIndex(0) +15>Emitted(34, 37) Source(33, 33) + SourceIndex(0) +16>Emitted(34, 39) Source(33, 35) + SourceIndex(0) +17>Emitted(34, 40) Source(33, 36) + SourceIndex(0) +18>Emitted(34, 42) Source(33, 38) + SourceIndex(0) +19>Emitted(34, 44) Source(33, 40) + SourceIndex(0) +20>Emitted(34, 45) Source(33, 41) + SourceIndex(0) --- >>> b[j].greet(); 1 >^^^^^^^^^^^^ @@ -827,15 +827,15 @@ sourceFile:sourceMapValidationClasses.ts 7 > greet 8 > () 9 > ; -1 >Emitted(35, 13) Source(34, 9) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(35, 14) Source(34, 10) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(35, 15) Source(34, 11) + SourceIndex(0) name (Foo.Bar) -4 >Emitted(35, 16) Source(34, 12) + SourceIndex(0) name (Foo.Bar) -5 >Emitted(35, 17) Source(34, 13) + SourceIndex(0) name (Foo.Bar) -6 >Emitted(35, 18) Source(34, 14) + SourceIndex(0) name (Foo.Bar) -7 >Emitted(35, 23) Source(34, 19) + SourceIndex(0) name (Foo.Bar) -8 >Emitted(35, 25) Source(34, 21) + SourceIndex(0) name (Foo.Bar) -9 >Emitted(35, 26) Source(34, 22) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(35, 13) Source(34, 9) + SourceIndex(0) +2 >Emitted(35, 14) Source(34, 10) + SourceIndex(0) +3 >Emitted(35, 15) Source(34, 11) + SourceIndex(0) +4 >Emitted(35, 16) Source(34, 12) + SourceIndex(0) +5 >Emitted(35, 17) Source(34, 13) + SourceIndex(0) +6 >Emitted(35, 18) Source(34, 14) + SourceIndex(0) +7 >Emitted(35, 23) Source(34, 19) + SourceIndex(0) +8 >Emitted(35, 25) Source(34, 21) + SourceIndex(0) +9 >Emitted(35, 26) Source(34, 22) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -844,8 +844,8 @@ sourceFile:sourceMapValidationClasses.ts 1 > > 2 > } -1 >Emitted(36, 9) Source(35, 5) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(36, 10) Source(35, 6) + SourceIndex(0) name (Foo.Bar) +1 >Emitted(36, 9) Source(35, 5) + SourceIndex(0) +2 >Emitted(36, 10) Source(35, 6) + SourceIndex(0) --- >>> })(Bar = Foo.Bar || (Foo.Bar = {})); 1->^^^^ @@ -902,15 +902,15 @@ sourceFile:sourceMapValidationClasses.ts > b[j].greet(); > } > } -1->Emitted(37, 5) Source(36, 1) + SourceIndex(0) name (Foo.Bar) -2 >Emitted(37, 6) Source(36, 2) + SourceIndex(0) name (Foo.Bar) -3 >Emitted(37, 8) Source(1, 12) + SourceIndex(0) name (Foo) -4 >Emitted(37, 11) Source(1, 15) + SourceIndex(0) name (Foo) -5 >Emitted(37, 14) Source(1, 12) + SourceIndex(0) name (Foo) -6 >Emitted(37, 21) Source(1, 15) + SourceIndex(0) name (Foo) -7 >Emitted(37, 26) Source(1, 12) + SourceIndex(0) name (Foo) -8 >Emitted(37, 33) Source(1, 15) + SourceIndex(0) name (Foo) -9 >Emitted(37, 41) Source(36, 2) + SourceIndex(0) name (Foo) +1->Emitted(37, 5) Source(36, 1) + SourceIndex(0) +2 >Emitted(37, 6) Source(36, 2) + SourceIndex(0) +3 >Emitted(37, 8) Source(1, 12) + SourceIndex(0) +4 >Emitted(37, 11) Source(1, 15) + SourceIndex(0) +5 >Emitted(37, 14) Source(1, 12) + SourceIndex(0) +6 >Emitted(37, 21) Source(1, 15) + SourceIndex(0) +7 >Emitted(37, 26) Source(1, 12) + SourceIndex(0) +8 >Emitted(37, 33) Source(1, 15) + SourceIndex(0) +9 >Emitted(37, 41) Source(36, 2) + SourceIndex(0) --- >>>})(Foo || (Foo = {})); 1 > @@ -963,8 +963,8 @@ sourceFile:sourceMapValidationClasses.ts > b[j].greet(); > } > } -1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0) name (Foo) -2 >Emitted(38, 2) Source(36, 2) + SourceIndex(0) name (Foo) +1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(38, 2) Source(36, 2) + SourceIndex(0) 3 >Emitted(38, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(38, 7) Source(1, 11) + SourceIndex(0) 5 >Emitted(38, 12) Source(1, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map index 4a8b3258659e0..ea2b514b7e539 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js.map +++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationDecorators.js.map] -{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AAOA;IAGIA,iBAGSA,QAAgBA;QAEvBC,WAEcA;aAFdA,WAEcA,CAFdA,sBAEcA,CAFdA,IAEcA;YAFdA,0BAEcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAFLA;QAGIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAEDH,sBAEIA,8BAASA;aAFbA;YAGII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACvBA,0BAAKA,QAEJA;IAEDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACfA,sBAACA,UAASA;IAMlBA;QACEA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OAFlBA,uBAAEA,QAKTA;IAEDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;QAMrBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OANtBA,8BAASA,QAEZA;IAfDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACRA,aAAEA,UAAcA;IAzBnCA;QAACA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;QAGdA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;QAGxBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;gBAqC7BA;IAADA,cAACA;AAADA,CAACA,AA9CD,IA8CC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":[],"mappings":";;;;;;;;;AAOA;IAGI,iBAGS,QAAgB;QAEvB,WAEc;aAFd,WAEc,CAFd,sBAEc,CAFd,IAEc;YAFd,0BAEc;;QAJP,aAAQ,GAAR,QAAQ,CAAQ;IAKzB,CAAC;IAID,uBAAK,GAFL;QAGI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAUO,oBAAE,GAAV,UAGE,CAAS;QACP,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,sBAEI,8BAAS;aAFb;YAGI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aAED,UAGE,SAAiB;YACf,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAPA;IAbc,UAAE,GAAW,EAAE,CAAC;IAZ/B;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;OACvB,0BAAK,QAEJ;IAED;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;OACf,sBAAC,UAAS;IAMlB;QACE,WAAC,mBAAmB,CAAA;QACpB,WAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;OAFlB,uBAAE,QAKT;IAED;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;QAMrB,WAAC,mBAAmB,CAAA;QACpB,WAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;OANtB,8BAAS,QAEZ;IAfD;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;OACR,aAAE,UAAc;IAzBnC;QAAC,eAAe;QACf,eAAe,CAAC,EAAE,CAAC;QAGd,WAAC,mBAAmB,CAAA;QACpB,WAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAGxB,WAAC,mBAAmB,CAAA;QACpB,WAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;gBAqC7B;IAAD,cAAC;AAAD,CAAC,AA9CD,IA8CC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index d9c8d0cc976f0..83639857f083d 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -43,9 +43,9 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(20) > public 3 > greeting: string -1->Emitted(11, 5) Source(11, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(11, 22) Source(14, 14) + SourceIndex(0) name (Greeter) -3 >Emitted(11, 30) Source(14, 30) + SourceIndex(0) name (Greeter) +1->Emitted(11, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(11, 22) Source(14, 14) + SourceIndex(0) +3 >Emitted(11, 30) Source(14, 30) + SourceIndex(0) --- >>> var b = []; 1 >^^^^^^^^ @@ -57,8 +57,8 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1 >Emitted(12, 9) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(12, 20) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(12, 9) Source(16, 7) + SourceIndex(0) +2 >Emitted(12, 20) Source(18, 21) + SourceIndex(0) --- >>> for (var _i = 1; _i < arguments.length; _i++) { 1->^^^^^^^^^^^^^ @@ -79,12 +79,12 @@ sourceFile:sourceMapValidationDecorators.ts 6 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1->Emitted(13, 14) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(13, 25) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(13, 26) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(13, 48) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(13, 49) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -6 >Emitted(13, 53) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(13, 14) Source(16, 7) + SourceIndex(0) +2 >Emitted(13, 25) Source(18, 21) + SourceIndex(0) +3 >Emitted(13, 26) Source(16, 7) + SourceIndex(0) +4 >Emitted(13, 48) Source(18, 21) + SourceIndex(0) +5 >Emitted(13, 49) Source(16, 7) + SourceIndex(0) +6 >Emitted(13, 53) Source(18, 21) + SourceIndex(0) --- >>> b[_i - 1] = arguments[_i]; 1 >^^^^^^^^^^^^ @@ -93,8 +93,8 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1 >Emitted(14, 13) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(14, 39) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(14, 13) Source(16, 7) + SourceIndex(0) +2 >Emitted(14, 39) Source(18, 21) + SourceIndex(0) --- >>> } >>> this.greeting = greeting; @@ -108,11 +108,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > 4 > greeting 5 > : string -1 >Emitted(16, 9) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(16, 22) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(16, 25) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(16, 33) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(16, 34) Source(14, 30) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(16, 9) Source(14, 14) + SourceIndex(0) +2 >Emitted(16, 22) Source(14, 22) + SourceIndex(0) +3 >Emitted(16, 25) Source(14, 14) + SourceIndex(0) +4 >Emitted(16, 33) Source(14, 22) + SourceIndex(0) +5 >Emitted(16, 34) Source(14, 30) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -125,8 +125,8 @@ sourceFile:sourceMapValidationDecorators.ts > ...b: string[]) { > 2 > } -1 >Emitted(17, 5) Source(19, 5) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(17, 6) Source(19, 6) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(17, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(17, 6) Source(19, 6) + SourceIndex(0) --- >>> Greeter.prototype.greet = function () { 1->^^^^ @@ -140,9 +140,9 @@ sourceFile:sourceMapValidationDecorators.ts > 2 > greet 3 > -1->Emitted(18, 5) Source(23, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(18, 28) Source(23, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(18, 31) Source(21, 5) + SourceIndex(0) name (Greeter) +1->Emitted(18, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(18, 28) Source(23, 10) + SourceIndex(0) +3 >Emitted(18, 31) Source(21, 5) + SourceIndex(0) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^ @@ -170,17 +170,17 @@ sourceFile:sourceMapValidationDecorators.ts 9 > + 10> "" 11> ; -1->Emitted(19, 9) Source(24, 9) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(19, 15) Source(24, 15) + SourceIndex(0) name (Greeter.greet) -3 >Emitted(19, 16) Source(24, 16) + SourceIndex(0) name (Greeter.greet) -4 >Emitted(19, 22) Source(24, 22) + SourceIndex(0) name (Greeter.greet) -5 >Emitted(19, 25) Source(24, 25) + SourceIndex(0) name (Greeter.greet) -6 >Emitted(19, 29) Source(24, 29) + SourceIndex(0) name (Greeter.greet) -7 >Emitted(19, 30) Source(24, 30) + SourceIndex(0) name (Greeter.greet) -8 >Emitted(19, 38) Source(24, 38) + SourceIndex(0) name (Greeter.greet) -9 >Emitted(19, 41) Source(24, 41) + SourceIndex(0) name (Greeter.greet) -10>Emitted(19, 48) Source(24, 48) + SourceIndex(0) name (Greeter.greet) -11>Emitted(19, 49) Source(24, 49) + SourceIndex(0) name (Greeter.greet) +1->Emitted(19, 9) Source(24, 9) + SourceIndex(0) +2 >Emitted(19, 15) Source(24, 15) + SourceIndex(0) +3 >Emitted(19, 16) Source(24, 16) + SourceIndex(0) +4 >Emitted(19, 22) Source(24, 22) + SourceIndex(0) +5 >Emitted(19, 25) Source(24, 25) + SourceIndex(0) +6 >Emitted(19, 29) Source(24, 29) + SourceIndex(0) +7 >Emitted(19, 30) Source(24, 30) + SourceIndex(0) +8 >Emitted(19, 38) Source(24, 38) + SourceIndex(0) +9 >Emitted(19, 41) Source(24, 41) + SourceIndex(0) +10>Emitted(19, 48) Source(24, 48) + SourceIndex(0) +11>Emitted(19, 49) Source(24, 49) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -189,8 +189,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(20, 5) Source(25, 5) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(20, 6) Source(25, 6) + SourceIndex(0) name (Greeter.greet) +1 >Emitted(20, 5) Source(25, 5) + SourceIndex(0) +2 >Emitted(20, 6) Source(25, 6) + SourceIndex(0) --- >>> Greeter.prototype.fn = function (x) { 1->^^^^ @@ -216,11 +216,11 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(70) > 5 > x: number -1->Emitted(21, 5) Source(35, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(21, 25) Source(35, 15) + SourceIndex(0) name (Greeter) -3 >Emitted(21, 28) Source(35, 5) + SourceIndex(0) name (Greeter) -4 >Emitted(21, 38) Source(38, 7) + SourceIndex(0) name (Greeter) -5 >Emitted(21, 39) Source(38, 16) + SourceIndex(0) name (Greeter) +1->Emitted(21, 5) Source(35, 13) + SourceIndex(0) +2 >Emitted(21, 25) Source(35, 15) + SourceIndex(0) +3 >Emitted(21, 28) Source(35, 5) + SourceIndex(0) +4 >Emitted(21, 38) Source(38, 7) + SourceIndex(0) +5 >Emitted(21, 39) Source(38, 16) + SourceIndex(0) --- >>> return this.greeting; 1 >^^^^^^^^ @@ -238,13 +238,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > . 6 > greeting 7 > ; -1 >Emitted(22, 9) Source(39, 9) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(22, 15) Source(39, 15) + SourceIndex(0) name (Greeter.fn) -3 >Emitted(22, 16) Source(39, 16) + SourceIndex(0) name (Greeter.fn) -4 >Emitted(22, 20) Source(39, 20) + SourceIndex(0) name (Greeter.fn) -5 >Emitted(22, 21) Source(39, 21) + SourceIndex(0) name (Greeter.fn) -6 >Emitted(22, 29) Source(39, 29) + SourceIndex(0) name (Greeter.fn) -7 >Emitted(22, 30) Source(39, 30) + SourceIndex(0) name (Greeter.fn) +1 >Emitted(22, 9) Source(39, 9) + SourceIndex(0) +2 >Emitted(22, 15) Source(39, 15) + SourceIndex(0) +3 >Emitted(22, 16) Source(39, 16) + SourceIndex(0) +4 >Emitted(22, 20) Source(39, 20) + SourceIndex(0) +5 >Emitted(22, 21) Source(39, 21) + SourceIndex(0) +6 >Emitted(22, 29) Source(39, 29) + SourceIndex(0) +7 >Emitted(22, 30) Source(39, 30) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -253,8 +253,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(23, 5) Source(40, 5) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(23, 6) Source(40, 6) + SourceIndex(0) name (Greeter.fn) +1 >Emitted(23, 5) Source(40, 5) + SourceIndex(0) +2 >Emitted(23, 6) Source(40, 6) + SourceIndex(0) --- >>> Object.defineProperty(Greeter.prototype, "greetings", { 1->^^^^ @@ -267,15 +267,15 @@ sourceFile:sourceMapValidationDecorators.ts > @PropertyDecorator2(80) > get 3 > greetings -1->Emitted(24, 5) Source(42, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(24, 27) Source(44, 9) + SourceIndex(0) name (Greeter) -3 >Emitted(24, 57) Source(44, 18) + SourceIndex(0) name (Greeter) +1->Emitted(24, 5) Source(42, 5) + SourceIndex(0) +2 >Emitted(24, 27) Source(44, 9) + SourceIndex(0) +3 >Emitted(24, 57) Source(44, 18) + SourceIndex(0) --- >>> get: function () { 1 >^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(25, 14) Source(42, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(25, 14) Source(42, 5) + SourceIndex(0) --- >>> return this.greeting; 1->^^^^^^^^^^^^ @@ -295,13 +295,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > . 6 > greeting 7 > ; -1->Emitted(26, 13) Source(45, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(26, 19) Source(45, 15) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(26, 20) Source(45, 16) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(26, 24) Source(45, 20) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(26, 25) Source(45, 21) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(26, 33) Source(45, 29) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(26, 34) Source(45, 30) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(26, 13) Source(45, 9) + SourceIndex(0) +2 >Emitted(26, 19) Source(45, 15) + SourceIndex(0) +3 >Emitted(26, 20) Source(45, 16) + SourceIndex(0) +4 >Emitted(26, 24) Source(45, 20) + SourceIndex(0) +5 >Emitted(26, 25) Source(45, 21) + SourceIndex(0) +6 >Emitted(26, 33) Source(45, 29) + SourceIndex(0) +7 >Emitted(26, 34) Source(45, 30) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -310,8 +310,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(27, 9) Source(46, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(27, 10) Source(46, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(27, 9) Source(46, 5) + SourceIndex(0) +2 >Emitted(27, 10) Source(46, 6) + SourceIndex(0) --- >>> set: function (greetings) { 1->^^^^^^^^^^^^^ @@ -326,9 +326,9 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(90) > 3 > greetings: string -1->Emitted(28, 14) Source(48, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(28, 24) Source(51, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(28, 33) Source(51, 24) + SourceIndex(0) name (Greeter) +1->Emitted(28, 14) Source(48, 5) + SourceIndex(0) +2 >Emitted(28, 24) Source(51, 7) + SourceIndex(0) +3 >Emitted(28, 33) Source(51, 24) + SourceIndex(0) --- >>> this.greeting = greetings; 1->^^^^^^^^^^^^ @@ -346,13 +346,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > = 6 > greetings 7 > ; -1->Emitted(29, 13) Source(52, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(29, 17) Source(52, 13) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(29, 18) Source(52, 14) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(29, 26) Source(52, 22) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(29, 29) Source(52, 25) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(29, 38) Source(52, 34) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(29, 39) Source(52, 35) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(29, 13) Source(52, 9) + SourceIndex(0) +2 >Emitted(29, 17) Source(52, 13) + SourceIndex(0) +3 >Emitted(29, 18) Source(52, 14) + SourceIndex(0) +4 >Emitted(29, 26) Source(52, 22) + SourceIndex(0) +5 >Emitted(29, 29) Source(52, 25) + SourceIndex(0) +6 >Emitted(29, 38) Source(52, 34) + SourceIndex(0) +7 >Emitted(29, 39) Source(52, 35) + SourceIndex(0) --- >>> }, 1 >^^^^^^^^ @@ -361,8 +361,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(30, 9) Source(53, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(30, 10) Source(53, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(30, 9) Source(53, 5) + SourceIndex(0) +2 >Emitted(30, 10) Source(53, 6) + SourceIndex(0) --- >>> enumerable: true, >>> configurable: true @@ -370,7 +370,7 @@ sourceFile:sourceMapValidationDecorators.ts 1->^^^^^^^ 2 > ^^^^^^^^^^^^^^-> 1-> -1->Emitted(33, 8) Source(46, 6) + SourceIndex(0) name (Greeter) +1->Emitted(33, 8) Source(46, 6) + SourceIndex(0) --- >>> Greeter.x1 = 10; 1->^^^^ @@ -383,17 +383,17 @@ sourceFile:sourceMapValidationDecorators.ts 3 > : number = 4 > 10 5 > ; -1->Emitted(34, 5) Source(33, 20) + SourceIndex(0) name (Greeter) -2 >Emitted(34, 15) Source(33, 22) + SourceIndex(0) name (Greeter) -3 >Emitted(34, 18) Source(33, 33) + SourceIndex(0) name (Greeter) -4 >Emitted(34, 20) Source(33, 35) + SourceIndex(0) name (Greeter) -5 >Emitted(34, 21) Source(33, 36) + SourceIndex(0) name (Greeter) +1->Emitted(34, 5) Source(33, 20) + SourceIndex(0) +2 >Emitted(34, 15) Source(33, 22) + SourceIndex(0) +3 >Emitted(34, 18) Source(33, 33) + SourceIndex(0) +4 >Emitted(34, 20) Source(33, 35) + SourceIndex(0) +5 >Emitted(34, 21) Source(33, 36) + SourceIndex(0) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(35, 5) Source(21, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(35, 5) Source(21, 5) + SourceIndex(0) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -401,8 +401,8 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^-> 1->@ 2 > PropertyDecorator1 -1->Emitted(36, 9) Source(21, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(36, 27) Source(21, 24) + SourceIndex(0) name (Greeter) +1->Emitted(36, 9) Source(21, 6) + SourceIndex(0) +2 >Emitted(36, 27) Source(21, 24) + SourceIndex(0) --- >>> PropertyDecorator2(40) 1->^^^^^^^^ @@ -417,11 +417,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ( 4 > 40 5 > ) -1->Emitted(37, 9) Source(22, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(37, 27) Source(22, 24) + SourceIndex(0) name (Greeter) -3 >Emitted(37, 28) Source(22, 25) + SourceIndex(0) name (Greeter) -4 >Emitted(37, 30) Source(22, 27) + SourceIndex(0) name (Greeter) -5 >Emitted(37, 31) Source(22, 28) + SourceIndex(0) name (Greeter) +1->Emitted(37, 9) Source(22, 6) + SourceIndex(0) +2 >Emitted(37, 27) Source(22, 24) + SourceIndex(0) +3 >Emitted(37, 28) Source(22, 25) + SourceIndex(0) +4 >Emitted(37, 30) Source(22, 27) + SourceIndex(0) +5 >Emitted(37, 31) Source(22, 28) + SourceIndex(0) --- >>> ], Greeter.prototype, "greet", null); 1->^^^^^^^ @@ -433,9 +433,9 @@ sourceFile:sourceMapValidationDecorators.ts 3 > () { > return "

" + this.greeting + "

"; > } -1->Emitted(38, 8) Source(23, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(38, 34) Source(23, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(38, 42) Source(25, 6) + SourceIndex(0) name (Greeter) +1->Emitted(38, 8) Source(23, 5) + SourceIndex(0) +2 >Emitted(38, 34) Source(23, 10) + SourceIndex(0) +3 >Emitted(38, 42) Source(25, 6) + SourceIndex(0) --- >>> __decorate([ 1 >^^^^ @@ -443,7 +443,7 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > > -1 >Emitted(39, 5) Source(27, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(39, 5) Source(27, 5) + SourceIndex(0) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -451,8 +451,8 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^-> 1->@ 2 > PropertyDecorator1 -1->Emitted(40, 9) Source(27, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(40, 27) Source(27, 24) + SourceIndex(0) name (Greeter) +1->Emitted(40, 9) Source(27, 6) + SourceIndex(0) +2 >Emitted(40, 27) Source(27, 24) + SourceIndex(0) --- >>> PropertyDecorator2(50) 1->^^^^^^^^ @@ -467,11 +467,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ( 4 > 50 5 > ) -1->Emitted(41, 9) Source(28, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(41, 27) Source(28, 24) + SourceIndex(0) name (Greeter) -3 >Emitted(41, 28) Source(28, 25) + SourceIndex(0) name (Greeter) -4 >Emitted(41, 30) Source(28, 27) + SourceIndex(0) name (Greeter) -5 >Emitted(41, 31) Source(28, 28) + SourceIndex(0) name (Greeter) +1->Emitted(41, 9) Source(28, 6) + SourceIndex(0) +2 >Emitted(41, 27) Source(28, 24) + SourceIndex(0) +3 >Emitted(41, 28) Source(28, 25) + SourceIndex(0) +4 >Emitted(41, 30) Source(28, 27) + SourceIndex(0) +5 >Emitted(41, 31) Source(28, 28) + SourceIndex(0) --- >>> ], Greeter.prototype, "x", void 0); 1->^^^^^^^ @@ -481,9 +481,9 @@ sourceFile:sourceMapValidationDecorators.ts > private 2 > x 3 > : string; -1->Emitted(42, 8) Source(29, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(42, 30) Source(29, 14) + SourceIndex(0) name (Greeter) -3 >Emitted(42, 40) Source(29, 23) + SourceIndex(0) name (Greeter) +1->Emitted(42, 8) Source(29, 13) + SourceIndex(0) +2 >Emitted(42, 30) Source(29, 14) + SourceIndex(0) +3 >Emitted(42, 40) Source(29, 23) + SourceIndex(0) --- >>> __decorate([ 1 >^^^^ @@ -495,7 +495,7 @@ sourceFile:sourceMapValidationDecorators.ts > private static x1: number = 10; > > -1 >Emitted(43, 5) Source(35, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(43, 5) Source(35, 5) + SourceIndex(0) --- >>> __param(0, ParameterDecorator1), 1->^^^^^^^^ @@ -508,10 +508,10 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ 3 > ParameterDecorator1 4 > -1->Emitted(44, 9) Source(36, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(44, 20) Source(36, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(44, 39) Source(36, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(44, 40) Source(36, 27) + SourceIndex(0) name (Greeter) +1->Emitted(44, 9) Source(36, 7) + SourceIndex(0) +2 >Emitted(44, 20) Source(36, 8) + SourceIndex(0) +3 >Emitted(44, 39) Source(36, 27) + SourceIndex(0) +4 >Emitted(44, 40) Source(36, 27) + SourceIndex(0) --- >>> __param(0, ParameterDecorator2(70)) 1->^^^^^^^^ @@ -529,13 +529,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > 70 6 > ) 7 > -1->Emitted(45, 9) Source(37, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(45, 20) Source(37, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(45, 39) Source(37, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(45, 40) Source(37, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(45, 42) Source(37, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(45, 43) Source(37, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(45, 44) Source(37, 31) + SourceIndex(0) name (Greeter) +1->Emitted(45, 9) Source(37, 7) + SourceIndex(0) +2 >Emitted(45, 20) Source(37, 8) + SourceIndex(0) +3 >Emitted(45, 39) Source(37, 27) + SourceIndex(0) +4 >Emitted(45, 40) Source(37, 28) + SourceIndex(0) +5 >Emitted(45, 42) Source(37, 30) + SourceIndex(0) +6 >Emitted(45, 43) Source(37, 31) + SourceIndex(0) +7 >Emitted(45, 44) Source(37, 31) + SourceIndex(0) --- >>> ], Greeter.prototype, "fn", null); 1 >^^^^^^^ @@ -549,9 +549,9 @@ sourceFile:sourceMapValidationDecorators.ts > x: number) { > return this.greeting; > } -1 >Emitted(46, 8) Source(35, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(46, 31) Source(35, 15) + SourceIndex(0) name (Greeter) -3 >Emitted(46, 39) Source(40, 6) + SourceIndex(0) name (Greeter) +1 >Emitted(46, 8) Source(35, 13) + SourceIndex(0) +2 >Emitted(46, 31) Source(35, 15) + SourceIndex(0) +3 >Emitted(46, 39) Source(40, 6) + SourceIndex(0) --- >>> __decorate([ 1 >^^^^ @@ -559,7 +559,7 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > > -1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -567,8 +567,8 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^^-> 1->@ 2 > PropertyDecorator1 -1->Emitted(48, 9) Source(42, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(48, 27) Source(42, 24) + SourceIndex(0) name (Greeter) +1->Emitted(48, 9) Source(42, 6) + SourceIndex(0) +2 >Emitted(48, 27) Source(42, 24) + SourceIndex(0) --- >>> PropertyDecorator2(80), 1->^^^^^^^^ @@ -583,11 +583,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ( 4 > 80 5 > ) -1->Emitted(49, 9) Source(43, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(49, 27) Source(43, 24) + SourceIndex(0) name (Greeter) -3 >Emitted(49, 28) Source(43, 25) + SourceIndex(0) name (Greeter) -4 >Emitted(49, 30) Source(43, 27) + SourceIndex(0) name (Greeter) -5 >Emitted(49, 31) Source(43, 28) + SourceIndex(0) name (Greeter) +1->Emitted(49, 9) Source(43, 6) + SourceIndex(0) +2 >Emitted(49, 27) Source(43, 24) + SourceIndex(0) +3 >Emitted(49, 28) Source(43, 25) + SourceIndex(0) +4 >Emitted(49, 30) Source(43, 27) + SourceIndex(0) +5 >Emitted(49, 31) Source(43, 28) + SourceIndex(0) --- >>> __param(0, ParameterDecorator1), 1->^^^^^^^^ @@ -605,10 +605,10 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ 3 > ParameterDecorator1 4 > -1->Emitted(50, 9) Source(49, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(50, 20) Source(49, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(50, 39) Source(49, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(50, 40) Source(49, 27) + SourceIndex(0) name (Greeter) +1->Emitted(50, 9) Source(49, 7) + SourceIndex(0) +2 >Emitted(50, 20) Source(49, 8) + SourceIndex(0) +3 >Emitted(50, 39) Source(49, 27) + SourceIndex(0) +4 >Emitted(50, 40) Source(49, 27) + SourceIndex(0) --- >>> __param(0, ParameterDecorator2(90)) 1->^^^^^^^^ @@ -627,13 +627,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > 90 6 > ) 7 > -1->Emitted(51, 9) Source(50, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(51, 20) Source(50, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(51, 39) Source(50, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(51, 40) Source(50, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(51, 42) Source(50, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(51, 43) Source(50, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(51, 44) Source(50, 31) + SourceIndex(0) name (Greeter) +1->Emitted(51, 9) Source(50, 7) + SourceIndex(0) +2 >Emitted(51, 20) Source(50, 8) + SourceIndex(0) +3 >Emitted(51, 39) Source(50, 27) + SourceIndex(0) +4 >Emitted(51, 40) Source(50, 28) + SourceIndex(0) +5 >Emitted(51, 42) Source(50, 30) + SourceIndex(0) +6 >Emitted(51, 43) Source(50, 31) + SourceIndex(0) +7 >Emitted(51, 44) Source(50, 31) + SourceIndex(0) --- >>> ], Greeter.prototype, "greetings", null); 1->^^^^^^^ @@ -644,15 +644,15 @@ sourceFile:sourceMapValidationDecorators.ts 3 > () { > return this.greeting; > } -1->Emitted(52, 8) Source(44, 9) + SourceIndex(0) name (Greeter) -2 >Emitted(52, 38) Source(44, 18) + SourceIndex(0) name (Greeter) -3 >Emitted(52, 46) Source(46, 6) + SourceIndex(0) name (Greeter) +1->Emitted(52, 8) Source(44, 9) + SourceIndex(0) +2 >Emitted(52, 38) Source(44, 18) + SourceIndex(0) +3 >Emitted(52, 46) Source(46, 6) + SourceIndex(0) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(53, 5) Source(31, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(53, 5) Source(31, 5) + SourceIndex(0) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -660,8 +660,8 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^-> 1->@ 2 > PropertyDecorator1 -1->Emitted(54, 9) Source(31, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(54, 27) Source(31, 24) + SourceIndex(0) name (Greeter) +1->Emitted(54, 9) Source(31, 6) + SourceIndex(0) +2 >Emitted(54, 27) Source(31, 24) + SourceIndex(0) --- >>> PropertyDecorator2(60) 1->^^^^^^^^ @@ -676,11 +676,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ( 4 > 60 5 > ) -1->Emitted(55, 9) Source(32, 6) + SourceIndex(0) name (Greeter) -2 >Emitted(55, 27) Source(32, 24) + SourceIndex(0) name (Greeter) -3 >Emitted(55, 28) Source(32, 25) + SourceIndex(0) name (Greeter) -4 >Emitted(55, 30) Source(32, 27) + SourceIndex(0) name (Greeter) -5 >Emitted(55, 31) Source(32, 28) + SourceIndex(0) name (Greeter) +1->Emitted(55, 9) Source(32, 6) + SourceIndex(0) +2 >Emitted(55, 27) Source(32, 24) + SourceIndex(0) +3 >Emitted(55, 28) Source(32, 25) + SourceIndex(0) +4 >Emitted(55, 30) Source(32, 27) + SourceIndex(0) +5 >Emitted(55, 31) Source(32, 28) + SourceIndex(0) --- >>> ], Greeter, "x1", void 0); 1->^^^^^^^ @@ -690,15 +690,15 @@ sourceFile:sourceMapValidationDecorators.ts > private static 2 > x1 3 > : number = 10; -1->Emitted(56, 8) Source(33, 20) + SourceIndex(0) name (Greeter) -2 >Emitted(56, 21) Source(33, 22) + SourceIndex(0) name (Greeter) -3 >Emitted(56, 31) Source(33, 36) + SourceIndex(0) name (Greeter) +1->Emitted(56, 8) Source(33, 20) + SourceIndex(0) +2 >Emitted(56, 21) Source(33, 22) + SourceIndex(0) +3 >Emitted(56, 31) Source(33, 36) + SourceIndex(0) --- >>> Greeter = __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(57, 5) Source(8, 1) + SourceIndex(0) name (Greeter) +1 >Emitted(57, 5) Source(8, 1) + SourceIndex(0) --- >>> ClassDecorator1, 1->^^^^^^^^ @@ -706,8 +706,8 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^^-> 1->@ 2 > ClassDecorator1 -1->Emitted(58, 9) Source(8, 2) + SourceIndex(0) name (Greeter) -2 >Emitted(58, 24) Source(8, 17) + SourceIndex(0) name (Greeter) +1->Emitted(58, 9) Source(8, 2) + SourceIndex(0) +2 >Emitted(58, 24) Source(8, 17) + SourceIndex(0) --- >>> ClassDecorator2(10), 1->^^^^^^^^ @@ -722,11 +722,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ( 4 > 10 5 > ) -1->Emitted(59, 9) Source(9, 2) + SourceIndex(0) name (Greeter) -2 >Emitted(59, 24) Source(9, 17) + SourceIndex(0) name (Greeter) -3 >Emitted(59, 25) Source(9, 18) + SourceIndex(0) name (Greeter) -4 >Emitted(59, 27) Source(9, 20) + SourceIndex(0) name (Greeter) -5 >Emitted(59, 28) Source(9, 21) + SourceIndex(0) name (Greeter) +1->Emitted(59, 9) Source(9, 2) + SourceIndex(0) +2 >Emitted(59, 24) Source(9, 17) + SourceIndex(0) +3 >Emitted(59, 25) Source(9, 18) + SourceIndex(0) +4 >Emitted(59, 27) Source(9, 20) + SourceIndex(0) +5 >Emitted(59, 28) Source(9, 21) + SourceIndex(0) --- >>> __param(0, ParameterDecorator1), 1->^^^^^^^^ @@ -741,10 +741,10 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ 3 > ParameterDecorator1 4 > -1->Emitted(60, 9) Source(12, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(60, 20) Source(12, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(60, 39) Source(12, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(60, 40) Source(12, 27) + SourceIndex(0) name (Greeter) +1->Emitted(60, 9) Source(12, 7) + SourceIndex(0) +2 >Emitted(60, 20) Source(12, 8) + SourceIndex(0) +3 >Emitted(60, 39) Source(12, 27) + SourceIndex(0) +4 >Emitted(60, 40) Source(12, 27) + SourceIndex(0) --- >>> __param(0, ParameterDecorator2(20)), 1->^^^^^^^^ @@ -762,13 +762,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > 20 6 > ) 7 > -1->Emitted(61, 9) Source(13, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(61, 20) Source(13, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(61, 39) Source(13, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(61, 40) Source(13, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(61, 42) Source(13, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(61, 43) Source(13, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(61, 44) Source(13, 31) + SourceIndex(0) name (Greeter) +1->Emitted(61, 9) Source(13, 7) + SourceIndex(0) +2 >Emitted(61, 20) Source(13, 8) + SourceIndex(0) +3 >Emitted(61, 39) Source(13, 27) + SourceIndex(0) +4 >Emitted(61, 40) Source(13, 28) + SourceIndex(0) +5 >Emitted(61, 42) Source(13, 30) + SourceIndex(0) +6 >Emitted(61, 43) Source(13, 31) + SourceIndex(0) +7 >Emitted(61, 44) Source(13, 31) + SourceIndex(0) --- >>> __param(1, ParameterDecorator1), 1 >^^^^^^^^ @@ -783,10 +783,10 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ 3 > ParameterDecorator1 4 > -1 >Emitted(62, 9) Source(16, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(62, 20) Source(16, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(62, 39) Source(16, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(62, 40) Source(16, 27) + SourceIndex(0) name (Greeter) +1 >Emitted(62, 9) Source(16, 7) + SourceIndex(0) +2 >Emitted(62, 20) Source(16, 8) + SourceIndex(0) +3 >Emitted(62, 39) Source(16, 27) + SourceIndex(0) +4 >Emitted(62, 40) Source(16, 27) + SourceIndex(0) --- >>> __param(1, ParameterDecorator2(30)) 1->^^^^^^^^ @@ -804,13 +804,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > 30 6 > ) 7 > -1->Emitted(63, 9) Source(17, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(63, 20) Source(17, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(63, 39) Source(17, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(63, 40) Source(17, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(63, 42) Source(17, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(63, 43) Source(17, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(63, 44) Source(17, 31) + SourceIndex(0) name (Greeter) +1->Emitted(63, 9) Source(17, 7) + SourceIndex(0) +2 >Emitted(63, 20) Source(17, 8) + SourceIndex(0) +3 >Emitted(63, 39) Source(17, 27) + SourceIndex(0) +4 >Emitted(63, 40) Source(17, 28) + SourceIndex(0) +5 >Emitted(63, 42) Source(17, 30) + SourceIndex(0) +6 >Emitted(63, 43) Source(17, 31) + SourceIndex(0) +7 >Emitted(63, 44) Source(17, 31) + SourceIndex(0) --- >>> ], Greeter); 1 >^^^^^^^^^^^^^^^^ @@ -853,15 +853,15 @@ sourceFile:sourceMapValidationDecorators.ts > this.greeting = greetings; > } >} -1 >Emitted(64, 17) Source(54, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(64, 17) Source(54, 2) + SourceIndex(0) --- >>> return Greeter; 1->^^^^ 2 > ^^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(65, 5) Source(54, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0) name (Greeter) +1->Emitted(65, 5) Source(54, 1) + SourceIndex(0) +2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -919,8 +919,8 @@ sourceFile:sourceMapValidationDecorators.ts > this.greeting = greetings; > } > } -1 >Emitted(66, 1) Source(54, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(66, 2) Source(54, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(66, 1) Source(54, 1) + SourceIndex(0) +2 >Emitted(66, 2) Source(54, 2) + SourceIndex(0) 3 >Emitted(66, 2) Source(8, 1) + SourceIndex(0) 4 >Emitted(66, 6) Source(54, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationEnums.js.map b/tests/baselines/reference/sourceMapValidationEnums.js.map index 4729c3749b338..9b1ad5bf1571d 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.js.map +++ b/tests/baselines/reference/sourceMapValidationEnums.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationEnums.js.map] -{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":["e","e2","e3"],"mappings":"AAAA,IAAK,CAIJ;AAJD,WAAK,CAAC;IACFA,mBAACA,CAAAA;IACDA,mBAACA,CAAAA;IACDA,mBAACA,CAAAA;AACLA,CAACA,EAJI,CAAC,KAAD,CAAC,QAIL;AACD,IAAK,EAKJ;AALD,WAAK,EAAE;IACHC,sBAAMA,CAAAA;IACNA,sBAAMA,CAAAA;IACNA,sBAACA,CAAAA;IACDA,wBAAEA,CAAAA;AACNA,CAACA,EALI,EAAE,KAAF,EAAE,QAKN;AACD,IAAK,EACJ;AADD,WAAK,EAAE;AACPC,CAACA,EADI,EAAE,KAAF,EAAE,QACN"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":[],"mappings":"AAAA,IAAK,CAIJ;AAJD,WAAK,CAAC;IACF,mBAAC,CAAA;IACD,mBAAC,CAAA;IACD,mBAAC,CAAA;AACL,CAAC,EAJI,CAAC,KAAD,CAAC,QAIL;AACD,IAAK,EAKJ;AALD,WAAK,EAAE;IACH,sBAAM,CAAA;IACN,sBAAM,CAAA;IACN,sBAAC,CAAA;IACD,wBAAE,CAAA;AACN,CAAC,EALI,EAAE,KAAF,EAAE,QAKN;AACD,IAAK,EACJ;AADD,WAAK,EAAE;AACP,CAAC,EADI,EAAE,KAAF,EAAE,QACN"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt b/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt index 9d8b36ca5ed3b..4fb651552767c 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt @@ -45,9 +45,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > x 3 > -1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (e) -2 >Emitted(3, 24) Source(2, 6) + SourceIndex(0) name (e) -3 >Emitted(3, 25) Source(2, 6) + SourceIndex(0) name (e) +1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 24) Source(2, 6) + SourceIndex(0) +3 >Emitted(3, 25) Source(2, 6) + SourceIndex(0) --- >>> e[e["y"] = 1] = "y"; 1->^^^^ @@ -58,9 +58,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > y 3 > -1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) name (e) -2 >Emitted(4, 24) Source(3, 6) + SourceIndex(0) name (e) -3 >Emitted(4, 25) Source(3, 6) + SourceIndex(0) name (e) +1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(4, 24) Source(3, 6) + SourceIndex(0) +3 >Emitted(4, 25) Source(3, 6) + SourceIndex(0) --- >>> e[e["x"] = 2] = "x"; 1->^^^^ @@ -70,9 +70,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > x 3 > -1->Emitted(5, 5) Source(4, 5) + SourceIndex(0) name (e) -2 >Emitted(5, 24) Source(4, 6) + SourceIndex(0) name (e) -3 >Emitted(5, 25) Source(4, 6) + SourceIndex(0) name (e) +1->Emitted(5, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(5, 24) Source(4, 6) + SourceIndex(0) +3 >Emitted(5, 25) Source(4, 6) + SourceIndex(0) --- >>>})(e || (e = {})); 1 > @@ -94,8 +94,8 @@ sourceFile:sourceMapValidationEnums.ts > y, > x > } -1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) name (e) -2 >Emitted(6, 2) Source(5, 2) + SourceIndex(0) name (e) +1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(6, 4) Source(1, 6) + SourceIndex(0) 4 >Emitted(6, 5) Source(1, 7) + SourceIndex(0) 5 >Emitted(6, 10) Source(1, 6) + SourceIndex(0) @@ -141,9 +141,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > x = 10 3 > -1->Emitted(9, 5) Source(7, 5) + SourceIndex(0) name (e2) -2 >Emitted(9, 27) Source(7, 11) + SourceIndex(0) name (e2) -3 >Emitted(9, 28) Source(7, 11) + SourceIndex(0) name (e2) +1->Emitted(9, 5) Source(7, 5) + SourceIndex(0) +2 >Emitted(9, 27) Source(7, 11) + SourceIndex(0) +3 >Emitted(9, 28) Source(7, 11) + SourceIndex(0) --- >>> e2[e2["y"] = 10] = "y"; 1->^^^^ @@ -154,9 +154,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > y = 10 3 > -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (e2) -2 >Emitted(10, 27) Source(8, 11) + SourceIndex(0) name (e2) -3 >Emitted(10, 28) Source(8, 11) + SourceIndex(0) name (e2) +1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(10, 27) Source(8, 11) + SourceIndex(0) +3 >Emitted(10, 28) Source(8, 11) + SourceIndex(0) --- >>> e2[e2["z"] = 11] = "z"; 1->^^^^ @@ -167,9 +167,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > z 3 > -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (e2) -2 >Emitted(11, 27) Source(9, 6) + SourceIndex(0) name (e2) -3 >Emitted(11, 28) Source(9, 6) + SourceIndex(0) name (e2) +1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(11, 27) Source(9, 6) + SourceIndex(0) +3 >Emitted(11, 28) Source(9, 6) + SourceIndex(0) --- >>> e2[e2["x2"] = 12] = "x2"; 1->^^^^ @@ -179,9 +179,9 @@ sourceFile:sourceMapValidationEnums.ts > 2 > x2 3 > -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (e2) -2 >Emitted(12, 29) Source(10, 7) + SourceIndex(0) name (e2) -3 >Emitted(12, 30) Source(10, 7) + SourceIndex(0) name (e2) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(12, 29) Source(10, 7) + SourceIndex(0) +3 >Emitted(12, 30) Source(10, 7) + SourceIndex(0) --- >>>})(e2 || (e2 = {})); 1 > @@ -204,8 +204,8 @@ sourceFile:sourceMapValidationEnums.ts > z, > x2 > } -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (e2) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (e2) +1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) 3 >Emitted(13, 4) Source(6, 6) + SourceIndex(0) 4 >Emitted(13, 6) Source(6, 8) + SourceIndex(0) 5 >Emitted(13, 11) Source(6, 6) + SourceIndex(0) @@ -256,8 +256,8 @@ sourceFile:sourceMapValidationEnums.ts 6 > e3 7 > { > } -1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) name (e3) -2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) name (e3) +1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) +2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(16, 4) Source(12, 6) + SourceIndex(0) 4 >Emitted(16, 6) Source(12, 8) + SourceIndex(0) 5 >Emitted(16, 11) Source(12, 6) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map index 9ec681ced5284..af1756d07fefe 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignment.js.map] -{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":["a","a.constructor"],"mappings":";IAAA;QAAAA;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IACD,OAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":[],"mappings":";IAAA;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IACD,OAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt index cf4adb6d5eaf3..4946559a1cd9a 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt @@ -19,7 +19,7 @@ sourceFile:sourceMapValidationExportAssignment.ts 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) name (a) +1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -29,16 +29,16 @@ sourceFile:sourceMapValidationExportAssignment.ts > public c; > 2 > } -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (a.constructor) -2 >Emitted(4, 10) Source(3, 2) + SourceIndex(0) name (a.constructor) +1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) +2 >Emitted(4, 10) Source(3, 2) + SourceIndex(0) --- >>> return a; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(5, 17) Source(3, 2) + SourceIndex(0) name (a) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 17) Source(3, 2) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -52,8 +52,8 @@ sourceFile:sourceMapValidationExportAssignment.ts 4 > class a { > public c; > } -1 >Emitted(6, 5) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(6, 6) Source(3, 2) + SourceIndex(0) name (a) +1 >Emitted(6, 5) Source(3, 1) + SourceIndex(0) +2 >Emitted(6, 6) Source(3, 2) + SourceIndex(0) 3 >Emitted(6, 6) Source(1, 1) + SourceIndex(0) 4 >Emitted(6, 10) Source(3, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map index 6da5d0f075ea1..3ff516c9067d3 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignmentCommonjs.js.map] -{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACD,iBAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":[],"mappings":"AAAA;IAAA;IAEA,CAAC;IAAD,QAAC;AAAD,CAAC,AAFD,IAEC;AACD,iBAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt index fc7862c8ad439..73651b7093077 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (a) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -28,16 +28,16 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts > public c; > 2 > } -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor) -2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (a.constructor) +1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) --- >>> return a; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (a) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -51,8 +51,8 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts 4 > class a { > public c; > } -1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (a) +1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map index 81066a66badb7..4f11f33d32224 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map +++ b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationFunctionPropertyAssignment.js.map] -{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":["n"],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,gBAAKA,CAACA,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,gBAAK,CAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt index 52a8bfe688c2a..a1a44c4ffb420 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt @@ -36,8 +36,8 @@ sourceFile:sourceMapValidationFunctionPropertyAssignment.ts 4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0) 5 >Emitted(1, 11) Source(1, 11) + SourceIndex(0) 6 >Emitted(1, 12) Source(1, 12) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 17) + SourceIndex(0) name (n) -8 >Emitted(1, 29) Source(1, 18) + SourceIndex(0) name (n) +7 >Emitted(1, 28) Source(1, 17) + SourceIndex(0) +8 >Emitted(1, 29) Source(1, 18) + SourceIndex(0) 9 >Emitted(1, 31) Source(1, 20) + SourceIndex(0) 10>Emitted(1, 32) Source(1, 21) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapValidationFunctions.js.map b/tests/baselines/reference/sourceMapValidationFunctions.js.map index bb98f5b19d2cd..7578efc11f8e8 100644 --- a/tests/baselines/reference/sourceMapValidationFunctions.js.map +++ b/tests/baselines/reference/sourceMapValidationFunctions.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationFunctions.js.map] -{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":["greet","greet2","foo"],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,eAAe,QAAgB;IAC3BA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,gBAAgB,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IACzEA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,aAAa,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IAEtEA,MAAMA,CAACA;AACXA,CAACA"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,eAAe,QAAgB;IAC3B,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,gBAAgB,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,iBAAM,GAAN,MAAM;IAAc,oBAAuB;SAAvB,WAAuB,CAAvB,sBAAuB,CAAvB,IAAuB;QAAvB,mCAAuB;;IACzE,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,aAAa,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,iBAAM,GAAN,MAAM;IAAc,oBAAuB;SAAvB,WAAuB,CAAvB,sBAAuB,CAAvB,IAAuB;QAAvB,mCAAuB;;IAEtE,MAAM,CAAC;AACX,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt index 830e9c459d7b5..95759f76f165b 100644 --- a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt @@ -52,10 +52,10 @@ sourceFile:sourceMapValidationFunctions.ts 2 > greetings 3 > ++ 4 > ; -1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) name (greet) -2 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) name (greet) -3 >Emitted(3, 16) Source(3, 16) + SourceIndex(0) name (greet) -4 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) name (greet) +1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 16) Source(3, 16) + SourceIndex(0) +4 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) --- >>> return greetings; 1->^^^^ @@ -69,11 +69,11 @@ sourceFile:sourceMapValidationFunctions.ts 3 > 4 > greetings 5 > ; -1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (greet) -2 >Emitted(4, 11) Source(4, 11) + SourceIndex(0) name (greet) -3 >Emitted(4, 12) Source(4, 12) + SourceIndex(0) name (greet) -4 >Emitted(4, 21) Source(4, 21) + SourceIndex(0) name (greet) -5 >Emitted(4, 22) Source(4, 22) + SourceIndex(0) name (greet) +1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(4, 11) + SourceIndex(0) +3 >Emitted(4, 12) Source(4, 12) + SourceIndex(0) +4 >Emitted(4, 21) Source(4, 21) + SourceIndex(0) +5 >Emitted(4, 22) Source(4, 22) + SourceIndex(0) --- >>>} 1 > @@ -82,8 +82,8 @@ sourceFile:sourceMapValidationFunctions.ts 1 > > 2 >} -1 >Emitted(5, 1) Source(5, 1) + SourceIndex(0) name (greet) -2 >Emitted(5, 2) Source(5, 2) + SourceIndex(0) name (greet) +1 >Emitted(5, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(5, 2) + SourceIndex(0) --- >>>function greet2(greeting, n, x) { 1-> @@ -119,10 +119,10 @@ sourceFile:sourceMapValidationFunctions.ts 2 > n = 10 3 > 4 > n = 10 -1->Emitted(7, 5) Source(6, 35) + SourceIndex(0) name (greet2) -2 >Emitted(7, 22) Source(6, 41) + SourceIndex(0) name (greet2) -3 >Emitted(7, 25) Source(6, 35) + SourceIndex(0) name (greet2) -4 >Emitted(7, 31) Source(6, 41) + SourceIndex(0) name (greet2) +1->Emitted(7, 5) Source(6, 35) + SourceIndex(0) +2 >Emitted(7, 22) Source(6, 41) + SourceIndex(0) +3 >Emitted(7, 25) Source(6, 35) + SourceIndex(0) +4 >Emitted(7, 31) Source(6, 41) + SourceIndex(0) --- >>> var restParams = []; 1 >^^^^ @@ -130,8 +130,8 @@ sourceFile:sourceMapValidationFunctions.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >, x?: string, 2 > ...restParams: string[] -1 >Emitted(8, 5) Source(6, 55) + SourceIndex(0) name (greet2) -2 >Emitted(8, 25) Source(6, 78) + SourceIndex(0) name (greet2) +1 >Emitted(8, 5) Source(6, 55) + SourceIndex(0) +2 >Emitted(8, 25) Source(6, 78) + SourceIndex(0) --- >>> for (var _i = 3; _i < arguments.length; _i++) { 1->^^^^^^^^^ @@ -146,20 +146,20 @@ sourceFile:sourceMapValidationFunctions.ts 4 > ...restParams: string[] 5 > 6 > ...restParams: string[] -1->Emitted(9, 10) Source(6, 55) + SourceIndex(0) name (greet2) -2 >Emitted(9, 21) Source(6, 78) + SourceIndex(0) name (greet2) -3 >Emitted(9, 22) Source(6, 55) + SourceIndex(0) name (greet2) -4 >Emitted(9, 44) Source(6, 78) + SourceIndex(0) name (greet2) -5 >Emitted(9, 45) Source(6, 55) + SourceIndex(0) name (greet2) -6 >Emitted(9, 49) Source(6, 78) + SourceIndex(0) name (greet2) +1->Emitted(9, 10) Source(6, 55) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 78) + SourceIndex(0) +3 >Emitted(9, 22) Source(6, 55) + SourceIndex(0) +4 >Emitted(9, 44) Source(6, 78) + SourceIndex(0) +5 >Emitted(9, 45) Source(6, 55) + SourceIndex(0) +6 >Emitted(9, 49) Source(6, 78) + SourceIndex(0) --- >>> restParams[_i - 3] = arguments[_i]; 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 > ...restParams: string[] -1 >Emitted(10, 9) Source(6, 55) + SourceIndex(0) name (greet2) -2 >Emitted(10, 44) Source(6, 78) + SourceIndex(0) name (greet2) +1 >Emitted(10, 9) Source(6, 55) + SourceIndex(0) +2 >Emitted(10, 44) Source(6, 78) + SourceIndex(0) --- >>> } >>> greetings++; @@ -173,10 +173,10 @@ sourceFile:sourceMapValidationFunctions.ts 2 > greetings 3 > ++ 4 > ; -1 >Emitted(12, 5) Source(7, 5) + SourceIndex(0) name (greet2) -2 >Emitted(12, 14) Source(7, 14) + SourceIndex(0) name (greet2) -3 >Emitted(12, 16) Source(7, 16) + SourceIndex(0) name (greet2) -4 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) name (greet2) +1 >Emitted(12, 5) Source(7, 5) + SourceIndex(0) +2 >Emitted(12, 14) Source(7, 14) + SourceIndex(0) +3 >Emitted(12, 16) Source(7, 16) + SourceIndex(0) +4 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) --- >>> return greetings; 1->^^^^ @@ -190,11 +190,11 @@ sourceFile:sourceMapValidationFunctions.ts 3 > 4 > greetings 5 > ; -1->Emitted(13, 5) Source(8, 5) + SourceIndex(0) name (greet2) -2 >Emitted(13, 11) Source(8, 11) + SourceIndex(0) name (greet2) -3 >Emitted(13, 12) Source(8, 12) + SourceIndex(0) name (greet2) -4 >Emitted(13, 21) Source(8, 21) + SourceIndex(0) name (greet2) -5 >Emitted(13, 22) Source(8, 22) + SourceIndex(0) name (greet2) +1->Emitted(13, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(13, 11) Source(8, 11) + SourceIndex(0) +3 >Emitted(13, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(13, 21) Source(8, 21) + SourceIndex(0) +5 >Emitted(13, 22) Source(8, 22) + SourceIndex(0) --- >>>} 1 > @@ -203,8 +203,8 @@ sourceFile:sourceMapValidationFunctions.ts 1 > > 2 >} -1 >Emitted(14, 1) Source(9, 1) + SourceIndex(0) name (greet2) -2 >Emitted(14, 2) Source(9, 2) + SourceIndex(0) name (greet2) +1 >Emitted(14, 1) Source(9, 1) + SourceIndex(0) +2 >Emitted(14, 2) Source(9, 2) + SourceIndex(0) --- >>>function foo(greeting, n, x) { 1-> @@ -240,10 +240,10 @@ sourceFile:sourceMapValidationFunctions.ts 2 > n = 10 3 > 4 > n = 10 -1->Emitted(16, 5) Source(10, 32) + SourceIndex(0) name (foo) -2 >Emitted(16, 22) Source(10, 38) + SourceIndex(0) name (foo) -3 >Emitted(16, 25) Source(10, 32) + SourceIndex(0) name (foo) -4 >Emitted(16, 31) Source(10, 38) + SourceIndex(0) name (foo) +1->Emitted(16, 5) Source(10, 32) + SourceIndex(0) +2 >Emitted(16, 22) Source(10, 38) + SourceIndex(0) +3 >Emitted(16, 25) Source(10, 32) + SourceIndex(0) +4 >Emitted(16, 31) Source(10, 38) + SourceIndex(0) --- >>> var restParams = []; 1 >^^^^ @@ -251,8 +251,8 @@ sourceFile:sourceMapValidationFunctions.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >, x?: string, 2 > ...restParams: string[] -1 >Emitted(17, 5) Source(10, 52) + SourceIndex(0) name (foo) -2 >Emitted(17, 25) Source(10, 75) + SourceIndex(0) name (foo) +1 >Emitted(17, 5) Source(10, 52) + SourceIndex(0) +2 >Emitted(17, 25) Source(10, 75) + SourceIndex(0) --- >>> for (var _i = 3; _i < arguments.length; _i++) { 1->^^^^^^^^^ @@ -267,20 +267,20 @@ sourceFile:sourceMapValidationFunctions.ts 4 > ...restParams: string[] 5 > 6 > ...restParams: string[] -1->Emitted(18, 10) Source(10, 52) + SourceIndex(0) name (foo) -2 >Emitted(18, 21) Source(10, 75) + SourceIndex(0) name (foo) -3 >Emitted(18, 22) Source(10, 52) + SourceIndex(0) name (foo) -4 >Emitted(18, 44) Source(10, 75) + SourceIndex(0) name (foo) -5 >Emitted(18, 45) Source(10, 52) + SourceIndex(0) name (foo) -6 >Emitted(18, 49) Source(10, 75) + SourceIndex(0) name (foo) +1->Emitted(18, 10) Source(10, 52) + SourceIndex(0) +2 >Emitted(18, 21) Source(10, 75) + SourceIndex(0) +3 >Emitted(18, 22) Source(10, 52) + SourceIndex(0) +4 >Emitted(18, 44) Source(10, 75) + SourceIndex(0) +5 >Emitted(18, 45) Source(10, 52) + SourceIndex(0) +6 >Emitted(18, 49) Source(10, 75) + SourceIndex(0) --- >>> restParams[_i - 3] = arguments[_i]; 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 > ...restParams: string[] -1 >Emitted(19, 9) Source(10, 52) + SourceIndex(0) name (foo) -2 >Emitted(19, 44) Source(10, 75) + SourceIndex(0) name (foo) +1 >Emitted(19, 9) Source(10, 52) + SourceIndex(0) +2 >Emitted(19, 44) Source(10, 75) + SourceIndex(0) --- >>> } >>> return; @@ -292,9 +292,9 @@ sourceFile:sourceMapValidationFunctions.ts > 2 > return 3 > ; -1 >Emitted(21, 5) Source(12, 5) + SourceIndex(0) name (foo) -2 >Emitted(21, 11) Source(12, 11) + SourceIndex(0) name (foo) -3 >Emitted(21, 12) Source(12, 12) + SourceIndex(0) name (foo) +1 >Emitted(21, 5) Source(12, 5) + SourceIndex(0) +2 >Emitted(21, 11) Source(12, 11) + SourceIndex(0) +3 >Emitted(21, 12) Source(12, 12) + SourceIndex(0) --- >>>} 1 > @@ -303,7 +303,7 @@ sourceFile:sourceMapValidationFunctions.ts 1 > > 2 >} -1 >Emitted(22, 1) Source(13, 1) + SourceIndex(0) name (foo) -2 >Emitted(22, 2) Source(13, 2) + SourceIndex(0) name (foo) +1 >Emitted(22, 1) Source(13, 1) + SourceIndex(0) +2 >Emitted(22, 2) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationFunctions.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index a5b9c2b03176a..e511c921d4c28 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":["m","m.c","m.c.constructor"],"mappings":"AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACbA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,GAACA,IACbA,CAAAA;AACLA,CAACA,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":"AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACb;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 73d7e48fb2877..4baf1d0811f83 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -49,13 +49,13 @@ sourceFile:sourceMapValidationImport.ts 2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (m) +1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) --- >>> function c() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 5) + SourceIndex(0) name (m.c) +1->Emitted(4, 9) Source(2, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -64,16 +64,16 @@ sourceFile:sourceMapValidationImport.ts 1->export class c { > 2 > } -1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m.c.constructor) -2 >Emitted(5, 10) Source(3, 6) + SourceIndex(0) name (m.c.constructor) +1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) +2 >Emitted(5, 10) Source(3, 6) + SourceIndex(0) --- >>> return c; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(3, 5) + SourceIndex(0) name (m.c) -2 >Emitted(6, 17) Source(3, 6) + SourceIndex(0) name (m.c) +1->Emitted(6, 9) Source(3, 5) + SourceIndex(0) +2 >Emitted(6, 17) Source(3, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -86,10 +86,10 @@ sourceFile:sourceMapValidationImport.ts 3 > 4 > export class c { > } -1 >Emitted(7, 5) Source(3, 5) + SourceIndex(0) name (m.c) -2 >Emitted(7, 6) Source(3, 6) + SourceIndex(0) name (m.c) -3 >Emitted(7, 6) Source(2, 5) + SourceIndex(0) name (m) -4 >Emitted(7, 10) Source(3, 6) + SourceIndex(0) name (m) +1 >Emitted(7, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(3, 6) + SourceIndex(0) +3 >Emitted(7, 6) Source(2, 5) + SourceIndex(0) +4 >Emitted(7, 10) Source(3, 6) + SourceIndex(0) --- >>> m.c = c; 1->^^^^ @@ -102,10 +102,10 @@ sourceFile:sourceMapValidationImport.ts 3 > { > } 4 > -1->Emitted(8, 5) Source(2, 18) + SourceIndex(0) name (m) -2 >Emitted(8, 8) Source(2, 19) + SourceIndex(0) name (m) -3 >Emitted(8, 12) Source(3, 6) + SourceIndex(0) name (m) -4 >Emitted(8, 13) Source(3, 6) + SourceIndex(0) name (m) +1->Emitted(8, 5) Source(2, 18) + SourceIndex(0) +2 >Emitted(8, 8) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 12) Source(3, 6) + SourceIndex(0) +4 >Emitted(8, 13) Source(3, 6) + SourceIndex(0) --- >>>})(m = exports.m || (exports.m = {})); 1-> @@ -130,8 +130,8 @@ sourceFile:sourceMapValidationImport.ts > export class c { > } > } -1->Emitted(9, 1) Source(4, 1) + SourceIndex(0) name (m) -2 >Emitted(9, 2) Source(4, 2) + SourceIndex(0) name (m) +1->Emitted(9, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(9, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(9, 4) Source(1, 15) + SourceIndex(0) 4 >Emitted(9, 5) Source(1, 16) + SourceIndex(0) 5 >Emitted(9, 8) Source(1, 15) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationModule.js.map b/tests/baselines/reference/sourceMapValidationModule.js.map index b56797bbf98ac..4cc15e902ed39 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js.map +++ b/tests/baselines/reference/sourceMapValidationModule.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationModule.js.map] -{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":["m2","m3","m3.m4","m3.foo"],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA,EAAEA,CAACA;AACRA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAOA,EAAEA,CAERA;IAFDA,WAAOA,EAAEA,EAACA,CAACA;QACIC,IAACA,GAAGA,EAAEA,CAACA;IACtBA,CAACA,EAFMD,EAAEA,KAAFA,EAAEA,QAERA;IAEDA;QACIE,MAAMA,CAACA,EAAEA,CAACA,CAACA,CAACA;IAChBA,CAACA;IAFeF,MAAGA,MAElBA,CAAAA;AACLA,CAACA,EARM,EAAE,KAAF,EAAE,QAQR"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE,EAAC,CAAC;IACP,IAAO,EAAE,CAER;IAFD,WAAO,EAAE,EAAC,CAAC;QACI,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER;IAED;QACI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,KAAF,EAAE,QAQR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt index 286fffb44691e..a03e3567b8c73 100644 --- a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt @@ -57,12 +57,12 @@ sourceFile:sourceMapValidationModule.ts 4 > = 5 > 10 6 > ; -1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (m2) -2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) name (m2) -3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) name (m2) -4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) name (m2) -5 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) name (m2) -6 >Emitted(3, 16) Source(2, 16) + SourceIndex(0) name (m2) +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) +5 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) +6 >Emitted(3, 16) Source(2, 16) + SourceIndex(0) --- >>> a++; 1 >^^^^ @@ -75,10 +75,10 @@ sourceFile:sourceMapValidationModule.ts 2 > a 3 > ++ 4 > ; -1 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) name (m2) -2 >Emitted(4, 6) Source(3, 6) + SourceIndex(0) name (m2) -3 >Emitted(4, 8) Source(3, 8) + SourceIndex(0) name (m2) -4 >Emitted(4, 9) Source(3, 9) + SourceIndex(0) name (m2) +1 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(4, 6) Source(3, 6) + SourceIndex(0) +3 >Emitted(4, 8) Source(3, 8) + SourceIndex(0) +4 >Emitted(4, 9) Source(3, 9) + SourceIndex(0) --- >>>})(m2 || (m2 = {})); 1-> @@ -99,8 +99,8 @@ sourceFile:sourceMapValidationModule.ts > var a = 10; > a++; > } -1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) name (m2) -2 >Emitted(5, 2) Source(4, 2) + SourceIndex(0) name (m2) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(5, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(5, 6) Source(1, 10) + SourceIndex(0) 5 >Emitted(5, 11) Source(1, 8) + SourceIndex(0) @@ -161,10 +161,10 @@ sourceFile:sourceMapValidationModule.ts 4 > { > export var x = 30; > } -1 >Emitted(8, 5) Source(6, 5) + SourceIndex(0) name (m3) -2 >Emitted(8, 9) Source(6, 12) + SourceIndex(0) name (m3) -3 >Emitted(8, 11) Source(6, 14) + SourceIndex(0) name (m3) -4 >Emitted(8, 12) Source(8, 6) + SourceIndex(0) name (m3) +1 >Emitted(8, 5) Source(6, 5) + SourceIndex(0) +2 >Emitted(8, 9) Source(6, 12) + SourceIndex(0) +3 >Emitted(8, 11) Source(6, 14) + SourceIndex(0) +4 >Emitted(8, 12) Source(8, 6) + SourceIndex(0) --- >>> (function (m4) { 1->^^^^ @@ -177,11 +177,11 @@ sourceFile:sourceMapValidationModule.ts 3 > m4 4 > 5 > { -1->Emitted(9, 5) Source(6, 5) + SourceIndex(0) name (m3) -2 >Emitted(9, 16) Source(6, 12) + SourceIndex(0) name (m3) -3 >Emitted(9, 18) Source(6, 14) + SourceIndex(0) name (m3) -4 >Emitted(9, 20) Source(6, 15) + SourceIndex(0) name (m3) -5 >Emitted(9, 21) Source(6, 16) + SourceIndex(0) name (m3) +1->Emitted(9, 5) Source(6, 5) + SourceIndex(0) +2 >Emitted(9, 16) Source(6, 12) + SourceIndex(0) +3 >Emitted(9, 18) Source(6, 14) + SourceIndex(0) +4 >Emitted(9, 20) Source(6, 15) + SourceIndex(0) +5 >Emitted(9, 21) Source(6, 16) + SourceIndex(0) --- >>> m4.x = 30; 1 >^^^^^^^^ @@ -196,11 +196,11 @@ sourceFile:sourceMapValidationModule.ts 3 > = 4 > 30 5 > ; -1 >Emitted(10, 9) Source(7, 20) + SourceIndex(0) name (m3.m4) -2 >Emitted(10, 13) Source(7, 21) + SourceIndex(0) name (m3.m4) -3 >Emitted(10, 16) Source(7, 24) + SourceIndex(0) name (m3.m4) -4 >Emitted(10, 18) Source(7, 26) + SourceIndex(0) name (m3.m4) -5 >Emitted(10, 19) Source(7, 27) + SourceIndex(0) name (m3.m4) +1 >Emitted(10, 9) Source(7, 20) + SourceIndex(0) +2 >Emitted(10, 13) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 16) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 18) Source(7, 26) + SourceIndex(0) +5 >Emitted(10, 19) Source(7, 27) + SourceIndex(0) --- >>> })(m4 || (m4 = {})); 1->^^^^ @@ -220,13 +220,13 @@ sourceFile:sourceMapValidationModule.ts 7 > { > export var x = 30; > } -1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m3.m4) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(0) name (m3.m4) -3 >Emitted(11, 8) Source(6, 12) + SourceIndex(0) name (m3) -4 >Emitted(11, 10) Source(6, 14) + SourceIndex(0) name (m3) -5 >Emitted(11, 15) Source(6, 12) + SourceIndex(0) name (m3) -6 >Emitted(11, 17) Source(6, 14) + SourceIndex(0) name (m3) -7 >Emitted(11, 25) Source(8, 6) + SourceIndex(0) name (m3) +1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(11, 6) Source(8, 6) + SourceIndex(0) +3 >Emitted(11, 8) Source(6, 12) + SourceIndex(0) +4 >Emitted(11, 10) Source(6, 14) + SourceIndex(0) +5 >Emitted(11, 15) Source(6, 12) + SourceIndex(0) +6 >Emitted(11, 17) Source(6, 14) + SourceIndex(0) +7 >Emitted(11, 25) Source(8, 6) + SourceIndex(0) --- >>> function foo() { 1 >^^^^ @@ -234,7 +234,7 @@ sourceFile:sourceMapValidationModule.ts 1 > > > -1 >Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (m3) +1 >Emitted(12, 5) Source(10, 5) + SourceIndex(0) --- >>> return m4.x; 1->^^^^^^^^ @@ -252,13 +252,13 @@ sourceFile:sourceMapValidationModule.ts 5 > . 6 > x 7 > ; -1->Emitted(13, 9) Source(11, 9) + SourceIndex(0) name (m3.foo) -2 >Emitted(13, 15) Source(11, 15) + SourceIndex(0) name (m3.foo) -3 >Emitted(13, 16) Source(11, 16) + SourceIndex(0) name (m3.foo) -4 >Emitted(13, 18) Source(11, 18) + SourceIndex(0) name (m3.foo) -5 >Emitted(13, 19) Source(11, 19) + SourceIndex(0) name (m3.foo) -6 >Emitted(13, 20) Source(11, 20) + SourceIndex(0) name (m3.foo) -7 >Emitted(13, 21) Source(11, 21) + SourceIndex(0) name (m3.foo) +1->Emitted(13, 9) Source(11, 9) + SourceIndex(0) +2 >Emitted(13, 15) Source(11, 15) + SourceIndex(0) +3 >Emitted(13, 16) Source(11, 16) + SourceIndex(0) +4 >Emitted(13, 18) Source(11, 18) + SourceIndex(0) +5 >Emitted(13, 19) Source(11, 19) + SourceIndex(0) +6 >Emitted(13, 20) Source(11, 20) + SourceIndex(0) +7 >Emitted(13, 21) Source(11, 21) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -267,8 +267,8 @@ sourceFile:sourceMapValidationModule.ts 1 > > 2 > } -1 >Emitted(14, 5) Source(12, 5) + SourceIndex(0) name (m3.foo) -2 >Emitted(14, 6) Source(12, 6) + SourceIndex(0) name (m3.foo) +1 >Emitted(14, 5) Source(12, 5) + SourceIndex(0) +2 >Emitted(14, 6) Source(12, 6) + SourceIndex(0) --- >>> m3.foo = foo; 1->^^^^ @@ -282,10 +282,10 @@ sourceFile:sourceMapValidationModule.ts > return m4.x; > } 4 > -1->Emitted(15, 5) Source(10, 21) + SourceIndex(0) name (m3) -2 >Emitted(15, 11) Source(10, 24) + SourceIndex(0) name (m3) -3 >Emitted(15, 17) Source(12, 6) + SourceIndex(0) name (m3) -4 >Emitted(15, 18) Source(12, 6) + SourceIndex(0) name (m3) +1->Emitted(15, 5) Source(10, 21) + SourceIndex(0) +2 >Emitted(15, 11) Source(10, 24) + SourceIndex(0) +3 >Emitted(15, 17) Source(12, 6) + SourceIndex(0) +4 >Emitted(15, 18) Source(12, 6) + SourceIndex(0) --- >>>})(m3 || (m3 = {})); 1-> @@ -312,8 +312,8 @@ sourceFile:sourceMapValidationModule.ts > return m4.x; > } > } -1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) name (m3) -2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) name (m3) +1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) +2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(16, 4) Source(5, 8) + SourceIndex(0) 4 >Emitted(16, 6) Source(5, 10) + SourceIndex(0) 5 >Emitted(16, 11) Source(5, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationStatements.js.map b/tests/baselines/reference/sourceMapValidationStatements.js.map index a1ea3b1db796b..b4b5c48fc2237 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.js.map +++ b/tests/baselines/reference/sourceMapValidationStatements.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationStatements.js.map] -{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA;IACIA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":[],"mappings":"AAAA;IACI,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1B,CAAC,IAAI,CAAC,CAAC;QACP,CAAC,IAAI,CAAC,CAAC;IACX,CAAC;IACD,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACT,CAAC,IAAI,CAAC,CAAC;IACX,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,CAAC,IAAI,EAAE,CAAC;QACR,CAAC,EAAE,CAAC;IACR,CAAC;IACD,IAAI,CAAC,GAAG;QACJ,CAAC;QACD,CAAC;QACD,CAAC;KACJ,CAAC;IACF,IAAI,GAAG,GAAG;QACN,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,OAAO;KACb,CAAC;IACF,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACd,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACb,IAAI,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACD,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;IACnB,CAAE;IAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACT,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACb,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACf,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAClB,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACD,MAAM,IAAI,KAAK,EAAE,CAAC;IACtB,CAAE;IAAA,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACV,IAAI,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;YAAS,CAAC;QACP,CAAC,GAAG,EAAE,CAAC;IACX,CAAC;IACD,MAAM,GAAG,EAAE,CAAC;QACR,CAAC,GAAG,CAAC,CAAC;QACN,CAAC,GAAG,EAAE,CAAC;IACX,CAAC;IACD,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACZ,KAAK,CAAC,EAAE,CAAC;YACL,CAAC,EAAE,CAAC;YACJ,KAAK,CAAC;QAEV,CAAC;QACD,KAAK,CAAC,EAAE,CAAC;YACL,CAAC,EAAE,CAAC;YACJ,KAAK,CAAC;QAEV,CAAC;QACD,SAAS,CAAC;YACN,CAAC,IAAI,CAAC,CAAC;YACP,CAAC,GAAG,EAAE,CAAC;YACP,KAAK,CAAC;QAEV,CAAC;IACL,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACZ,CAAC,EAAE,CAAC;IACR,CAAC;IACD,GAAG,CAAC;QACA,CAAC,EAAE,CAAC;IACR,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;IACf,CAAC,GAAG,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC,KAAK,CAAC,CAAC;IACR,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;IACX,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,CAAC;AACX,CAAC;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt index 2a2daed01db76..41212b9b3db51 100644 --- a/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt @@ -25,10 +25,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > var 3 > y 4 > ; -1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (f) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) name (f) -3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0) name (f) -4 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) name (f) +1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) +3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0) +4 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) --- >>> var x = 0; 1->^^^^ @@ -45,12 +45,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > = 5 > 0 6 > ; -1->Emitted(3, 5) Source(3, 5) + SourceIndex(0) name (f) -2 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (f) -3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0) name (f) -4 >Emitted(3, 13) Source(3, 13) + SourceIndex(0) name (f) -5 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) name (f) -6 >Emitted(3, 15) Source(3, 15) + SourceIndex(0) name (f) +1->Emitted(3, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(3, 13) + SourceIndex(0) +5 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) +6 >Emitted(3, 15) Source(3, 15) + SourceIndex(0) --- >>> for (var i = 0; i < 10; i++) { 1->^^^^ @@ -90,24 +90,24 @@ sourceFile:sourceMapValidationStatements.ts 16> ++ 17> ) 18> { -1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (f) -2 >Emitted(4, 8) Source(4, 8) + SourceIndex(0) name (f) -3 >Emitted(4, 9) Source(4, 9) + SourceIndex(0) name (f) -4 >Emitted(4, 10) Source(4, 10) + SourceIndex(0) name (f) -5 >Emitted(4, 13) Source(4, 13) + SourceIndex(0) name (f) -6 >Emitted(4, 14) Source(4, 14) + SourceIndex(0) name (f) -7 >Emitted(4, 15) Source(4, 15) + SourceIndex(0) name (f) -8 >Emitted(4, 18) Source(4, 18) + SourceIndex(0) name (f) -9 >Emitted(4, 19) Source(4, 19) + SourceIndex(0) name (f) -10>Emitted(4, 21) Source(4, 21) + SourceIndex(0) name (f) -11>Emitted(4, 22) Source(4, 22) + SourceIndex(0) name (f) -12>Emitted(4, 25) Source(4, 25) + SourceIndex(0) name (f) -13>Emitted(4, 27) Source(4, 27) + SourceIndex(0) name (f) -14>Emitted(4, 29) Source(4, 29) + SourceIndex(0) name (f) -15>Emitted(4, 30) Source(4, 30) + SourceIndex(0) name (f) -16>Emitted(4, 32) Source(4, 32) + SourceIndex(0) name (f) -17>Emitted(4, 34) Source(4, 34) + SourceIndex(0) name (f) -18>Emitted(4, 35) Source(4, 35) + SourceIndex(0) name (f) +1->Emitted(4, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(4, 8) Source(4, 8) + SourceIndex(0) +3 >Emitted(4, 9) Source(4, 9) + SourceIndex(0) +4 >Emitted(4, 10) Source(4, 10) + SourceIndex(0) +5 >Emitted(4, 13) Source(4, 13) + SourceIndex(0) +6 >Emitted(4, 14) Source(4, 14) + SourceIndex(0) +7 >Emitted(4, 15) Source(4, 15) + SourceIndex(0) +8 >Emitted(4, 18) Source(4, 18) + SourceIndex(0) +9 >Emitted(4, 19) Source(4, 19) + SourceIndex(0) +10>Emitted(4, 21) Source(4, 21) + SourceIndex(0) +11>Emitted(4, 22) Source(4, 22) + SourceIndex(0) +12>Emitted(4, 25) Source(4, 25) + SourceIndex(0) +13>Emitted(4, 27) Source(4, 27) + SourceIndex(0) +14>Emitted(4, 29) Source(4, 29) + SourceIndex(0) +15>Emitted(4, 30) Source(4, 30) + SourceIndex(0) +16>Emitted(4, 32) Source(4, 32) + SourceIndex(0) +17>Emitted(4, 34) Source(4, 34) + SourceIndex(0) +18>Emitted(4, 35) Source(4, 35) + SourceIndex(0) --- >>> x += i; 1 >^^^^^^^^ @@ -122,11 +122,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > += 4 > i 5 > ; -1 >Emitted(5, 9) Source(5, 9) + SourceIndex(0) name (f) -2 >Emitted(5, 10) Source(5, 10) + SourceIndex(0) name (f) -3 >Emitted(5, 14) Source(5, 14) + SourceIndex(0) name (f) -4 >Emitted(5, 15) Source(5, 15) + SourceIndex(0) name (f) -5 >Emitted(5, 16) Source(5, 16) + SourceIndex(0) name (f) +1 >Emitted(5, 9) Source(5, 9) + SourceIndex(0) +2 >Emitted(5, 10) Source(5, 10) + SourceIndex(0) +3 >Emitted(5, 14) Source(5, 14) + SourceIndex(0) +4 >Emitted(5, 15) Source(5, 15) + SourceIndex(0) +5 >Emitted(5, 16) Source(5, 16) + SourceIndex(0) --- >>> x *= 0; 1->^^^^^^^^ @@ -140,11 +140,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > *= 4 > 0 5 > ; -1->Emitted(6, 9) Source(6, 9) + SourceIndex(0) name (f) -2 >Emitted(6, 10) Source(6, 10) + SourceIndex(0) name (f) -3 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) name (f) -4 >Emitted(6, 15) Source(6, 15) + SourceIndex(0) name (f) -5 >Emitted(6, 16) Source(6, 16) + SourceIndex(0) name (f) +1->Emitted(6, 9) Source(6, 9) + SourceIndex(0) +2 >Emitted(6, 10) Source(6, 10) + SourceIndex(0) +3 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) +4 >Emitted(6, 15) Source(6, 15) + SourceIndex(0) +5 >Emitted(6, 16) Source(6, 16) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -153,8 +153,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(7, 5) Source(7, 5) + SourceIndex(0) name (f) -2 >Emitted(7, 6) Source(7, 6) + SourceIndex(0) name (f) +1 >Emitted(7, 5) Source(7, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(7, 6) + SourceIndex(0) --- >>> if (x > 17) { 1->^^^^ @@ -178,16 +178,16 @@ sourceFile:sourceMapValidationStatements.ts 8 > ) 9 > 10> { -1->Emitted(8, 5) Source(8, 5) + SourceIndex(0) name (f) -2 >Emitted(8, 7) Source(8, 7) + SourceIndex(0) name (f) -3 >Emitted(8, 8) Source(8, 8) + SourceIndex(0) name (f) -4 >Emitted(8, 9) Source(8, 9) + SourceIndex(0) name (f) -5 >Emitted(8, 10) Source(8, 10) + SourceIndex(0) name (f) -6 >Emitted(8, 13) Source(8, 13) + SourceIndex(0) name (f) -7 >Emitted(8, 15) Source(8, 15) + SourceIndex(0) name (f) -8 >Emitted(8, 16) Source(8, 16) + SourceIndex(0) name (f) -9 >Emitted(8, 17) Source(8, 17) + SourceIndex(0) name (f) -10>Emitted(8, 18) Source(8, 18) + SourceIndex(0) name (f) +1->Emitted(8, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(8, 7) Source(8, 7) + SourceIndex(0) +3 >Emitted(8, 8) Source(8, 8) + SourceIndex(0) +4 >Emitted(8, 9) Source(8, 9) + SourceIndex(0) +5 >Emitted(8, 10) Source(8, 10) + SourceIndex(0) +6 >Emitted(8, 13) Source(8, 13) + SourceIndex(0) +7 >Emitted(8, 15) Source(8, 15) + SourceIndex(0) +8 >Emitted(8, 16) Source(8, 16) + SourceIndex(0) +9 >Emitted(8, 17) Source(8, 17) + SourceIndex(0) +10>Emitted(8, 18) Source(8, 18) + SourceIndex(0) --- >>> x /= 9; 1 >^^^^^^^^ @@ -201,11 +201,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > /= 4 > 9 5 > ; -1 >Emitted(9, 9) Source(9, 9) + SourceIndex(0) name (f) -2 >Emitted(9, 10) Source(9, 10) + SourceIndex(0) name (f) -3 >Emitted(9, 14) Source(9, 14) + SourceIndex(0) name (f) -4 >Emitted(9, 15) Source(9, 15) + SourceIndex(0) name (f) -5 >Emitted(9, 16) Source(9, 16) + SourceIndex(0) name (f) +1 >Emitted(9, 9) Source(9, 9) + SourceIndex(0) +2 >Emitted(9, 10) Source(9, 10) + SourceIndex(0) +3 >Emitted(9, 14) Source(9, 14) + SourceIndex(0) +4 >Emitted(9, 15) Source(9, 15) + SourceIndex(0) +5 >Emitted(9, 16) Source(9, 16) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -214,8 +214,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(10, 5) Source(10, 5) + SourceIndex(0) name (f) -2 >Emitted(10, 6) Source(10, 6) + SourceIndex(0) name (f) +1 >Emitted(10, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(10, 6) Source(10, 6) + SourceIndex(0) --- >>> else { 1->^^^^ @@ -227,10 +227,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > else 3 > 4 > { -1->Emitted(11, 5) Source(10, 7) + SourceIndex(0) name (f) -2 >Emitted(11, 9) Source(10, 11) + SourceIndex(0) name (f) -3 >Emitted(11, 10) Source(10, 12) + SourceIndex(0) name (f) -4 >Emitted(11, 11) Source(10, 13) + SourceIndex(0) name (f) +1->Emitted(11, 5) Source(10, 7) + SourceIndex(0) +2 >Emitted(11, 9) Source(10, 11) + SourceIndex(0) +3 >Emitted(11, 10) Source(10, 12) + SourceIndex(0) +4 >Emitted(11, 11) Source(10, 13) + SourceIndex(0) --- >>> x += 10; 1->^^^^^^^^ @@ -244,11 +244,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > += 4 > 10 5 > ; -1->Emitted(12, 9) Source(11, 9) + SourceIndex(0) name (f) -2 >Emitted(12, 10) Source(11, 10) + SourceIndex(0) name (f) -3 >Emitted(12, 14) Source(11, 14) + SourceIndex(0) name (f) -4 >Emitted(12, 16) Source(11, 16) + SourceIndex(0) name (f) -5 >Emitted(12, 17) Source(11, 17) + SourceIndex(0) name (f) +1->Emitted(12, 9) Source(11, 9) + SourceIndex(0) +2 >Emitted(12, 10) Source(11, 10) + SourceIndex(0) +3 >Emitted(12, 14) Source(11, 14) + SourceIndex(0) +4 >Emitted(12, 16) Source(11, 16) + SourceIndex(0) +5 >Emitted(12, 17) Source(11, 17) + SourceIndex(0) --- >>> x++; 1 >^^^^^^^^ @@ -260,10 +260,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > ++ 4 > ; -1 >Emitted(13, 9) Source(12, 9) + SourceIndex(0) name (f) -2 >Emitted(13, 10) Source(12, 10) + SourceIndex(0) name (f) -3 >Emitted(13, 12) Source(12, 12) + SourceIndex(0) name (f) -4 >Emitted(13, 13) Source(12, 13) + SourceIndex(0) name (f) +1 >Emitted(13, 9) Source(12, 9) + SourceIndex(0) +2 >Emitted(13, 10) Source(12, 10) + SourceIndex(0) +3 >Emitted(13, 12) Source(12, 12) + SourceIndex(0) +4 >Emitted(13, 13) Source(12, 13) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -272,8 +272,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(14, 5) Source(13, 5) + SourceIndex(0) name (f) -2 >Emitted(14, 6) Source(13, 6) + SourceIndex(0) name (f) +1 >Emitted(14, 5) Source(13, 5) + SourceIndex(0) +2 >Emitted(14, 6) Source(13, 6) + SourceIndex(0) --- >>> var a = [ 1->^^^^ @@ -285,10 +285,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > var 3 > a 4 > = -1->Emitted(15, 5) Source(14, 5) + SourceIndex(0) name (f) -2 >Emitted(15, 9) Source(14, 9) + SourceIndex(0) name (f) -3 >Emitted(15, 10) Source(14, 10) + SourceIndex(0) name (f) -4 >Emitted(15, 13) Source(14, 13) + SourceIndex(0) name (f) +1->Emitted(15, 5) Source(14, 5) + SourceIndex(0) +2 >Emitted(15, 9) Source(14, 9) + SourceIndex(0) +3 >Emitted(15, 10) Source(14, 10) + SourceIndex(0) +4 >Emitted(15, 13) Source(14, 13) + SourceIndex(0) --- >>> 1, 1 >^^^^^^^^ @@ -297,8 +297,8 @@ sourceFile:sourceMapValidationStatements.ts 1 >[ > 2 > 1 -1 >Emitted(16, 9) Source(15, 9) + SourceIndex(0) name (f) -2 >Emitted(16, 10) Source(15, 10) + SourceIndex(0) name (f) +1 >Emitted(16, 9) Source(15, 9) + SourceIndex(0) +2 >Emitted(16, 10) Source(15, 10) + SourceIndex(0) --- >>> 2, 1->^^^^^^^^ @@ -307,8 +307,8 @@ sourceFile:sourceMapValidationStatements.ts 1->, > 2 > 2 -1->Emitted(17, 9) Source(16, 9) + SourceIndex(0) name (f) -2 >Emitted(17, 10) Source(16, 10) + SourceIndex(0) name (f) +1->Emitted(17, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(17, 10) Source(16, 10) + SourceIndex(0) --- >>> 3 1->^^^^^^^^ @@ -316,8 +316,8 @@ sourceFile:sourceMapValidationStatements.ts 1->, > 2 > 3 -1->Emitted(18, 9) Source(17, 9) + SourceIndex(0) name (f) -2 >Emitted(18, 10) Source(17, 10) + SourceIndex(0) name (f) +1->Emitted(18, 9) Source(17, 9) + SourceIndex(0) +2 >Emitted(18, 10) Source(17, 10) + SourceIndex(0) --- >>> ]; 1 >^^^^^ @@ -326,8 +326,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > ] 2 > ; -1 >Emitted(19, 6) Source(18, 6) + SourceIndex(0) name (f) -2 >Emitted(19, 7) Source(18, 7) + SourceIndex(0) name (f) +1 >Emitted(19, 6) Source(18, 6) + SourceIndex(0) +2 >Emitted(19, 7) Source(18, 7) + SourceIndex(0) --- >>> var obj = { 1->^^^^ @@ -339,10 +339,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > var 3 > obj 4 > = -1->Emitted(20, 5) Source(19, 5) + SourceIndex(0) name (f) -2 >Emitted(20, 9) Source(19, 9) + SourceIndex(0) name (f) -3 >Emitted(20, 12) Source(19, 12) + SourceIndex(0) name (f) -4 >Emitted(20, 15) Source(19, 15) + SourceIndex(0) name (f) +1->Emitted(20, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(20, 9) Source(19, 9) + SourceIndex(0) +3 >Emitted(20, 12) Source(19, 12) + SourceIndex(0) +4 >Emitted(20, 15) Source(19, 15) + SourceIndex(0) --- >>> z: 1, 1 >^^^^^^^^ @@ -355,10 +355,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > z 3 > : 4 > 1 -1 >Emitted(21, 9) Source(20, 9) + SourceIndex(0) name (f) -2 >Emitted(21, 10) Source(20, 10) + SourceIndex(0) name (f) -3 >Emitted(21, 12) Source(20, 12) + SourceIndex(0) name (f) -4 >Emitted(21, 13) Source(20, 13) + SourceIndex(0) name (f) +1 >Emitted(21, 9) Source(20, 9) + SourceIndex(0) +2 >Emitted(21, 10) Source(20, 10) + SourceIndex(0) +3 >Emitted(21, 12) Source(20, 12) + SourceIndex(0) +4 >Emitted(21, 13) Source(20, 13) + SourceIndex(0) --- >>> q: "hello" 1->^^^^^^^^ @@ -370,10 +370,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > q 3 > : 4 > "hello" -1->Emitted(22, 9) Source(21, 9) + SourceIndex(0) name (f) -2 >Emitted(22, 10) Source(21, 10) + SourceIndex(0) name (f) -3 >Emitted(22, 12) Source(21, 12) + SourceIndex(0) name (f) -4 >Emitted(22, 19) Source(21, 19) + SourceIndex(0) name (f) +1->Emitted(22, 9) Source(21, 9) + SourceIndex(0) +2 >Emitted(22, 10) Source(21, 10) + SourceIndex(0) +3 >Emitted(22, 12) Source(21, 12) + SourceIndex(0) +4 >Emitted(22, 19) Source(21, 19) + SourceIndex(0) --- >>> }; 1 >^^^^^ @@ -382,8 +382,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > } 2 > ; -1 >Emitted(23, 6) Source(22, 6) + SourceIndex(0) name (f) -2 >Emitted(23, 7) Source(22, 7) + SourceIndex(0) name (f) +1 >Emitted(23, 6) Source(22, 6) + SourceIndex(0) +2 >Emitted(23, 7) Source(22, 7) + SourceIndex(0) --- >>> for (var j in a) { 1->^^^^ @@ -411,18 +411,18 @@ sourceFile:sourceMapValidationStatements.ts 10> ) 11> 12> { -1->Emitted(24, 5) Source(23, 5) + SourceIndex(0) name (f) -2 >Emitted(24, 8) Source(23, 8) + SourceIndex(0) name (f) -3 >Emitted(24, 9) Source(23, 9) + SourceIndex(0) name (f) -4 >Emitted(24, 10) Source(23, 10) + SourceIndex(0) name (f) -5 >Emitted(24, 13) Source(23, 13) + SourceIndex(0) name (f) -6 >Emitted(24, 14) Source(23, 14) + SourceIndex(0) name (f) -7 >Emitted(24, 15) Source(23, 15) + SourceIndex(0) name (f) -8 >Emitted(24, 19) Source(23, 19) + SourceIndex(0) name (f) -9 >Emitted(24, 20) Source(23, 20) + SourceIndex(0) name (f) -10>Emitted(24, 21) Source(23, 21) + SourceIndex(0) name (f) -11>Emitted(24, 22) Source(23, 22) + SourceIndex(0) name (f) -12>Emitted(24, 23) Source(23, 23) + SourceIndex(0) name (f) +1->Emitted(24, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(24, 8) Source(23, 8) + SourceIndex(0) +3 >Emitted(24, 9) Source(23, 9) + SourceIndex(0) +4 >Emitted(24, 10) Source(23, 10) + SourceIndex(0) +5 >Emitted(24, 13) Source(23, 13) + SourceIndex(0) +6 >Emitted(24, 14) Source(23, 14) + SourceIndex(0) +7 >Emitted(24, 15) Source(23, 15) + SourceIndex(0) +8 >Emitted(24, 19) Source(23, 19) + SourceIndex(0) +9 >Emitted(24, 20) Source(23, 20) + SourceIndex(0) +10>Emitted(24, 21) Source(23, 21) + SourceIndex(0) +11>Emitted(24, 22) Source(23, 22) + SourceIndex(0) +12>Emitted(24, 23) Source(23, 23) + SourceIndex(0) --- >>> obj.z = a[j]; 1 >^^^^^^^^ @@ -446,16 +446,16 @@ sourceFile:sourceMapValidationStatements.ts 8 > j 9 > ] 10> ; -1 >Emitted(25, 9) Source(24, 9) + SourceIndex(0) name (f) -2 >Emitted(25, 12) Source(24, 12) + SourceIndex(0) name (f) -3 >Emitted(25, 13) Source(24, 13) + SourceIndex(0) name (f) -4 >Emitted(25, 14) Source(24, 14) + SourceIndex(0) name (f) -5 >Emitted(25, 17) Source(24, 17) + SourceIndex(0) name (f) -6 >Emitted(25, 18) Source(24, 18) + SourceIndex(0) name (f) -7 >Emitted(25, 19) Source(24, 19) + SourceIndex(0) name (f) -8 >Emitted(25, 20) Source(24, 20) + SourceIndex(0) name (f) -9 >Emitted(25, 21) Source(24, 21) + SourceIndex(0) name (f) -10>Emitted(25, 22) Source(24, 22) + SourceIndex(0) name (f) +1 >Emitted(25, 9) Source(24, 9) + SourceIndex(0) +2 >Emitted(25, 12) Source(24, 12) + SourceIndex(0) +3 >Emitted(25, 13) Source(24, 13) + SourceIndex(0) +4 >Emitted(25, 14) Source(24, 14) + SourceIndex(0) +5 >Emitted(25, 17) Source(24, 17) + SourceIndex(0) +6 >Emitted(25, 18) Source(24, 18) + SourceIndex(0) +7 >Emitted(25, 19) Source(24, 19) + SourceIndex(0) +8 >Emitted(25, 20) Source(24, 20) + SourceIndex(0) +9 >Emitted(25, 21) Source(24, 21) + SourceIndex(0) +10>Emitted(25, 22) Source(24, 22) + SourceIndex(0) --- >>> var v = 10; 1 >^^^^^^^^ @@ -471,12 +471,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > = 5 > 10 6 > ; -1 >Emitted(26, 9) Source(25, 9) + SourceIndex(0) name (f) -2 >Emitted(26, 13) Source(25, 13) + SourceIndex(0) name (f) -3 >Emitted(26, 14) Source(25, 14) + SourceIndex(0) name (f) -4 >Emitted(26, 17) Source(25, 17) + SourceIndex(0) name (f) -5 >Emitted(26, 19) Source(25, 19) + SourceIndex(0) name (f) -6 >Emitted(26, 20) Source(25, 20) + SourceIndex(0) name (f) +1 >Emitted(26, 9) Source(25, 9) + SourceIndex(0) +2 >Emitted(26, 13) Source(25, 13) + SourceIndex(0) +3 >Emitted(26, 14) Source(25, 14) + SourceIndex(0) +4 >Emitted(26, 17) Source(25, 17) + SourceIndex(0) +5 >Emitted(26, 19) Source(25, 19) + SourceIndex(0) +6 >Emitted(26, 20) Source(25, 20) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -485,8 +485,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(27, 5) Source(26, 5) + SourceIndex(0) name (f) -2 >Emitted(27, 6) Source(26, 6) + SourceIndex(0) name (f) +1 >Emitted(27, 5) Source(26, 5) + SourceIndex(0) +2 >Emitted(27, 6) Source(26, 6) + SourceIndex(0) --- >>> try { 1->^^^^ @@ -497,9 +497,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > try 3 > { -1->Emitted(28, 5) Source(27, 5) + SourceIndex(0) name (f) -2 >Emitted(28, 9) Source(27, 9) + SourceIndex(0) name (f) -3 >Emitted(28, 10) Source(27, 10) + SourceIndex(0) name (f) +1->Emitted(28, 5) Source(27, 5) + SourceIndex(0) +2 >Emitted(28, 9) Source(27, 9) + SourceIndex(0) +3 >Emitted(28, 10) Source(27, 10) + SourceIndex(0) --- >>> obj.q = "ohhh"; 1->^^^^^^^^ @@ -517,13 +517,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > = 6 > "ohhh" 7 > ; -1->Emitted(29, 9) Source(28, 9) + SourceIndex(0) name (f) -2 >Emitted(29, 12) Source(28, 12) + SourceIndex(0) name (f) -3 >Emitted(29, 13) Source(28, 13) + SourceIndex(0) name (f) -4 >Emitted(29, 14) Source(28, 14) + SourceIndex(0) name (f) -5 >Emitted(29, 17) Source(28, 17) + SourceIndex(0) name (f) -6 >Emitted(29, 23) Source(28, 23) + SourceIndex(0) name (f) -7 >Emitted(29, 24) Source(28, 24) + SourceIndex(0) name (f) +1->Emitted(29, 9) Source(28, 9) + SourceIndex(0) +2 >Emitted(29, 12) Source(28, 12) + SourceIndex(0) +3 >Emitted(29, 13) Source(28, 13) + SourceIndex(0) +4 >Emitted(29, 14) Source(28, 14) + SourceIndex(0) +5 >Emitted(29, 17) Source(28, 17) + SourceIndex(0) +6 >Emitted(29, 23) Source(28, 23) + SourceIndex(0) +7 >Emitted(29, 24) Source(28, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -532,8 +532,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(30, 5) Source(29, 5) + SourceIndex(0) name (f) -2 >Emitted(30, 6) Source(29, 7) + SourceIndex(0) name (f) +1 >Emitted(30, 5) Source(29, 5) + SourceIndex(0) +2 >Emitted(30, 6) Source(29, 7) + SourceIndex(0) --- >>> catch (e) { 1->^^^^ @@ -553,14 +553,14 @@ sourceFile:sourceMapValidationStatements.ts 6 > ) 7 > 8 > { -1->Emitted(31, 5) Source(29, 7) + SourceIndex(0) name (f) -2 >Emitted(31, 10) Source(29, 12) + SourceIndex(0) name (f) -3 >Emitted(31, 11) Source(29, 13) + SourceIndex(0) name (f) -4 >Emitted(31, 12) Source(29, 14) + SourceIndex(0) name (f) -5 >Emitted(31, 13) Source(29, 15) + SourceIndex(0) name (f) -6 >Emitted(31, 14) Source(29, 16) + SourceIndex(0) name (f) -7 >Emitted(31, 15) Source(29, 17) + SourceIndex(0) name (f) -8 >Emitted(31, 16) Source(29, 18) + SourceIndex(0) name (f) +1->Emitted(31, 5) Source(29, 7) + SourceIndex(0) +2 >Emitted(31, 10) Source(29, 12) + SourceIndex(0) +3 >Emitted(31, 11) Source(29, 13) + SourceIndex(0) +4 >Emitted(31, 12) Source(29, 14) + SourceIndex(0) +5 >Emitted(31, 13) Source(29, 15) + SourceIndex(0) +6 >Emitted(31, 14) Source(29, 16) + SourceIndex(0) +7 >Emitted(31, 15) Source(29, 17) + SourceIndex(0) +8 >Emitted(31, 16) Source(29, 18) + SourceIndex(0) --- >>> if (obj.z < 10) { 1->^^^^^^^^ @@ -588,18 +588,18 @@ sourceFile:sourceMapValidationStatements.ts 10> ) 11> 12> { -1->Emitted(32, 9) Source(30, 9) + SourceIndex(0) name (f) -2 >Emitted(32, 11) Source(30, 11) + SourceIndex(0) name (f) -3 >Emitted(32, 12) Source(30, 12) + SourceIndex(0) name (f) -4 >Emitted(32, 13) Source(30, 13) + SourceIndex(0) name (f) -5 >Emitted(32, 16) Source(30, 16) + SourceIndex(0) name (f) -6 >Emitted(32, 17) Source(30, 17) + SourceIndex(0) name (f) -7 >Emitted(32, 18) Source(30, 18) + SourceIndex(0) name (f) -8 >Emitted(32, 21) Source(30, 21) + SourceIndex(0) name (f) -9 >Emitted(32, 23) Source(30, 23) + SourceIndex(0) name (f) -10>Emitted(32, 24) Source(30, 24) + SourceIndex(0) name (f) -11>Emitted(32, 25) Source(30, 25) + SourceIndex(0) name (f) -12>Emitted(32, 26) Source(30, 26) + SourceIndex(0) name (f) +1->Emitted(32, 9) Source(30, 9) + SourceIndex(0) +2 >Emitted(32, 11) Source(30, 11) + SourceIndex(0) +3 >Emitted(32, 12) Source(30, 12) + SourceIndex(0) +4 >Emitted(32, 13) Source(30, 13) + SourceIndex(0) +5 >Emitted(32, 16) Source(30, 16) + SourceIndex(0) +6 >Emitted(32, 17) Source(30, 17) + SourceIndex(0) +7 >Emitted(32, 18) Source(30, 18) + SourceIndex(0) +8 >Emitted(32, 21) Source(30, 21) + SourceIndex(0) +9 >Emitted(32, 23) Source(30, 23) + SourceIndex(0) +10>Emitted(32, 24) Source(30, 24) + SourceIndex(0) +11>Emitted(32, 25) Source(30, 25) + SourceIndex(0) +12>Emitted(32, 26) Source(30, 26) + SourceIndex(0) --- >>> obj.z = 12; 1 >^^^^^^^^^^^^ @@ -617,13 +617,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > = 6 > 12 7 > ; -1 >Emitted(33, 13) Source(31, 13) + SourceIndex(0) name (f) -2 >Emitted(33, 16) Source(31, 16) + SourceIndex(0) name (f) -3 >Emitted(33, 17) Source(31, 17) + SourceIndex(0) name (f) -4 >Emitted(33, 18) Source(31, 18) + SourceIndex(0) name (f) -5 >Emitted(33, 21) Source(31, 21) + SourceIndex(0) name (f) -6 >Emitted(33, 23) Source(31, 23) + SourceIndex(0) name (f) -7 >Emitted(33, 24) Source(31, 24) + SourceIndex(0) name (f) +1 >Emitted(33, 13) Source(31, 13) + SourceIndex(0) +2 >Emitted(33, 16) Source(31, 16) + SourceIndex(0) +3 >Emitted(33, 17) Source(31, 17) + SourceIndex(0) +4 >Emitted(33, 18) Source(31, 18) + SourceIndex(0) +5 >Emitted(33, 21) Source(31, 21) + SourceIndex(0) +6 >Emitted(33, 23) Source(31, 23) + SourceIndex(0) +7 >Emitted(33, 24) Source(31, 24) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -632,8 +632,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(34, 9) Source(32, 9) + SourceIndex(0) name (f) -2 >Emitted(34, 10) Source(32, 10) + SourceIndex(0) name (f) +1 >Emitted(34, 9) Source(32, 9) + SourceIndex(0) +2 >Emitted(34, 10) Source(32, 10) + SourceIndex(0) --- >>> else { 1->^^^^^^^^ @@ -645,10 +645,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > else 3 > 4 > { -1->Emitted(35, 9) Source(32, 11) + SourceIndex(0) name (f) -2 >Emitted(35, 13) Source(32, 15) + SourceIndex(0) name (f) -3 >Emitted(35, 14) Source(32, 16) + SourceIndex(0) name (f) -4 >Emitted(35, 15) Source(32, 17) + SourceIndex(0) name (f) +1->Emitted(35, 9) Source(32, 11) + SourceIndex(0) +2 >Emitted(35, 13) Source(32, 15) + SourceIndex(0) +3 >Emitted(35, 14) Source(32, 16) + SourceIndex(0) +4 >Emitted(35, 15) Source(32, 17) + SourceIndex(0) --- >>> obj.q = "hmm"; 1->^^^^^^^^^^^^ @@ -666,13 +666,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > = 6 > "hmm" 7 > ; -1->Emitted(36, 13) Source(33, 13) + SourceIndex(0) name (f) -2 >Emitted(36, 16) Source(33, 16) + SourceIndex(0) name (f) -3 >Emitted(36, 17) Source(33, 17) + SourceIndex(0) name (f) -4 >Emitted(36, 18) Source(33, 18) + SourceIndex(0) name (f) -5 >Emitted(36, 21) Source(33, 21) + SourceIndex(0) name (f) -6 >Emitted(36, 26) Source(33, 26) + SourceIndex(0) name (f) -7 >Emitted(36, 27) Source(33, 27) + SourceIndex(0) name (f) +1->Emitted(36, 13) Source(33, 13) + SourceIndex(0) +2 >Emitted(36, 16) Source(33, 16) + SourceIndex(0) +3 >Emitted(36, 17) Source(33, 17) + SourceIndex(0) +4 >Emitted(36, 18) Source(33, 18) + SourceIndex(0) +5 >Emitted(36, 21) Source(33, 21) + SourceIndex(0) +6 >Emitted(36, 26) Source(33, 26) + SourceIndex(0) +7 >Emitted(36, 27) Source(33, 27) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -680,8 +680,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(37, 9) Source(34, 9) + SourceIndex(0) name (f) -2 >Emitted(37, 10) Source(34, 10) + SourceIndex(0) name (f) +1 >Emitted(37, 9) Source(34, 9) + SourceIndex(0) +2 >Emitted(37, 10) Source(34, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -690,8 +690,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(38, 5) Source(35, 5) + SourceIndex(0) name (f) -2 >Emitted(38, 6) Source(35, 6) + SourceIndex(0) name (f) +1 >Emitted(38, 5) Source(35, 5) + SourceIndex(0) +2 >Emitted(38, 6) Source(35, 6) + SourceIndex(0) --- >>> try { 1->^^^^ @@ -702,9 +702,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > try 3 > { -1->Emitted(39, 5) Source(36, 5) + SourceIndex(0) name (f) -2 >Emitted(39, 9) Source(36, 9) + SourceIndex(0) name (f) -3 >Emitted(39, 10) Source(36, 10) + SourceIndex(0) name (f) +1->Emitted(39, 5) Source(36, 5) + SourceIndex(0) +2 >Emitted(39, 9) Source(36, 9) + SourceIndex(0) +3 >Emitted(39, 10) Source(36, 10) + SourceIndex(0) --- >>> throw new Error(); 1->^^^^^^^^ @@ -720,12 +720,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > Error 5 > () 6 > ; -1->Emitted(40, 9) Source(37, 9) + SourceIndex(0) name (f) -2 >Emitted(40, 15) Source(37, 15) + SourceIndex(0) name (f) -3 >Emitted(40, 19) Source(37, 19) + SourceIndex(0) name (f) -4 >Emitted(40, 24) Source(37, 24) + SourceIndex(0) name (f) -5 >Emitted(40, 26) Source(37, 26) + SourceIndex(0) name (f) -6 >Emitted(40, 27) Source(37, 27) + SourceIndex(0) name (f) +1->Emitted(40, 9) Source(37, 9) + SourceIndex(0) +2 >Emitted(40, 15) Source(37, 15) + SourceIndex(0) +3 >Emitted(40, 19) Source(37, 19) + SourceIndex(0) +4 >Emitted(40, 24) Source(37, 24) + SourceIndex(0) +5 >Emitted(40, 26) Source(37, 26) + SourceIndex(0) +6 >Emitted(40, 27) Source(37, 27) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -734,8 +734,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(41, 5) Source(38, 5) + SourceIndex(0) name (f) -2 >Emitted(41, 6) Source(38, 7) + SourceIndex(0) name (f) +1 >Emitted(41, 5) Source(38, 5) + SourceIndex(0) +2 >Emitted(41, 6) Source(38, 7) + SourceIndex(0) --- >>> catch (e1) { 1->^^^^ @@ -755,14 +755,14 @@ sourceFile:sourceMapValidationStatements.ts 6 > ) 7 > 8 > { -1->Emitted(42, 5) Source(38, 7) + SourceIndex(0) name (f) -2 >Emitted(42, 10) Source(38, 12) + SourceIndex(0) name (f) -3 >Emitted(42, 11) Source(38, 13) + SourceIndex(0) name (f) -4 >Emitted(42, 12) Source(38, 14) + SourceIndex(0) name (f) -5 >Emitted(42, 14) Source(38, 16) + SourceIndex(0) name (f) -6 >Emitted(42, 15) Source(38, 17) + SourceIndex(0) name (f) -7 >Emitted(42, 16) Source(38, 18) + SourceIndex(0) name (f) -8 >Emitted(42, 17) Source(38, 19) + SourceIndex(0) name (f) +1->Emitted(42, 5) Source(38, 7) + SourceIndex(0) +2 >Emitted(42, 10) Source(38, 12) + SourceIndex(0) +3 >Emitted(42, 11) Source(38, 13) + SourceIndex(0) +4 >Emitted(42, 12) Source(38, 14) + SourceIndex(0) +5 >Emitted(42, 14) Source(38, 16) + SourceIndex(0) +6 >Emitted(42, 15) Source(38, 17) + SourceIndex(0) +7 >Emitted(42, 16) Source(38, 18) + SourceIndex(0) +8 >Emitted(42, 17) Source(38, 19) + SourceIndex(0) --- >>> var b = e1; 1->^^^^^^^^ @@ -778,12 +778,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > = 5 > e1 6 > ; -1->Emitted(43, 9) Source(39, 9) + SourceIndex(0) name (f) -2 >Emitted(43, 13) Source(39, 13) + SourceIndex(0) name (f) -3 >Emitted(43, 14) Source(39, 14) + SourceIndex(0) name (f) -4 >Emitted(43, 17) Source(39, 17) + SourceIndex(0) name (f) -5 >Emitted(43, 19) Source(39, 19) + SourceIndex(0) name (f) -6 >Emitted(43, 20) Source(39, 20) + SourceIndex(0) name (f) +1->Emitted(43, 9) Source(39, 9) + SourceIndex(0) +2 >Emitted(43, 13) Source(39, 13) + SourceIndex(0) +3 >Emitted(43, 14) Source(39, 14) + SourceIndex(0) +4 >Emitted(43, 17) Source(39, 17) + SourceIndex(0) +5 >Emitted(43, 19) Source(39, 19) + SourceIndex(0) +6 >Emitted(43, 20) Source(39, 20) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -792,8 +792,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(44, 5) Source(40, 5) + SourceIndex(0) name (f) -2 >Emitted(44, 6) Source(40, 6) + SourceIndex(0) name (f) +1 >Emitted(44, 5) Source(40, 5) + SourceIndex(0) +2 >Emitted(44, 6) Source(40, 6) + SourceIndex(0) --- >>> finally { 1->^^^^^^^^^^^^ @@ -801,8 +801,8 @@ sourceFile:sourceMapValidationStatements.ts 3 > ^^^-> 1-> finally 2 > { -1->Emitted(45, 13) Source(40, 15) + SourceIndex(0) name (f) -2 >Emitted(45, 14) Source(40, 16) + SourceIndex(0) name (f) +1->Emitted(45, 13) Source(40, 15) + SourceIndex(0) +2 >Emitted(45, 14) Source(40, 16) + SourceIndex(0) --- >>> y = 70; 1->^^^^^^^^ @@ -816,11 +816,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > 70 5 > ; -1->Emitted(46, 9) Source(41, 9) + SourceIndex(0) name (f) -2 >Emitted(46, 10) Source(41, 10) + SourceIndex(0) name (f) -3 >Emitted(46, 13) Source(41, 13) + SourceIndex(0) name (f) -4 >Emitted(46, 15) Source(41, 15) + SourceIndex(0) name (f) -5 >Emitted(46, 16) Source(41, 16) + SourceIndex(0) name (f) +1->Emitted(46, 9) Source(41, 9) + SourceIndex(0) +2 >Emitted(46, 10) Source(41, 10) + SourceIndex(0) +3 >Emitted(46, 13) Source(41, 13) + SourceIndex(0) +4 >Emitted(46, 15) Source(41, 15) + SourceIndex(0) +5 >Emitted(46, 16) Source(41, 16) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -829,8 +829,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) name (f) -2 >Emitted(47, 6) Source(42, 6) + SourceIndex(0) name (f) +1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) +2 >Emitted(47, 6) Source(42, 6) + SourceIndex(0) --- >>> with (obj) { 1->^^^^ @@ -844,11 +844,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > obj 4 > ) 5 > { -1->Emitted(48, 5) Source(43, 5) + SourceIndex(0) name (f) -2 >Emitted(48, 11) Source(43, 11) + SourceIndex(0) name (f) -3 >Emitted(48, 14) Source(43, 14) + SourceIndex(0) name (f) -4 >Emitted(48, 16) Source(43, 16) + SourceIndex(0) name (f) -5 >Emitted(48, 17) Source(43, 17) + SourceIndex(0) name (f) +1->Emitted(48, 5) Source(43, 5) + SourceIndex(0) +2 >Emitted(48, 11) Source(43, 11) + SourceIndex(0) +3 >Emitted(48, 14) Source(43, 14) + SourceIndex(0) +4 >Emitted(48, 16) Source(43, 16) + SourceIndex(0) +5 >Emitted(48, 17) Source(43, 17) + SourceIndex(0) --- >>> i = 2; 1 >^^^^^^^^ @@ -863,11 +863,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > 2 5 > ; -1 >Emitted(49, 9) Source(44, 9) + SourceIndex(0) name (f) -2 >Emitted(49, 10) Source(44, 10) + SourceIndex(0) name (f) -3 >Emitted(49, 13) Source(44, 13) + SourceIndex(0) name (f) -4 >Emitted(49, 14) Source(44, 14) + SourceIndex(0) name (f) -5 >Emitted(49, 15) Source(44, 15) + SourceIndex(0) name (f) +1 >Emitted(49, 9) Source(44, 9) + SourceIndex(0) +2 >Emitted(49, 10) Source(44, 10) + SourceIndex(0) +3 >Emitted(49, 13) Source(44, 13) + SourceIndex(0) +4 >Emitted(49, 14) Source(44, 14) + SourceIndex(0) +5 >Emitted(49, 15) Source(44, 15) + SourceIndex(0) --- >>> z = 10; 1->^^^^^^^^ @@ -881,11 +881,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > 10 5 > ; -1->Emitted(50, 9) Source(45, 9) + SourceIndex(0) name (f) -2 >Emitted(50, 10) Source(45, 10) + SourceIndex(0) name (f) -3 >Emitted(50, 13) Source(45, 13) + SourceIndex(0) name (f) -4 >Emitted(50, 15) Source(45, 15) + SourceIndex(0) name (f) -5 >Emitted(50, 16) Source(45, 16) + SourceIndex(0) name (f) +1->Emitted(50, 9) Source(45, 9) + SourceIndex(0) +2 >Emitted(50, 10) Source(45, 10) + SourceIndex(0) +3 >Emitted(50, 13) Source(45, 13) + SourceIndex(0) +4 >Emitted(50, 15) Source(45, 15) + SourceIndex(0) +5 >Emitted(50, 16) Source(45, 16) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -894,8 +894,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(51, 5) Source(46, 5) + SourceIndex(0) name (f) -2 >Emitted(51, 6) Source(46, 6) + SourceIndex(0) name (f) +1 >Emitted(51, 5) Source(46, 5) + SourceIndex(0) +2 >Emitted(51, 6) Source(46, 6) + SourceIndex(0) --- >>> switch (obj.z) { 1->^^^^ @@ -919,16 +919,16 @@ sourceFile:sourceMapValidationStatements.ts 8 > ) 9 > 10> { -1->Emitted(52, 5) Source(47, 5) + SourceIndex(0) name (f) -2 >Emitted(52, 11) Source(47, 11) + SourceIndex(0) name (f) -3 >Emitted(52, 12) Source(47, 12) + SourceIndex(0) name (f) -4 >Emitted(52, 13) Source(47, 13) + SourceIndex(0) name (f) -5 >Emitted(52, 16) Source(47, 16) + SourceIndex(0) name (f) -6 >Emitted(52, 17) Source(47, 17) + SourceIndex(0) name (f) -7 >Emitted(52, 18) Source(47, 18) + SourceIndex(0) name (f) -8 >Emitted(52, 19) Source(47, 19) + SourceIndex(0) name (f) -9 >Emitted(52, 20) Source(47, 20) + SourceIndex(0) name (f) -10>Emitted(52, 21) Source(47, 21) + SourceIndex(0) name (f) +1->Emitted(52, 5) Source(47, 5) + SourceIndex(0) +2 >Emitted(52, 11) Source(47, 11) + SourceIndex(0) +3 >Emitted(52, 12) Source(47, 12) + SourceIndex(0) +4 >Emitted(52, 13) Source(47, 13) + SourceIndex(0) +5 >Emitted(52, 16) Source(47, 16) + SourceIndex(0) +6 >Emitted(52, 17) Source(47, 17) + SourceIndex(0) +7 >Emitted(52, 18) Source(47, 18) + SourceIndex(0) +8 >Emitted(52, 19) Source(47, 19) + SourceIndex(0) +9 >Emitted(52, 20) Source(47, 20) + SourceIndex(0) +10>Emitted(52, 21) Source(47, 21) + SourceIndex(0) --- >>> case 0: { 1 >^^^^^^^^ @@ -942,11 +942,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > 0 4 > : 5 > { -1 >Emitted(53, 9) Source(48, 9) + SourceIndex(0) name (f) -2 >Emitted(53, 14) Source(48, 14) + SourceIndex(0) name (f) -3 >Emitted(53, 15) Source(48, 15) + SourceIndex(0) name (f) -4 >Emitted(53, 17) Source(48, 17) + SourceIndex(0) name (f) -5 >Emitted(53, 18) Source(48, 18) + SourceIndex(0) name (f) +1 >Emitted(53, 9) Source(48, 9) + SourceIndex(0) +2 >Emitted(53, 14) Source(48, 14) + SourceIndex(0) +3 >Emitted(53, 15) Source(48, 15) + SourceIndex(0) +4 >Emitted(53, 17) Source(48, 17) + SourceIndex(0) +5 >Emitted(53, 18) Source(48, 18) + SourceIndex(0) --- >>> x++; 1 >^^^^^^^^^^^^ @@ -959,10 +959,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > ++ 4 > ; -1 >Emitted(54, 13) Source(49, 13) + SourceIndex(0) name (f) -2 >Emitted(54, 14) Source(49, 14) + SourceIndex(0) name (f) -3 >Emitted(54, 16) Source(49, 16) + SourceIndex(0) name (f) -4 >Emitted(54, 17) Source(49, 17) + SourceIndex(0) name (f) +1 >Emitted(54, 13) Source(49, 13) + SourceIndex(0) +2 >Emitted(54, 14) Source(49, 14) + SourceIndex(0) +3 >Emitted(54, 16) Source(49, 16) + SourceIndex(0) +4 >Emitted(54, 17) Source(49, 17) + SourceIndex(0) --- >>> break; 1->^^^^^^^^^^^^ @@ -972,9 +972,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > break 3 > ; -1->Emitted(55, 13) Source(50, 13) + SourceIndex(0) name (f) -2 >Emitted(55, 18) Source(50, 18) + SourceIndex(0) name (f) -3 >Emitted(55, 19) Source(50, 19) + SourceIndex(0) name (f) +1->Emitted(55, 13) Source(50, 13) + SourceIndex(0) +2 >Emitted(55, 18) Source(50, 18) + SourceIndex(0) +3 >Emitted(55, 19) Source(50, 19) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -984,8 +984,8 @@ sourceFile:sourceMapValidationStatements.ts > > 2 > } -1 >Emitted(56, 9) Source(52, 9) + SourceIndex(0) name (f) -2 >Emitted(56, 10) Source(52, 10) + SourceIndex(0) name (f) +1 >Emitted(56, 9) Source(52, 9) + SourceIndex(0) +2 >Emitted(56, 10) Source(52, 10) + SourceIndex(0) --- >>> case 1: { 1->^^^^^^^^ @@ -999,11 +999,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > 1 4 > : 5 > { -1->Emitted(57, 9) Source(53, 9) + SourceIndex(0) name (f) -2 >Emitted(57, 14) Source(53, 14) + SourceIndex(0) name (f) -3 >Emitted(57, 15) Source(53, 15) + SourceIndex(0) name (f) -4 >Emitted(57, 17) Source(53, 17) + SourceIndex(0) name (f) -5 >Emitted(57, 18) Source(53, 18) + SourceIndex(0) name (f) +1->Emitted(57, 9) Source(53, 9) + SourceIndex(0) +2 >Emitted(57, 14) Source(53, 14) + SourceIndex(0) +3 >Emitted(57, 15) Source(53, 15) + SourceIndex(0) +4 >Emitted(57, 17) Source(53, 17) + SourceIndex(0) +5 >Emitted(57, 18) Source(53, 18) + SourceIndex(0) --- >>> x--; 1 >^^^^^^^^^^^^ @@ -1016,10 +1016,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > -- 4 > ; -1 >Emitted(58, 13) Source(54, 13) + SourceIndex(0) name (f) -2 >Emitted(58, 14) Source(54, 14) + SourceIndex(0) name (f) -3 >Emitted(58, 16) Source(54, 16) + SourceIndex(0) name (f) -4 >Emitted(58, 17) Source(54, 17) + SourceIndex(0) name (f) +1 >Emitted(58, 13) Source(54, 13) + SourceIndex(0) +2 >Emitted(58, 14) Source(54, 14) + SourceIndex(0) +3 >Emitted(58, 16) Source(54, 16) + SourceIndex(0) +4 >Emitted(58, 17) Source(54, 17) + SourceIndex(0) --- >>> break; 1->^^^^^^^^^^^^ @@ -1029,9 +1029,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > break 3 > ; -1->Emitted(59, 13) Source(55, 13) + SourceIndex(0) name (f) -2 >Emitted(59, 18) Source(55, 18) + SourceIndex(0) name (f) -3 >Emitted(59, 19) Source(55, 19) + SourceIndex(0) name (f) +1->Emitted(59, 13) Source(55, 13) + SourceIndex(0) +2 >Emitted(59, 18) Source(55, 18) + SourceIndex(0) +3 >Emitted(59, 19) Source(55, 19) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -1041,8 +1041,8 @@ sourceFile:sourceMapValidationStatements.ts > > 2 > } -1 >Emitted(60, 9) Source(57, 9) + SourceIndex(0) name (f) -2 >Emitted(60, 10) Source(57, 10) + SourceIndex(0) name (f) +1 >Emitted(60, 9) Source(57, 9) + SourceIndex(0) +2 >Emitted(60, 10) Source(57, 10) + SourceIndex(0) --- >>> default: { 1->^^^^^^^^ @@ -1053,9 +1053,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > default: 3 > { -1->Emitted(61, 9) Source(58, 9) + SourceIndex(0) name (f) -2 >Emitted(61, 18) Source(58, 18) + SourceIndex(0) name (f) -3 >Emitted(61, 19) Source(58, 19) + SourceIndex(0) name (f) +1->Emitted(61, 9) Source(58, 9) + SourceIndex(0) +2 >Emitted(61, 18) Source(58, 18) + SourceIndex(0) +3 >Emitted(61, 19) Source(58, 19) + SourceIndex(0) --- >>> x *= 2; 1->^^^^^^^^^^^^ @@ -1070,11 +1070,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > *= 4 > 2 5 > ; -1->Emitted(62, 13) Source(59, 13) + SourceIndex(0) name (f) -2 >Emitted(62, 14) Source(59, 14) + SourceIndex(0) name (f) -3 >Emitted(62, 18) Source(59, 18) + SourceIndex(0) name (f) -4 >Emitted(62, 19) Source(59, 19) + SourceIndex(0) name (f) -5 >Emitted(62, 20) Source(59, 20) + SourceIndex(0) name (f) +1->Emitted(62, 13) Source(59, 13) + SourceIndex(0) +2 >Emitted(62, 14) Source(59, 14) + SourceIndex(0) +3 >Emitted(62, 18) Source(59, 18) + SourceIndex(0) +4 >Emitted(62, 19) Source(59, 19) + SourceIndex(0) +5 >Emitted(62, 20) Source(59, 20) + SourceIndex(0) --- >>> x = 50; 1->^^^^^^^^^^^^ @@ -1088,11 +1088,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > 50 5 > ; -1->Emitted(63, 13) Source(60, 13) + SourceIndex(0) name (f) -2 >Emitted(63, 14) Source(60, 14) + SourceIndex(0) name (f) -3 >Emitted(63, 17) Source(60, 17) + SourceIndex(0) name (f) -4 >Emitted(63, 19) Source(60, 19) + SourceIndex(0) name (f) -5 >Emitted(63, 20) Source(60, 20) + SourceIndex(0) name (f) +1->Emitted(63, 13) Source(60, 13) + SourceIndex(0) +2 >Emitted(63, 14) Source(60, 14) + SourceIndex(0) +3 >Emitted(63, 17) Source(60, 17) + SourceIndex(0) +4 >Emitted(63, 19) Source(60, 19) + SourceIndex(0) +5 >Emitted(63, 20) Source(60, 20) + SourceIndex(0) --- >>> break; 1 >^^^^^^^^^^^^ @@ -1102,9 +1102,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > break 3 > ; -1 >Emitted(64, 13) Source(61, 13) + SourceIndex(0) name (f) -2 >Emitted(64, 18) Source(61, 18) + SourceIndex(0) name (f) -3 >Emitted(64, 19) Source(61, 19) + SourceIndex(0) name (f) +1 >Emitted(64, 13) Source(61, 13) + SourceIndex(0) +2 >Emitted(64, 18) Source(61, 18) + SourceIndex(0) +3 >Emitted(64, 19) Source(61, 19) + SourceIndex(0) --- >>> } 1 >^^^^^^^^ @@ -1113,8 +1113,8 @@ sourceFile:sourceMapValidationStatements.ts > > 2 > } -1 >Emitted(65, 9) Source(63, 9) + SourceIndex(0) name (f) -2 >Emitted(65, 10) Source(63, 10) + SourceIndex(0) name (f) +1 >Emitted(65, 9) Source(63, 9) + SourceIndex(0) +2 >Emitted(65, 10) Source(63, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -1123,8 +1123,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(66, 5) Source(64, 5) + SourceIndex(0) name (f) -2 >Emitted(66, 6) Source(64, 6) + SourceIndex(0) name (f) +1 >Emitted(66, 5) Source(64, 5) + SourceIndex(0) +2 >Emitted(66, 6) Source(64, 6) + SourceIndex(0) --- >>> while (x < 10) { 1->^^^^ @@ -1142,13 +1142,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > 10 6 > ) 7 > { -1->Emitted(67, 5) Source(65, 5) + SourceIndex(0) name (f) -2 >Emitted(67, 12) Source(65, 12) + SourceIndex(0) name (f) -3 >Emitted(67, 13) Source(65, 13) + SourceIndex(0) name (f) -4 >Emitted(67, 16) Source(65, 16) + SourceIndex(0) name (f) -5 >Emitted(67, 18) Source(65, 18) + SourceIndex(0) name (f) -6 >Emitted(67, 20) Source(65, 20) + SourceIndex(0) name (f) -7 >Emitted(67, 21) Source(65, 21) + SourceIndex(0) name (f) +1->Emitted(67, 5) Source(65, 5) + SourceIndex(0) +2 >Emitted(67, 12) Source(65, 12) + SourceIndex(0) +3 >Emitted(67, 13) Source(65, 13) + SourceIndex(0) +4 >Emitted(67, 16) Source(65, 16) + SourceIndex(0) +5 >Emitted(67, 18) Source(65, 18) + SourceIndex(0) +6 >Emitted(67, 20) Source(65, 20) + SourceIndex(0) +7 >Emitted(67, 21) Source(65, 21) + SourceIndex(0) --- >>> x++; 1 >^^^^^^^^ @@ -1160,10 +1160,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > ++ 4 > ; -1 >Emitted(68, 9) Source(66, 9) + SourceIndex(0) name (f) -2 >Emitted(68, 10) Source(66, 10) + SourceIndex(0) name (f) -3 >Emitted(68, 12) Source(66, 12) + SourceIndex(0) name (f) -4 >Emitted(68, 13) Source(66, 13) + SourceIndex(0) name (f) +1 >Emitted(68, 9) Source(66, 9) + SourceIndex(0) +2 >Emitted(68, 10) Source(66, 10) + SourceIndex(0) +3 >Emitted(68, 12) Source(66, 12) + SourceIndex(0) +4 >Emitted(68, 13) Source(66, 13) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -1172,8 +1172,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 > } -1 >Emitted(69, 5) Source(67, 5) + SourceIndex(0) name (f) -2 >Emitted(69, 6) Source(67, 6) + SourceIndex(0) name (f) +1 >Emitted(69, 5) Source(67, 5) + SourceIndex(0) +2 >Emitted(69, 6) Source(67, 6) + SourceIndex(0) --- >>> do { 1->^^^^ @@ -1184,9 +1184,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > do 3 > { -1->Emitted(70, 5) Source(68, 5) + SourceIndex(0) name (f) -2 >Emitted(70, 8) Source(68, 8) + SourceIndex(0) name (f) -3 >Emitted(70, 9) Source(68, 9) + SourceIndex(0) name (f) +1->Emitted(70, 5) Source(68, 5) + SourceIndex(0) +2 >Emitted(70, 8) Source(68, 8) + SourceIndex(0) +3 >Emitted(70, 9) Source(68, 9) + SourceIndex(0) --- >>> x--; 1->^^^^^^^^ @@ -1199,10 +1199,10 @@ sourceFile:sourceMapValidationStatements.ts 2 > x 3 > -- 4 > ; -1->Emitted(71, 9) Source(69, 9) + SourceIndex(0) name (f) -2 >Emitted(71, 10) Source(69, 10) + SourceIndex(0) name (f) -3 >Emitted(71, 12) Source(69, 12) + SourceIndex(0) name (f) -4 >Emitted(71, 13) Source(69, 13) + SourceIndex(0) name (f) +1->Emitted(71, 9) Source(69, 9) + SourceIndex(0) +2 >Emitted(71, 10) Source(69, 10) + SourceIndex(0) +3 >Emitted(71, 12) Source(69, 12) + SourceIndex(0) +4 >Emitted(71, 13) Source(69, 13) + SourceIndex(0) --- >>> } while (x > 4); 1->^^^^ @@ -1220,13 +1220,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > > 6 > 4 7 > ) -1->Emitted(72, 5) Source(70, 5) + SourceIndex(0) name (f) -2 >Emitted(72, 6) Source(70, 6) + SourceIndex(0) name (f) -3 >Emitted(72, 14) Source(70, 14) + SourceIndex(0) name (f) -4 >Emitted(72, 15) Source(70, 15) + SourceIndex(0) name (f) -5 >Emitted(72, 18) Source(70, 18) + SourceIndex(0) name (f) -6 >Emitted(72, 19) Source(70, 19) + SourceIndex(0) name (f) -7 >Emitted(72, 21) Source(70, 20) + SourceIndex(0) name (f) +1->Emitted(72, 5) Source(70, 5) + SourceIndex(0) +2 >Emitted(72, 6) Source(70, 6) + SourceIndex(0) +3 >Emitted(72, 14) Source(70, 14) + SourceIndex(0) +4 >Emitted(72, 15) Source(70, 15) + SourceIndex(0) +5 >Emitted(72, 18) Source(70, 18) + SourceIndex(0) +6 >Emitted(72, 19) Source(70, 19) + SourceIndex(0) +7 >Emitted(72, 21) Source(70, 20) + SourceIndex(0) --- >>> x = y; 1 >^^^^ @@ -1241,11 +1241,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > = 4 > y 5 > ; -1 >Emitted(73, 5) Source(71, 5) + SourceIndex(0) name (f) -2 >Emitted(73, 6) Source(71, 6) + SourceIndex(0) name (f) -3 >Emitted(73, 9) Source(71, 9) + SourceIndex(0) name (f) -4 >Emitted(73, 10) Source(71, 10) + SourceIndex(0) name (f) -5 >Emitted(73, 11) Source(71, 11) + SourceIndex(0) name (f) +1 >Emitted(73, 5) Source(71, 5) + SourceIndex(0) +2 >Emitted(73, 6) Source(71, 6) + SourceIndex(0) +3 >Emitted(73, 9) Source(71, 9) + SourceIndex(0) +4 >Emitted(73, 10) Source(71, 10) + SourceIndex(0) +5 >Emitted(73, 11) Source(71, 11) + SourceIndex(0) --- >>> var z = (x == 1) ? x + 1 : x - 1; 1->^^^^ @@ -1285,24 +1285,24 @@ sourceFile:sourceMapValidationStatements.ts 16> - 17> 1 18> ; -1->Emitted(74, 5) Source(72, 5) + SourceIndex(0) name (f) -2 >Emitted(74, 9) Source(72, 9) + SourceIndex(0) name (f) -3 >Emitted(74, 10) Source(72, 10) + SourceIndex(0) name (f) -4 >Emitted(74, 13) Source(72, 13) + SourceIndex(0) name (f) -5 >Emitted(74, 14) Source(72, 14) + SourceIndex(0) name (f) -6 >Emitted(74, 15) Source(72, 15) + SourceIndex(0) name (f) -7 >Emitted(74, 19) Source(72, 19) + SourceIndex(0) name (f) -8 >Emitted(74, 20) Source(72, 20) + SourceIndex(0) name (f) -9 >Emitted(74, 21) Source(72, 21) + SourceIndex(0) name (f) -10>Emitted(74, 24) Source(72, 24) + SourceIndex(0) name (f) -11>Emitted(74, 25) Source(72, 25) + SourceIndex(0) name (f) -12>Emitted(74, 28) Source(72, 28) + SourceIndex(0) name (f) -13>Emitted(74, 29) Source(72, 29) + SourceIndex(0) name (f) -14>Emitted(74, 32) Source(72, 32) + SourceIndex(0) name (f) -15>Emitted(74, 33) Source(72, 33) + SourceIndex(0) name (f) -16>Emitted(74, 36) Source(72, 36) + SourceIndex(0) name (f) -17>Emitted(74, 37) Source(72, 37) + SourceIndex(0) name (f) -18>Emitted(74, 38) Source(72, 38) + SourceIndex(0) name (f) +1->Emitted(74, 5) Source(72, 5) + SourceIndex(0) +2 >Emitted(74, 9) Source(72, 9) + SourceIndex(0) +3 >Emitted(74, 10) Source(72, 10) + SourceIndex(0) +4 >Emitted(74, 13) Source(72, 13) + SourceIndex(0) +5 >Emitted(74, 14) Source(72, 14) + SourceIndex(0) +6 >Emitted(74, 15) Source(72, 15) + SourceIndex(0) +7 >Emitted(74, 19) Source(72, 19) + SourceIndex(0) +8 >Emitted(74, 20) Source(72, 20) + SourceIndex(0) +9 >Emitted(74, 21) Source(72, 21) + SourceIndex(0) +10>Emitted(74, 24) Source(72, 24) + SourceIndex(0) +11>Emitted(74, 25) Source(72, 25) + SourceIndex(0) +12>Emitted(74, 28) Source(72, 28) + SourceIndex(0) +13>Emitted(74, 29) Source(72, 29) + SourceIndex(0) +14>Emitted(74, 32) Source(72, 32) + SourceIndex(0) +15>Emitted(74, 33) Source(72, 33) + SourceIndex(0) +16>Emitted(74, 36) Source(72, 36) + SourceIndex(0) +17>Emitted(74, 37) Source(72, 37) + SourceIndex(0) +18>Emitted(74, 38) Source(72, 38) + SourceIndex(0) --- >>> (x == 1) ? x + 1 : x - 1; 1 >^^^^ @@ -1336,21 +1336,21 @@ sourceFile:sourceMapValidationStatements.ts 13> - 14> 1 15> ; -1 >Emitted(75, 5) Source(73, 5) + SourceIndex(0) name (f) -2 >Emitted(75, 6) Source(73, 6) + SourceIndex(0) name (f) -3 >Emitted(75, 7) Source(73, 7) + SourceIndex(0) name (f) -4 >Emitted(75, 11) Source(73, 11) + SourceIndex(0) name (f) -5 >Emitted(75, 12) Source(73, 12) + SourceIndex(0) name (f) -6 >Emitted(75, 13) Source(73, 13) + SourceIndex(0) name (f) -7 >Emitted(75, 16) Source(73, 16) + SourceIndex(0) name (f) -8 >Emitted(75, 17) Source(73, 17) + SourceIndex(0) name (f) -9 >Emitted(75, 20) Source(73, 20) + SourceIndex(0) name (f) -10>Emitted(75, 21) Source(73, 21) + SourceIndex(0) name (f) -11>Emitted(75, 24) Source(73, 24) + SourceIndex(0) name (f) -12>Emitted(75, 25) Source(73, 25) + SourceIndex(0) name (f) -13>Emitted(75, 28) Source(73, 28) + SourceIndex(0) name (f) -14>Emitted(75, 29) Source(73, 29) + SourceIndex(0) name (f) -15>Emitted(75, 30) Source(73, 30) + SourceIndex(0) name (f) +1 >Emitted(75, 5) Source(73, 5) + SourceIndex(0) +2 >Emitted(75, 6) Source(73, 6) + SourceIndex(0) +3 >Emitted(75, 7) Source(73, 7) + SourceIndex(0) +4 >Emitted(75, 11) Source(73, 11) + SourceIndex(0) +5 >Emitted(75, 12) Source(73, 12) + SourceIndex(0) +6 >Emitted(75, 13) Source(73, 13) + SourceIndex(0) +7 >Emitted(75, 16) Source(73, 16) + SourceIndex(0) +8 >Emitted(75, 17) Source(73, 17) + SourceIndex(0) +9 >Emitted(75, 20) Source(73, 20) + SourceIndex(0) +10>Emitted(75, 21) Source(73, 21) + SourceIndex(0) +11>Emitted(75, 24) Source(73, 24) + SourceIndex(0) +12>Emitted(75, 25) Source(73, 25) + SourceIndex(0) +13>Emitted(75, 28) Source(73, 28) + SourceIndex(0) +14>Emitted(75, 29) Source(73, 29) + SourceIndex(0) +15>Emitted(75, 30) Source(73, 30) + SourceIndex(0) --- >>> x === 1; 1 >^^^^ @@ -1365,11 +1365,11 @@ sourceFile:sourceMapValidationStatements.ts 3 > === 4 > 1 5 > ; -1 >Emitted(76, 5) Source(74, 5) + SourceIndex(0) name (f) -2 >Emitted(76, 6) Source(74, 6) + SourceIndex(0) name (f) -3 >Emitted(76, 11) Source(74, 11) + SourceIndex(0) name (f) -4 >Emitted(76, 12) Source(74, 12) + SourceIndex(0) name (f) -5 >Emitted(76, 13) Source(74, 13) + SourceIndex(0) name (f) +1 >Emitted(76, 5) Source(74, 5) + SourceIndex(0) +2 >Emitted(76, 6) Source(74, 6) + SourceIndex(0) +3 >Emitted(76, 11) Source(74, 11) + SourceIndex(0) +4 >Emitted(76, 12) Source(74, 12) + SourceIndex(0) +5 >Emitted(76, 13) Source(74, 13) + SourceIndex(0) --- >>> x = z = 40; 1->^^^^ @@ -1387,13 +1387,13 @@ sourceFile:sourceMapValidationStatements.ts 5 > = 6 > 40 7 > ; -1->Emitted(77, 5) Source(75, 5) + SourceIndex(0) name (f) -2 >Emitted(77, 6) Source(75, 6) + SourceIndex(0) name (f) -3 >Emitted(77, 9) Source(75, 9) + SourceIndex(0) name (f) -4 >Emitted(77, 10) Source(75, 10) + SourceIndex(0) name (f) -5 >Emitted(77, 13) Source(75, 13) + SourceIndex(0) name (f) -6 >Emitted(77, 15) Source(75, 15) + SourceIndex(0) name (f) -7 >Emitted(77, 16) Source(75, 16) + SourceIndex(0) name (f) +1->Emitted(77, 5) Source(75, 5) + SourceIndex(0) +2 >Emitted(77, 6) Source(75, 6) + SourceIndex(0) +3 >Emitted(77, 9) Source(75, 9) + SourceIndex(0) +4 >Emitted(77, 10) Source(75, 10) + SourceIndex(0) +5 >Emitted(77, 13) Source(75, 13) + SourceIndex(0) +6 >Emitted(77, 15) Source(75, 15) + SourceIndex(0) +7 >Emitted(77, 16) Source(75, 16) + SourceIndex(0) --- >>> eval("y"); 1 >^^^^ @@ -1409,12 +1409,12 @@ sourceFile:sourceMapValidationStatements.ts 4 > "y" 5 > ) 6 > ; -1 >Emitted(78, 5) Source(76, 5) + SourceIndex(0) name (f) -2 >Emitted(78, 9) Source(76, 9) + SourceIndex(0) name (f) -3 >Emitted(78, 10) Source(76, 10) + SourceIndex(0) name (f) -4 >Emitted(78, 13) Source(76, 13) + SourceIndex(0) name (f) -5 >Emitted(78, 14) Source(76, 14) + SourceIndex(0) name (f) -6 >Emitted(78, 15) Source(76, 15) + SourceIndex(0) name (f) +1 >Emitted(78, 5) Source(76, 5) + SourceIndex(0) +2 >Emitted(78, 9) Source(76, 9) + SourceIndex(0) +3 >Emitted(78, 10) Source(76, 10) + SourceIndex(0) +4 >Emitted(78, 13) Source(76, 13) + SourceIndex(0) +5 >Emitted(78, 14) Source(76, 14) + SourceIndex(0) +6 >Emitted(78, 15) Source(76, 15) + SourceIndex(0) --- >>> return; 1 >^^^^ @@ -1424,9 +1424,9 @@ sourceFile:sourceMapValidationStatements.ts > 2 > return 3 > ; -1 >Emitted(79, 5) Source(77, 5) + SourceIndex(0) name (f) -2 >Emitted(79, 11) Source(77, 11) + SourceIndex(0) name (f) -3 >Emitted(79, 12) Source(77, 12) + SourceIndex(0) name (f) +1 >Emitted(79, 5) Source(77, 5) + SourceIndex(0) +2 >Emitted(79, 11) Source(77, 11) + SourceIndex(0) +3 >Emitted(79, 12) Source(77, 12) + SourceIndex(0) --- >>>} 1 > @@ -1435,8 +1435,8 @@ sourceFile:sourceMapValidationStatements.ts 1 > > 2 >} -1 >Emitted(80, 1) Source(78, 1) + SourceIndex(0) name (f) -2 >Emitted(80, 2) Source(78, 2) + SourceIndex(0) name (f) +1 >Emitted(80, 1) Source(78, 1) + SourceIndex(0) +2 >Emitted(80, 2) Source(78, 2) + SourceIndex(0) --- >>>var b = function () { 1-> diff --git a/tests/baselines/reference/sourceMapValidationWithComments.js.map b/tests/baselines/reference/sourceMapValidationWithComments.js.map index 59c8ee5748e68..4b41c7072359d 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.js.map +++ b/tests/baselines/reference/sourceMapValidationWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationWithComments.js.map] -{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":["DebugClass","DebugClass.constructor","DebugClass.debugFunc"],"mappings":"AAAA;IAAAA;IAoBAC,CAACA;IAlBiBD,oBAASA,GAAvBA;QAEIE,2BAA2BA;QAC3BA,IAAIA,CAACA,GAAGA,CAACA,CAACA;QACVA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,yBAAyBA;QAGzBA,MAAMA,CAACA,IAAIA,CAACA;IAChBA,CAACA;IACLF,iBAACA;AAADA,CAACA,AApBD,IAoBC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":[],"mappings":"AAAA;IAAA;IAoBA,CAAC;IAlBiB,oBAAS,GAAvB;QAEI,2BAA2B;QAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,yBAAyB;QAGzB,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IACL,iBAAC;AAAD,CAAC,AApBD,IAoBC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt index 239a418183fc6..77a63842cc47c 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt @@ -18,7 +18,7 @@ sourceFile:sourceMapValidationWithComments.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (DebugClass) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -46,8 +46,8 @@ sourceFile:sourceMapValidationWithComments.ts > } > 2 > } -1->Emitted(3, 5) Source(21, 1) + SourceIndex(0) name (DebugClass.constructor) -2 >Emitted(3, 6) Source(21, 2) + SourceIndex(0) name (DebugClass.constructor) +1->Emitted(3, 5) Source(21, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(21, 2) + SourceIndex(0) --- >>> DebugClass.debugFunc = function () { 1->^^^^ @@ -57,9 +57,9 @@ sourceFile:sourceMapValidationWithComments.ts 1-> 2 > debugFunc 3 > -1->Emitted(4, 5) Source(3, 19) + SourceIndex(0) name (DebugClass) -2 >Emitted(4, 25) Source(3, 28) + SourceIndex(0) name (DebugClass) -3 >Emitted(4, 28) Source(3, 5) + SourceIndex(0) name (DebugClass) +1->Emitted(4, 5) Source(3, 19) + SourceIndex(0) +2 >Emitted(4, 25) Source(3, 28) + SourceIndex(0) +3 >Emitted(4, 28) Source(3, 5) + SourceIndex(0) --- >>> // Start Debugger Test Code 1->^^^^^^^^ @@ -68,8 +68,8 @@ sourceFile:sourceMapValidationWithComments.ts > > 2 > // Start Debugger Test Code -1->Emitted(5, 9) Source(5, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(5, 36) Source(5, 36) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(5, 9) Source(5, 9) + SourceIndex(0) +2 >Emitted(5, 36) Source(5, 36) + SourceIndex(0) --- >>> var i = 0; 1 >^^^^^^^^ @@ -85,12 +85,12 @@ sourceFile:sourceMapValidationWithComments.ts 4 > = 5 > 0 6 > ; -1 >Emitted(6, 9) Source(6, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(6, 13) Source(6, 13) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) name (DebugClass.debugFunc) -5 >Emitted(6, 18) Source(6, 18) + SourceIndex(0) name (DebugClass.debugFunc) -6 >Emitted(6, 19) Source(6, 19) + SourceIndex(0) name (DebugClass.debugFunc) +1 >Emitted(6, 9) Source(6, 9) + SourceIndex(0) +2 >Emitted(6, 13) Source(6, 13) + SourceIndex(0) +3 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) +4 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) +5 >Emitted(6, 18) Source(6, 18) + SourceIndex(0) +6 >Emitted(6, 19) Source(6, 19) + SourceIndex(0) --- >>> i++; 1 >^^^^^^^^ @@ -103,10 +103,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1 >Emitted(7, 9) Source(7, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(7, 10) Source(7, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(7, 12) Source(7, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(7, 13) Source(7, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1 >Emitted(7, 9) Source(7, 9) + SourceIndex(0) +2 >Emitted(7, 10) Source(7, 10) + SourceIndex(0) +3 >Emitted(7, 12) Source(7, 12) + SourceIndex(0) +4 >Emitted(7, 13) Source(7, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -119,10 +119,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(8, 9) Source(8, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(8, 10) Source(8, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(8, 12) Source(8, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(8, 13) Source(8, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(8, 9) Source(8, 9) + SourceIndex(0) +2 >Emitted(8, 10) Source(8, 10) + SourceIndex(0) +3 >Emitted(8, 12) Source(8, 12) + SourceIndex(0) +4 >Emitted(8, 13) Source(8, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -135,10 +135,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(9, 9) Source(9, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(9, 10) Source(9, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(9, 12) Source(9, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(9, 13) Source(9, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(9, 9) Source(9, 9) + SourceIndex(0) +2 >Emitted(9, 10) Source(9, 10) + SourceIndex(0) +3 >Emitted(9, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(9, 13) Source(9, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -151,10 +151,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(10, 9) Source(10, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(10, 10) Source(10, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(10, 12) Source(10, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(10, 13) Source(10, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(10, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(10, 10) Source(10, 10) + SourceIndex(0) +3 >Emitted(10, 12) Source(10, 12) + SourceIndex(0) +4 >Emitted(10, 13) Source(10, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -167,10 +167,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(11, 9) Source(11, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(11, 10) Source(11, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(11, 12) Source(11, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(11, 13) Source(11, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(11, 9) Source(11, 9) + SourceIndex(0) +2 >Emitted(11, 10) Source(11, 10) + SourceIndex(0) +3 >Emitted(11, 12) Source(11, 12) + SourceIndex(0) +4 >Emitted(11, 13) Source(11, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -183,10 +183,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(12, 9) Source(12, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(12, 10) Source(12, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(12, 12) Source(12, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(12, 13) Source(12, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(12, 9) Source(12, 9) + SourceIndex(0) +2 >Emitted(12, 10) Source(12, 10) + SourceIndex(0) +3 >Emitted(12, 12) Source(12, 12) + SourceIndex(0) +4 >Emitted(12, 13) Source(12, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -199,10 +199,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(13, 9) Source(13, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(13, 10) Source(13, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(13, 12) Source(13, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(13, 13) Source(13, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(13, 9) Source(13, 9) + SourceIndex(0) +2 >Emitted(13, 10) Source(13, 10) + SourceIndex(0) +3 >Emitted(13, 12) Source(13, 12) + SourceIndex(0) +4 >Emitted(13, 13) Source(13, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -215,10 +215,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(14, 9) Source(14, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(14, 10) Source(14, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(14, 12) Source(14, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(14, 13) Source(14, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(14, 9) Source(14, 9) + SourceIndex(0) +2 >Emitted(14, 10) Source(14, 10) + SourceIndex(0) +3 >Emitted(14, 12) Source(14, 12) + SourceIndex(0) +4 >Emitted(14, 13) Source(14, 13) + SourceIndex(0) --- >>> i++; 1->^^^^^^^^ @@ -231,10 +231,10 @@ sourceFile:sourceMapValidationWithComments.ts 2 > i 3 > ++ 4 > ; -1->Emitted(15, 9) Source(15, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(15, 10) Source(15, 10) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(15, 12) Source(15, 12) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(15, 13) Source(15, 13) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(15, 9) Source(15, 9) + SourceIndex(0) +2 >Emitted(15, 10) Source(15, 10) + SourceIndex(0) +3 >Emitted(15, 12) Source(15, 12) + SourceIndex(0) +4 >Emitted(15, 13) Source(15, 13) + SourceIndex(0) --- >>> // End Debugger Test Code 1->^^^^^^^^ @@ -242,8 +242,8 @@ sourceFile:sourceMapValidationWithComments.ts 1-> > 2 > // End Debugger Test Code -1->Emitted(16, 9) Source(16, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(16, 34) Source(16, 34) + SourceIndex(0) name (DebugClass.debugFunc) +1->Emitted(16, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(16, 34) Source(16, 34) + SourceIndex(0) --- >>> return true; 1 >^^^^^^^^ @@ -259,11 +259,11 @@ sourceFile:sourceMapValidationWithComments.ts 3 > 4 > true 5 > ; -1 >Emitted(17, 9) Source(19, 9) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(17, 15) Source(19, 15) + SourceIndex(0) name (DebugClass.debugFunc) -3 >Emitted(17, 16) Source(19, 16) + SourceIndex(0) name (DebugClass.debugFunc) -4 >Emitted(17, 20) Source(19, 20) + SourceIndex(0) name (DebugClass.debugFunc) -5 >Emitted(17, 21) Source(19, 21) + SourceIndex(0) name (DebugClass.debugFunc) +1 >Emitted(17, 9) Source(19, 9) + SourceIndex(0) +2 >Emitted(17, 15) Source(19, 15) + SourceIndex(0) +3 >Emitted(17, 16) Source(19, 16) + SourceIndex(0) +4 >Emitted(17, 20) Source(19, 20) + SourceIndex(0) +5 >Emitted(17, 21) Source(19, 21) + SourceIndex(0) --- >>> }; 1 >^^^^ @@ -272,8 +272,8 @@ sourceFile:sourceMapValidationWithComments.ts 1 > > 2 > } -1 >Emitted(18, 5) Source(20, 5) + SourceIndex(0) name (DebugClass.debugFunc) -2 >Emitted(18, 6) Source(20, 6) + SourceIndex(0) name (DebugClass.debugFunc) +1 >Emitted(18, 5) Source(20, 5) + SourceIndex(0) +2 >Emitted(18, 6) Source(20, 6) + SourceIndex(0) --- >>> return DebugClass; 1->^^^^ @@ -281,8 +281,8 @@ sourceFile:sourceMapValidationWithComments.ts 1-> > 2 > } -1->Emitted(19, 5) Source(21, 1) + SourceIndex(0) name (DebugClass) -2 >Emitted(19, 22) Source(21, 2) + SourceIndex(0) name (DebugClass) +1->Emitted(19, 5) Source(21, 1) + SourceIndex(0) +2 >Emitted(19, 22) Source(21, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -314,8 +314,8 @@ sourceFile:sourceMapValidationWithComments.ts > return true; > } > } -1 >Emitted(20, 1) Source(21, 1) + SourceIndex(0) name (DebugClass) -2 >Emitted(20, 2) Source(21, 2) + SourceIndex(0) name (DebugClass) +1 >Emitted(20, 1) Source(21, 1) + SourceIndex(0) +2 >Emitted(20, 2) Source(21, 2) + SourceIndex(0) 3 >Emitted(20, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(20, 6) Source(21, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map index d10b3f8f28160..f34c47f221010 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD;IAAAE;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC;ACHD;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt index fdc67bf563d8c..a83b5f4bb9c9b 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../testFiles/app.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -46,16 +46,16 @@ sourceFile:../testFiles/app.ts 1->class c { > 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) -2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) --- >>> return c; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) name (c) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -68,8 +68,8 @@ sourceFile:../testFiles/app.ts 3 > 4 > class c { > } -1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (c) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- @@ -87,7 +87,7 @@ sourceFile:../testFiles/app2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) name (d) +1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -96,16 +96,16 @@ sourceFile:../testFiles/app2.ts 1->class d { > 2 > } -1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) -2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) name (d.constructor) +1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) --- >>> return d; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) name (d) -2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) name (d) +1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -118,8 +118,8 @@ sourceFile:../testFiles/app2.ts 3 > 4 > class d { > } -1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1) name (d) -2 >Emitted(12, 2) Source(2, 2) + SourceIndex(1) name (d) +1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1) +2 >Emitted(12, 2) Source(2, 2) + SourceIndex(1) 3 >Emitted(12, 2) Source(1, 1) + SourceIndex(1) 4 >Emitted(12, 6) Source(2, 2) + SourceIndex(1) --- diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map index 5317cf7c306df..7a172c4e0a7f9 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map @@ -1,3 +1,3 @@ //// [app.js.map] -{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":["c","c.constructor"],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] -{"version":3,"file":"app2.js","sourceRoot":"","sources":["../testFiles/app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"}//// [app2.js.map] +{"version":3,"file":"app2.js","sourceRoot":"","sources":["../testFiles/app2.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt index 44dd1b4104852..e02fb678ae288 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:../testFiles/app.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -46,16 +46,16 @@ sourceFile:../testFiles/app.ts 1->class c { > 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) -2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) --- >>> return c; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) name (c) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -68,8 +68,8 @@ sourceFile:../testFiles/app.ts 3 > 4 > class c { > } -1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (c) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- @@ -93,7 +93,7 @@ sourceFile:../testFiles/app2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (d) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -102,16 +102,16 @@ sourceFile:../testFiles/app2.ts 1->class d { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (d.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return d; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (d) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (d) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -124,8 +124,8 @@ sourceFile:../testFiles/app2.ts 3 > 4 > class d { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (d) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (d) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map index bac55383fff05..39f552b2002b5 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["M","m1","m1.c1","m1.c1.constructor"],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACKA,GAACA,GAAGA,CAACA,CAACA;AACrBA,CAACA,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPC;QAAAC;QACAC,CAACA;QAADD,SAACA;IAADA,CAACA,AADDD,IACCA;IADYA,KAAEA,KACdA,CAAAA;AACLA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACK,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACP;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt index 63d4cec6ef17f..7ad34d2976110 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt @@ -55,11 +55,11 @@ sourceFile:tests/cases/compiler/a.ts 3 > = 4 > 1 5 > ; -1 >Emitted(3, 5) Source(2, 16) + SourceIndex(0) name (M) -2 >Emitted(3, 8) Source(2, 17) + SourceIndex(0) name (M) -3 >Emitted(3, 11) Source(2, 20) + SourceIndex(0) name (M) -4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0) name (M) -5 >Emitted(3, 13) Source(2, 22) + SourceIndex(0) name (M) +1 >Emitted(3, 5) Source(2, 16) + SourceIndex(0) +2 >Emitted(3, 8) Source(2, 17) + SourceIndex(0) +3 >Emitted(3, 11) Source(2, 20) + SourceIndex(0) +4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 13) Source(2, 22) + SourceIndex(0) --- >>>})(M || (M = {})); 1-> @@ -79,8 +79,8 @@ sourceFile:tests/cases/compiler/a.ts 7 > { > export var X = 1; > } -1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) name (M) -2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) name (M) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) 3 >Emitted(4, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(4, 5) Source(1, 9) + SourceIndex(0) 5 >Emitted(4, 10) Source(1, 8) + SourceIndex(0) @@ -132,13 +132,13 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(7, 5) Source(2, 5) + SourceIndex(1) name (m1) +1->Emitted(7, 5) Source(2, 5) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(8, 9) Source(2, 5) + SourceIndex(1) name (m1.c1) +1->Emitted(8, 9) Source(2, 5) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -147,16 +147,16 @@ sourceFile:tests/cases/compiler/b.ts 1->export class c1 { > 2 > } -1->Emitted(9, 9) Source(3, 5) + SourceIndex(1) name (m1.c1.constructor) -2 >Emitted(9, 10) Source(3, 6) + SourceIndex(1) name (m1.c1.constructor) +1->Emitted(9, 9) Source(3, 5) + SourceIndex(1) +2 >Emitted(9, 10) Source(3, 6) + SourceIndex(1) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(10, 9) Source(3, 5) + SourceIndex(1) name (m1.c1) -2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1) name (m1.c1) +1->Emitted(10, 9) Source(3, 5) + SourceIndex(1) +2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1) --- >>> })(); 1 >^^^^ @@ -169,10 +169,10 @@ sourceFile:tests/cases/compiler/b.ts 3 > 4 > export class c1 { > } -1 >Emitted(11, 5) Source(3, 5) + SourceIndex(1) name (m1.c1) -2 >Emitted(11, 6) Source(3, 6) + SourceIndex(1) name (m1.c1) -3 >Emitted(11, 6) Source(2, 5) + SourceIndex(1) name (m1) -4 >Emitted(11, 10) Source(3, 6) + SourceIndex(1) name (m1) +1 >Emitted(11, 5) Source(3, 5) + SourceIndex(1) +2 >Emitted(11, 6) Source(3, 6) + SourceIndex(1) +3 >Emitted(11, 6) Source(2, 5) + SourceIndex(1) +4 >Emitted(11, 10) Source(3, 6) + SourceIndex(1) --- >>> m1.c1 = c1; 1->^^^^ @@ -185,10 +185,10 @@ sourceFile:tests/cases/compiler/b.ts 3 > { > } 4 > -1->Emitted(12, 5) Source(2, 18) + SourceIndex(1) name (m1) -2 >Emitted(12, 10) Source(2, 20) + SourceIndex(1) name (m1) -3 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) name (m1) -4 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) name (m1) +1->Emitted(12, 5) Source(2, 18) + SourceIndex(1) +2 >Emitted(12, 10) Source(2, 20) + SourceIndex(1) +3 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) +4 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) --- >>>})(m1 || (m1 = {})); 1-> @@ -210,8 +210,8 @@ sourceFile:tests/cases/compiler/b.ts > export class c1 { > } > } -1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) name (m1) -2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) name (m1) +1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) +2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(13, 4) Source(1, 8) + SourceIndex(1) 4 >Emitted(13, 6) Source(1, 10) + SourceIndex(1) 5 >Emitted(13, 11) Source(1, 8) + SourceIndex(1) diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map index 200edeccc5b23..57e8ff298657f 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD;IAAAE;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC;ACHD;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt index 790d64c7963a1..28b2e240b8b7f 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:app.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -46,16 +46,16 @@ sourceFile:app.ts 1->class c { > 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) -2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) --- >>> return c; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) name (c) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -68,8 +68,8 @@ sourceFile:app.ts 3 > 4 > class c { > } -1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (c) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- @@ -87,7 +87,7 @@ sourceFile:app2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) name (d) +1->Emitted(9, 5) Source(1, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -96,16 +96,16 @@ sourceFile:app2.ts 1->class d { > 2 > } -1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) name (d.constructor) -2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) name (d.constructor) +1->Emitted(10, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(10, 6) Source(2, 2) + SourceIndex(1) --- >>> return d; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) name (d) -2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) name (d) +1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) --- >>>})(); 1 > @@ -118,8 +118,8 @@ sourceFile:app2.ts 3 > 4 > class d { > } -1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1) name (d) -2 >Emitted(12, 2) Source(2, 2) + SourceIndex(1) name (d) +1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1) +2 >Emitted(12, 2) Source(2, 2) + SourceIndex(1) 3 >Emitted(12, 2) Source(1, 1) + SourceIndex(1) 4 >Emitted(12, 6) Source(2, 2) + SourceIndex(1) --- diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map index 97826d80eb896..5025ed2212ac2 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map @@ -1,3 +1,3 @@ //// [app.js.map] -{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":["c","c.constructor"],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map] -{"version":3,"file":"app2.js","sourceRoot":"","sources":["app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"}//// [app2.js.map] +{"version":3,"file":"app2.js","sourceRoot":"","sources":["app2.ts"],"names":[],"mappings":"AAAA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt index 6987b7bbd2134..af6ed80a85bf3 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -37,7 +37,7 @@ sourceFile:app.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -46,16 +46,16 @@ sourceFile:app.ts 1->class c { > 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c.constructor) -2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (c.constructor) +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) --- >>> return c; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) name (c) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -68,8 +68,8 @@ sourceFile:app.ts 3 > 4 > class c { > } -1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (c) -2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (c) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- @@ -93,7 +93,7 @@ sourceFile:app2.ts 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (d) +1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) --- >>> } 1->^^^^ @@ -102,16 +102,16 @@ sourceFile:app2.ts 1->class d { > 2 > } -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (d.constructor) -2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) name (d.constructor) +1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 6) Source(2, 2) + SourceIndex(0) --- >>> return d; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (d) -2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) name (d) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- >>>})(); 1 > @@ -124,8 +124,8 @@ sourceFile:app2.ts 3 > 4 > class d { > } -1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) name (d) -2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) name (d) +1 >Emitted(5, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(5, 2) Source(2, 2) + SourceIndex(0) 3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) 4 >Emitted(5, 6) Source(2, 2) + SourceIndex(0) --- diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map index 65bb725231c40..c32505b01ae13 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map @@ -1,2 +1,2 @@ //// [sourcemapValidationDuplicateNames.js.map] -{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":["m1","m1.c","m1.c.constructor"],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACXA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,IAACA,IACbA,CAAAA;AACLA,CAACA,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE,EAAC,CAAC;IACPA,IAAIA,CAACA,GAAGA,IAAIA,EAAEA,CAACA,CAACA,EAAEA,CAACA;AACvBA,CAACA,EAFM,EAAE,KAAF,EAAE,QAER"} \ No newline at end of file +{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER"} \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt index a5d1f637a1548..50302c30a22dc 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt @@ -59,25 +59,25 @@ sourceFile:sourcemapValidationDuplicateNames.ts 4 > = 5 > 10 6 > ; -1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (m1) -2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) name (m1) -3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) name (m1) -4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) name (m1) -5 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) name (m1) -6 >Emitted(3, 16) Source(2, 16) + SourceIndex(0) name (m1) +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0) +3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) +5 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) +6 >Emitted(3, 16) Source(2, 16) + SourceIndex(0) --- >>> var c = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) name (m1) +1->Emitted(4, 5) Source(3, 5) + SourceIndex(0) --- >>> function c() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m1.c) +1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -86,16 +86,16 @@ sourceFile:sourcemapValidationDuplicateNames.ts 1->export class c { > 2 > } -1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) name (m1.c.constructor) -2 >Emitted(6, 10) Source(4, 6) + SourceIndex(0) name (m1.c.constructor) +1->Emitted(6, 9) Source(4, 5) + SourceIndex(0) +2 >Emitted(6, 10) Source(4, 6) + SourceIndex(0) --- >>> return c; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(7, 9) Source(4, 5) + SourceIndex(0) name (m1.c) -2 >Emitted(7, 17) Source(4, 6) + SourceIndex(0) name (m1.c) +1->Emitted(7, 9) Source(4, 5) + SourceIndex(0) +2 >Emitted(7, 17) Source(4, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -108,10 +108,10 @@ sourceFile:sourcemapValidationDuplicateNames.ts 3 > 4 > export class c { > } -1 >Emitted(8, 5) Source(4, 5) + SourceIndex(0) name (m1.c) -2 >Emitted(8, 6) Source(4, 6) + SourceIndex(0) name (m1.c) -3 >Emitted(8, 6) Source(3, 5) + SourceIndex(0) name (m1) -4 >Emitted(8, 10) Source(4, 6) + SourceIndex(0) name (m1) +1 >Emitted(8, 5) Source(4, 5) + SourceIndex(0) +2 >Emitted(8, 6) Source(4, 6) + SourceIndex(0) +3 >Emitted(8, 6) Source(3, 5) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 6) + SourceIndex(0) --- >>> m1.c = c; 1->^^^^ @@ -124,10 +124,10 @@ sourceFile:sourcemapValidationDuplicateNames.ts 3 > { > } 4 > -1->Emitted(9, 5) Source(3, 18) + SourceIndex(0) name (m1) -2 >Emitted(9, 9) Source(3, 19) + SourceIndex(0) name (m1) -3 >Emitted(9, 13) Source(4, 6) + SourceIndex(0) name (m1) -4 >Emitted(9, 14) Source(4, 6) + SourceIndex(0) name (m1) +1->Emitted(9, 5) Source(3, 18) + SourceIndex(0) +2 >Emitted(9, 9) Source(3, 19) + SourceIndex(0) +3 >Emitted(9, 13) Source(4, 6) + SourceIndex(0) +4 >Emitted(9, 14) Source(4, 6) + SourceIndex(0) --- >>>})(m1 || (m1 = {})); 1-> @@ -149,8 +149,8 @@ sourceFile:sourcemapValidationDuplicateNames.ts > export class c { > } > } -1->Emitted(10, 1) Source(5, 1) + SourceIndex(0) name (m1) -2 >Emitted(10, 2) Source(5, 2) + SourceIndex(0) name (m1) +1->Emitted(10, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(10, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(10, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(10, 6) Source(1, 10) + SourceIndex(0) 5 >Emitted(10, 11) Source(1, 8) + SourceIndex(0) @@ -215,16 +215,16 @@ sourceFile:sourcemapValidationDuplicateNames.ts 8 > c 9 > () 10> ; -1->Emitted(13, 5) Source(7, 5) + SourceIndex(0) name (m1) -2 >Emitted(13, 9) Source(7, 9) + SourceIndex(0) name (m1) -3 >Emitted(13, 10) Source(7, 10) + SourceIndex(0) name (m1) -4 >Emitted(13, 13) Source(7, 13) + SourceIndex(0) name (m1) -5 >Emitted(13, 17) Source(7, 17) + SourceIndex(0) name (m1) -6 >Emitted(13, 19) Source(7, 19) + SourceIndex(0) name (m1) -7 >Emitted(13, 20) Source(7, 20) + SourceIndex(0) name (m1) -8 >Emitted(13, 21) Source(7, 21) + SourceIndex(0) name (m1) -9 >Emitted(13, 23) Source(7, 23) + SourceIndex(0) name (m1) -10>Emitted(13, 24) Source(7, 24) + SourceIndex(0) name (m1) +1->Emitted(13, 5) Source(7, 5) + SourceIndex(0) +2 >Emitted(13, 9) Source(7, 9) + SourceIndex(0) +3 >Emitted(13, 10) Source(7, 10) + SourceIndex(0) +4 >Emitted(13, 13) Source(7, 13) + SourceIndex(0) +5 >Emitted(13, 17) Source(7, 17) + SourceIndex(0) +6 >Emitted(13, 19) Source(7, 19) + SourceIndex(0) +7 >Emitted(13, 20) Source(7, 20) + SourceIndex(0) +8 >Emitted(13, 21) Source(7, 21) + SourceIndex(0) +9 >Emitted(13, 23) Source(7, 23) + SourceIndex(0) +10>Emitted(13, 24) Source(7, 24) + SourceIndex(0) --- >>>})(m1 || (m1 = {})); 1 > @@ -245,8 +245,8 @@ sourceFile:sourcemapValidationDuplicateNames.ts 7 > { > var b = new m1.c(); > } -1 >Emitted(14, 1) Source(8, 1) + SourceIndex(0) name (m1) -2 >Emitted(14, 2) Source(8, 2) + SourceIndex(0) name (m1) +1 >Emitted(14, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(14, 2) Source(8, 2) + SourceIndex(0) 3 >Emitted(14, 4) Source(6, 8) + SourceIndex(0) 4 >Emitted(14, 6) Source(6, 10) + SourceIndex(0) 5 >Emitted(14, 11) Source(6, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/tsxEmit3.js.map b/tests/baselines/reference/tsxEmit3.js.map index 1f1ba0926a063..d9c47522d2174 100644 --- a/tests/baselines/reference/tsxEmit3.js.map +++ b/tests/baselines/reference/tsxEmit3.js.map @@ -1,2 +1,2 @@ //// [tsxEmit3.jsx.map] -{"version":3,"file":"tsxEmit3.jsx","sourceRoot":"","sources":["tsxEmit3.tsx"],"names":["M","M.Foo","M.Foo.constructor","M.S","M.S.Bar","M.S.Bar.constructor"],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACTA;QAAmBC;QAAgBC,CAACA;QAACD,UAACA;IAADA,CAACA,AAAtCD,IAAsCA;IAAzBA,KAAGA,MAAsBA,CAAAA;IACtCA,IAAcA,CAACA,CAKdA;IALDA,WAAcA,CAACA,EAACA,CAACA;QAChBG;YAAAC;YAAmBC,CAACA;YAADD,UAACA;QAADA,CAACA,AAApBD,IAAoBA;QAAPA,KAAGA,MAAIA,CAAAA;IAIrBA,CAACA,EALaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAKdA;AACFA,CAACA,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACTA,aAAaA;IACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IAEbA,IAAcA,CAACA,CAMdA;IANDA,WAAcA,CAACA,EAACA,CAACA;QAChBG,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;QAEbA,aAAaA;QACbA,KAAGA,EAAEA,CAACA,KAAGA,GAAGA,CAACA;IACdA,CAACA,EANaH,CAACA,GAADA,GAACA,KAADA,GAACA,QAMdA;AAEFA,CAACA,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACTA,eAAeA;IACfA,GAACA,CAACA,GAAGA,EAAEA,CAACA,GAACA,CAACA,GAAGA,GAAGA,CAACA;AAClBA,CAACA,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACTA,IAAIA,CAACA,GAAGA,GAAGA,CAACA;IACZA,eAAeA;IACfA,OAAGA,EAAEA,CAACA,OAAGA,GAAGA,CAACA;AACdA,CAACA,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file +{"version":3,"file":"tsxEmit3.jsx","sourceRoot":"","sources":["tsxEmit3.tsx"],"names":[],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACT;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC,EAAC,CAAC;QAChB;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;IAIrB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACT,aAAa;IACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC,EAAC,CAAC;QAChB,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;QAEb,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACT,eAAe;IACf,GAAC,CAAC,GAAG,EAAE,CAAC,GAAC,CAAC,GAAG,GAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACT,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,OAAG,EAAE,CAAC,OAAG,GAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt index 514be1e532d18..a209a043d29c1 100644 --- a/tests/baselines/reference/tsxEmit3.sourcemap.txt +++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt @@ -60,13 +60,13 @@ sourceFile:tsxEmit3.tsx 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(8, 2) + SourceIndex(0) name (M) +1->Emitted(3, 5) Source(8, 2) + SourceIndex(0) --- >>> function Foo() { 1->^^^^^^^^ 2 > ^^-> 1->export class Foo { -1->Emitted(4, 9) Source(8, 21) + SourceIndex(0) name (M.Foo) +1->Emitted(4, 9) Source(8, 21) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -74,16 +74,16 @@ sourceFile:tsxEmit3.tsx 3 > ^^^^^^^^^^^-> 1->constructor() { 2 > } -1->Emitted(5, 9) Source(8, 37) + SourceIndex(0) name (M.Foo.constructor) -2 >Emitted(5, 10) Source(8, 38) + SourceIndex(0) name (M.Foo.constructor) +1->Emitted(5, 9) Source(8, 37) + SourceIndex(0) +2 >Emitted(5, 10) Source(8, 38) + SourceIndex(0) --- >>> return Foo; 1->^^^^^^^^ 2 > ^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(8, 39) + SourceIndex(0) name (M.Foo) -2 >Emitted(6, 19) Source(8, 40) + SourceIndex(0) name (M.Foo) +1->Emitted(6, 9) Source(8, 39) + SourceIndex(0) +2 >Emitted(6, 19) Source(8, 40) + SourceIndex(0) --- >>> })(); 1 >^^^^ @@ -95,10 +95,10 @@ sourceFile:tsxEmit3.tsx 2 > } 3 > 4 > export class Foo { constructor() { } } -1 >Emitted(7, 5) Source(8, 39) + SourceIndex(0) name (M.Foo) -2 >Emitted(7, 6) Source(8, 40) + SourceIndex(0) name (M.Foo) -3 >Emitted(7, 6) Source(8, 2) + SourceIndex(0) name (M) -4 >Emitted(7, 10) Source(8, 40) + SourceIndex(0) name (M) +1 >Emitted(7, 5) Source(8, 39) + SourceIndex(0) +2 >Emitted(7, 6) Source(8, 40) + SourceIndex(0) +3 >Emitted(7, 6) Source(8, 2) + SourceIndex(0) +4 >Emitted(7, 10) Source(8, 40) + SourceIndex(0) --- >>> M.Foo = Foo; 1->^^^^ @@ -109,10 +109,10 @@ sourceFile:tsxEmit3.tsx 2 > Foo 3 > { constructor() { } } 4 > -1->Emitted(8, 5) Source(8, 15) + SourceIndex(0) name (M) -2 >Emitted(8, 10) Source(8, 18) + SourceIndex(0) name (M) -3 >Emitted(8, 16) Source(8, 40) + SourceIndex(0) name (M) -4 >Emitted(8, 17) Source(8, 40) + SourceIndex(0) name (M) +1->Emitted(8, 5) Source(8, 15) + SourceIndex(0) +2 >Emitted(8, 10) Source(8, 18) + SourceIndex(0) +3 >Emitted(8, 16) Source(8, 40) + SourceIndex(0) +4 >Emitted(8, 17) Source(8, 40) + SourceIndex(0) --- >>> var S; 1 >^^^^ @@ -130,10 +130,10 @@ sourceFile:tsxEmit3.tsx > // Emit Foo > // Foo, ; > } -1 >Emitted(9, 5) Source(9, 2) + SourceIndex(0) name (M) -2 >Emitted(9, 9) Source(9, 16) + SourceIndex(0) name (M) -3 >Emitted(9, 10) Source(9, 17) + SourceIndex(0) name (M) -4 >Emitted(9, 11) Source(14, 3) + SourceIndex(0) name (M) +1 >Emitted(9, 5) Source(9, 2) + SourceIndex(0) +2 >Emitted(9, 9) Source(9, 16) + SourceIndex(0) +3 >Emitted(9, 10) Source(9, 17) + SourceIndex(0) +4 >Emitted(9, 11) Source(14, 3) + SourceIndex(0) --- >>> (function (S) { 1->^^^^ @@ -147,24 +147,24 @@ sourceFile:tsxEmit3.tsx 3 > S 4 > 5 > { -1->Emitted(10, 5) Source(9, 2) + SourceIndex(0) name (M) -2 >Emitted(10, 16) Source(9, 16) + SourceIndex(0) name (M) -3 >Emitted(10, 17) Source(9, 17) + SourceIndex(0) name (M) -4 >Emitted(10, 19) Source(9, 18) + SourceIndex(0) name (M) -5 >Emitted(10, 20) Source(9, 19) + SourceIndex(0) name (M) +1->Emitted(10, 5) Source(9, 2) + SourceIndex(0) +2 >Emitted(10, 16) Source(9, 16) + SourceIndex(0) +3 >Emitted(10, 17) Source(9, 17) + SourceIndex(0) +4 >Emitted(10, 19) Source(9, 18) + SourceIndex(0) +5 >Emitted(10, 20) Source(9, 19) + SourceIndex(0) --- >>> var Bar = (function () { 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(11, 9) Source(10, 3) + SourceIndex(0) name (M.S) +1->Emitted(11, 9) Source(10, 3) + SourceIndex(0) --- >>> function Bar() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(12, 13) Source(10, 3) + SourceIndex(0) name (M.S.Bar) +1->Emitted(12, 13) Source(10, 3) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^ @@ -172,16 +172,16 @@ sourceFile:tsxEmit3.tsx 3 > ^^^^^^^^^^^-> 1->export class Bar { 2 > } -1->Emitted(13, 13) Source(10, 22) + SourceIndex(0) name (M.S.Bar.constructor) -2 >Emitted(13, 14) Source(10, 23) + SourceIndex(0) name (M.S.Bar.constructor) +1->Emitted(13, 13) Source(10, 22) + SourceIndex(0) +2 >Emitted(13, 14) Source(10, 23) + SourceIndex(0) --- >>> return Bar; 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^ 1-> 2 > } -1->Emitted(14, 13) Source(10, 22) + SourceIndex(0) name (M.S.Bar) -2 >Emitted(14, 23) Source(10, 23) + SourceIndex(0) name (M.S.Bar) +1->Emitted(14, 13) Source(10, 22) + SourceIndex(0) +2 >Emitted(14, 23) Source(10, 23) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^ @@ -193,10 +193,10 @@ sourceFile:tsxEmit3.tsx 2 > } 3 > 4 > export class Bar { } -1 >Emitted(15, 9) Source(10, 22) + SourceIndex(0) name (M.S.Bar) -2 >Emitted(15, 10) Source(10, 23) + SourceIndex(0) name (M.S.Bar) -3 >Emitted(15, 10) Source(10, 3) + SourceIndex(0) name (M.S) -4 >Emitted(15, 14) Source(10, 23) + SourceIndex(0) name (M.S) +1 >Emitted(15, 9) Source(10, 22) + SourceIndex(0) +2 >Emitted(15, 10) Source(10, 23) + SourceIndex(0) +3 >Emitted(15, 10) Source(10, 3) + SourceIndex(0) +4 >Emitted(15, 14) Source(10, 23) + SourceIndex(0) --- >>> S.Bar = Bar; 1->^^^^^^^^ @@ -208,10 +208,10 @@ sourceFile:tsxEmit3.tsx 2 > Bar 3 > { } 4 > -1->Emitted(16, 9) Source(10, 16) + SourceIndex(0) name (M.S) -2 >Emitted(16, 14) Source(10, 19) + SourceIndex(0) name (M.S) -3 >Emitted(16, 20) Source(10, 23) + SourceIndex(0) name (M.S) -4 >Emitted(16, 21) Source(10, 23) + SourceIndex(0) name (M.S) +1->Emitted(16, 9) Source(10, 16) + SourceIndex(0) +2 >Emitted(16, 14) Source(10, 19) + SourceIndex(0) +3 >Emitted(16, 20) Source(10, 23) + SourceIndex(0) +4 >Emitted(16, 21) Source(10, 23) + SourceIndex(0) --- >>> })(S = M.S || (M.S = {})); 1->^^^^ @@ -241,15 +241,15 @@ sourceFile:tsxEmit3.tsx > // Emit Foo > // Foo, ; > } -1->Emitted(17, 5) Source(14, 2) + SourceIndex(0) name (M.S) -2 >Emitted(17, 6) Source(14, 3) + SourceIndex(0) name (M.S) -3 >Emitted(17, 8) Source(9, 16) + SourceIndex(0) name (M) -4 >Emitted(17, 9) Source(9, 17) + SourceIndex(0) name (M) -5 >Emitted(17, 12) Source(9, 16) + SourceIndex(0) name (M) -6 >Emitted(17, 15) Source(9, 17) + SourceIndex(0) name (M) -7 >Emitted(17, 20) Source(9, 16) + SourceIndex(0) name (M) -8 >Emitted(17, 23) Source(9, 17) + SourceIndex(0) name (M) -9 >Emitted(17, 31) Source(14, 3) + SourceIndex(0) name (M) +1->Emitted(17, 5) Source(14, 2) + SourceIndex(0) +2 >Emitted(17, 6) Source(14, 3) + SourceIndex(0) +3 >Emitted(17, 8) Source(9, 16) + SourceIndex(0) +4 >Emitted(17, 9) Source(9, 17) + SourceIndex(0) +5 >Emitted(17, 12) Source(9, 16) + SourceIndex(0) +6 >Emitted(17, 15) Source(9, 17) + SourceIndex(0) +7 >Emitted(17, 20) Source(9, 16) + SourceIndex(0) +8 >Emitted(17, 23) Source(9, 17) + SourceIndex(0) +9 >Emitted(17, 31) Source(14, 3) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -275,8 +275,8 @@ sourceFile:tsxEmit3.tsx > // Foo, ; > } > } -1 >Emitted(18, 1) Source(15, 1) + SourceIndex(0) name (M) -2 >Emitted(18, 2) Source(15, 2) + SourceIndex(0) name (M) +1 >Emitted(18, 1) Source(15, 1) + SourceIndex(0) +2 >Emitted(18, 2) Source(15, 2) + SourceIndex(0) 3 >Emitted(18, 4) Source(7, 8) + SourceIndex(0) 4 >Emitted(18, 5) Source(7, 9) + SourceIndex(0) 5 >Emitted(18, 10) Source(7, 8) + SourceIndex(0) @@ -337,8 +337,8 @@ sourceFile:tsxEmit3.tsx 1-> > 2 > // Emit M.Foo -1->Emitted(21, 5) Source(18, 2) + SourceIndex(0) name (M) -2 >Emitted(21, 18) Source(18, 15) + SourceIndex(0) name (M) +1->Emitted(21, 5) Source(18, 2) + SourceIndex(0) +2 >Emitted(21, 18) Source(18, 15) + SourceIndex(0) --- >>> M.Foo, ; 1->^^^^ @@ -356,13 +356,13 @@ sourceFile:tsxEmit3.tsx 5 > Foo 6 > /> 7 > ; -1->Emitted(22, 5) Source(19, 2) + SourceIndex(0) name (M) -2 >Emitted(22, 10) Source(19, 5) + SourceIndex(0) name (M) -3 >Emitted(22, 12) Source(19, 7) + SourceIndex(0) name (M) -4 >Emitted(22, 13) Source(19, 8) + SourceIndex(0) name (M) -5 >Emitted(22, 18) Source(19, 11) + SourceIndex(0) name (M) -6 >Emitted(22, 21) Source(19, 14) + SourceIndex(0) name (M) -7 >Emitted(22, 22) Source(19, 15) + SourceIndex(0) name (M) +1->Emitted(22, 5) Source(19, 2) + SourceIndex(0) +2 >Emitted(22, 10) Source(19, 5) + SourceIndex(0) +3 >Emitted(22, 12) Source(19, 7) + SourceIndex(0) +4 >Emitted(22, 13) Source(19, 8) + SourceIndex(0) +5 >Emitted(22, 18) Source(19, 11) + SourceIndex(0) +6 >Emitted(22, 21) Source(19, 14) + SourceIndex(0) +7 >Emitted(22, 22) Source(19, 15) + SourceIndex(0) --- >>> var S; 1 >^^^^ @@ -382,10 +382,10 @@ sourceFile:tsxEmit3.tsx > // Emit S.Bar > Bar, ; > } -1 >Emitted(23, 5) Source(21, 2) + SourceIndex(0) name (M) -2 >Emitted(23, 9) Source(21, 16) + SourceIndex(0) name (M) -3 >Emitted(23, 10) Source(21, 17) + SourceIndex(0) name (M) -4 >Emitted(23, 11) Source(27, 3) + SourceIndex(0) name (M) +1 >Emitted(23, 5) Source(21, 2) + SourceIndex(0) +2 >Emitted(23, 9) Source(21, 16) + SourceIndex(0) +3 >Emitted(23, 10) Source(21, 17) + SourceIndex(0) +4 >Emitted(23, 11) Source(27, 3) + SourceIndex(0) --- >>> (function (S) { 1->^^^^ @@ -399,11 +399,11 @@ sourceFile:tsxEmit3.tsx 3 > S 4 > 5 > { -1->Emitted(24, 5) Source(21, 2) + SourceIndex(0) name (M) -2 >Emitted(24, 16) Source(21, 16) + SourceIndex(0) name (M) -3 >Emitted(24, 17) Source(21, 17) + SourceIndex(0) name (M) -4 >Emitted(24, 19) Source(21, 18) + SourceIndex(0) name (M) -5 >Emitted(24, 20) Source(21, 19) + SourceIndex(0) name (M) +1->Emitted(24, 5) Source(21, 2) + SourceIndex(0) +2 >Emitted(24, 16) Source(21, 16) + SourceIndex(0) +3 >Emitted(24, 17) Source(21, 17) + SourceIndex(0) +4 >Emitted(24, 19) Source(21, 18) + SourceIndex(0) +5 >Emitted(24, 20) Source(21, 19) + SourceIndex(0) --- >>> // Emit M.Foo 1->^^^^^^^^ @@ -412,8 +412,8 @@ sourceFile:tsxEmit3.tsx 1-> > 2 > // Emit M.Foo -1->Emitted(25, 9) Source(22, 3) + SourceIndex(0) name (M.S) -2 >Emitted(25, 22) Source(22, 16) + SourceIndex(0) name (M.S) +1->Emitted(25, 9) Source(22, 3) + SourceIndex(0) +2 >Emitted(25, 22) Source(22, 16) + SourceIndex(0) --- >>> M.Foo, ; 1->^^^^^^^^ @@ -431,13 +431,13 @@ sourceFile:tsxEmit3.tsx 5 > Foo 6 > /> 7 > ; -1->Emitted(26, 9) Source(23, 3) + SourceIndex(0) name (M.S) -2 >Emitted(26, 14) Source(23, 6) + SourceIndex(0) name (M.S) -3 >Emitted(26, 16) Source(23, 8) + SourceIndex(0) name (M.S) -4 >Emitted(26, 17) Source(23, 9) + SourceIndex(0) name (M.S) -5 >Emitted(26, 22) Source(23, 12) + SourceIndex(0) name (M.S) -6 >Emitted(26, 25) Source(23, 15) + SourceIndex(0) name (M.S) -7 >Emitted(26, 26) Source(23, 16) + SourceIndex(0) name (M.S) +1->Emitted(26, 9) Source(23, 3) + SourceIndex(0) +2 >Emitted(26, 14) Source(23, 6) + SourceIndex(0) +3 >Emitted(26, 16) Source(23, 8) + SourceIndex(0) +4 >Emitted(26, 17) Source(23, 9) + SourceIndex(0) +5 >Emitted(26, 22) Source(23, 12) + SourceIndex(0) +6 >Emitted(26, 25) Source(23, 15) + SourceIndex(0) +7 >Emitted(26, 26) Source(23, 16) + SourceIndex(0) --- >>> // Emit S.Bar 1 >^^^^^^^^ @@ -447,8 +447,8 @@ sourceFile:tsxEmit3.tsx > > 2 > // Emit S.Bar -1 >Emitted(27, 9) Source(25, 3) + SourceIndex(0) name (M.S) -2 >Emitted(27, 22) Source(25, 16) + SourceIndex(0) name (M.S) +1 >Emitted(27, 9) Source(25, 3) + SourceIndex(0) +2 >Emitted(27, 22) Source(25, 16) + SourceIndex(0) --- >>> S.Bar, ; 1->^^^^^^^^ @@ -467,13 +467,13 @@ sourceFile:tsxEmit3.tsx 5 > Bar 6 > /> 7 > ; -1->Emitted(28, 9) Source(26, 3) + SourceIndex(0) name (M.S) -2 >Emitted(28, 14) Source(26, 6) + SourceIndex(0) name (M.S) -3 >Emitted(28, 16) Source(26, 8) + SourceIndex(0) name (M.S) -4 >Emitted(28, 17) Source(26, 9) + SourceIndex(0) name (M.S) -5 >Emitted(28, 22) Source(26, 12) + SourceIndex(0) name (M.S) -6 >Emitted(28, 25) Source(26, 15) + SourceIndex(0) name (M.S) -7 >Emitted(28, 26) Source(26, 16) + SourceIndex(0) name (M.S) +1->Emitted(28, 9) Source(26, 3) + SourceIndex(0) +2 >Emitted(28, 14) Source(26, 6) + SourceIndex(0) +3 >Emitted(28, 16) Source(26, 8) + SourceIndex(0) +4 >Emitted(28, 17) Source(26, 9) + SourceIndex(0) +5 >Emitted(28, 22) Source(26, 12) + SourceIndex(0) +6 >Emitted(28, 25) Source(26, 15) + SourceIndex(0) +7 >Emitted(28, 26) Source(26, 16) + SourceIndex(0) --- >>> })(S = M.S || (M.S = {})); 1->^^^^ @@ -501,15 +501,15 @@ sourceFile:tsxEmit3.tsx > // Emit S.Bar > Bar, ; > } -1->Emitted(29, 5) Source(27, 2) + SourceIndex(0) name (M.S) -2 >Emitted(29, 6) Source(27, 3) + SourceIndex(0) name (M.S) -3 >Emitted(29, 8) Source(21, 16) + SourceIndex(0) name (M) -4 >Emitted(29, 9) Source(21, 17) + SourceIndex(0) name (M) -5 >Emitted(29, 12) Source(21, 16) + SourceIndex(0) name (M) -6 >Emitted(29, 15) Source(21, 17) + SourceIndex(0) name (M) -7 >Emitted(29, 20) Source(21, 16) + SourceIndex(0) name (M) -8 >Emitted(29, 23) Source(21, 17) + SourceIndex(0) name (M) -9 >Emitted(29, 31) Source(27, 3) + SourceIndex(0) name (M) +1->Emitted(29, 5) Source(27, 2) + SourceIndex(0) +2 >Emitted(29, 6) Source(27, 3) + SourceIndex(0) +3 >Emitted(29, 8) Source(21, 16) + SourceIndex(0) +4 >Emitted(29, 9) Source(21, 17) + SourceIndex(0) +5 >Emitted(29, 12) Source(21, 16) + SourceIndex(0) +6 >Emitted(29, 15) Source(21, 17) + SourceIndex(0) +7 >Emitted(29, 20) Source(21, 16) + SourceIndex(0) +8 >Emitted(29, 23) Source(21, 17) + SourceIndex(0) +9 >Emitted(29, 31) Source(27, 3) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -540,8 +540,8 @@ sourceFile:tsxEmit3.tsx > } > > } -1 >Emitted(30, 1) Source(29, 1) + SourceIndex(0) name (M) -2 >Emitted(30, 2) Source(29, 2) + SourceIndex(0) name (M) +1 >Emitted(30, 1) Source(29, 1) + SourceIndex(0) +2 >Emitted(30, 2) Source(29, 2) + SourceIndex(0) 3 >Emitted(30, 4) Source(17, 8) + SourceIndex(0) 4 >Emitted(30, 5) Source(17, 9) + SourceIndex(0) 5 >Emitted(30, 10) Source(17, 8) + SourceIndex(0) @@ -593,8 +593,8 @@ sourceFile:tsxEmit3.tsx 1-> > 2 > // Emit M.S.Bar -1->Emitted(33, 5) Source(32, 2) + SourceIndex(0) name (M) -2 >Emitted(33, 20) Source(32, 17) + SourceIndex(0) name (M) +1->Emitted(33, 5) Source(32, 2) + SourceIndex(0) +2 >Emitted(33, 20) Source(32, 17) + SourceIndex(0) --- >>> M.S.Bar, ; 1->^^^^ @@ -620,17 +620,17 @@ sourceFile:tsxEmit3.tsx 9 > Bar 10> /> 11> ; -1->Emitted(34, 5) Source(33, 2) + SourceIndex(0) name (M) -2 >Emitted(34, 8) Source(33, 3) + SourceIndex(0) name (M) -3 >Emitted(34, 9) Source(33, 4) + SourceIndex(0) name (M) -4 >Emitted(34, 12) Source(33, 7) + SourceIndex(0) name (M) -5 >Emitted(34, 14) Source(33, 9) + SourceIndex(0) name (M) -6 >Emitted(34, 15) Source(33, 10) + SourceIndex(0) name (M) -7 >Emitted(34, 18) Source(33, 11) + SourceIndex(0) name (M) -8 >Emitted(34, 19) Source(33, 12) + SourceIndex(0) name (M) -9 >Emitted(34, 22) Source(33, 15) + SourceIndex(0) name (M) -10>Emitted(34, 25) Source(33, 18) + SourceIndex(0) name (M) -11>Emitted(34, 26) Source(33, 19) + SourceIndex(0) name (M) +1->Emitted(34, 5) Source(33, 2) + SourceIndex(0) +2 >Emitted(34, 8) Source(33, 3) + SourceIndex(0) +3 >Emitted(34, 9) Source(33, 4) + SourceIndex(0) +4 >Emitted(34, 12) Source(33, 7) + SourceIndex(0) +5 >Emitted(34, 14) Source(33, 9) + SourceIndex(0) +6 >Emitted(34, 15) Source(33, 10) + SourceIndex(0) +7 >Emitted(34, 18) Source(33, 11) + SourceIndex(0) +8 >Emitted(34, 19) Source(33, 12) + SourceIndex(0) +9 >Emitted(34, 22) Source(33, 15) + SourceIndex(0) +10>Emitted(34, 25) Source(33, 18) + SourceIndex(0) +11>Emitted(34, 26) Source(33, 19) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -651,8 +651,8 @@ sourceFile:tsxEmit3.tsx > // Emit M.S.Bar > S.Bar, ; > } -1 >Emitted(35, 1) Source(34, 1) + SourceIndex(0) name (M) -2 >Emitted(35, 2) Source(34, 2) + SourceIndex(0) name (M) +1 >Emitted(35, 1) Source(34, 1) + SourceIndex(0) +2 >Emitted(35, 2) Source(34, 2) + SourceIndex(0) 3 >Emitted(35, 4) Source(31, 8) + SourceIndex(0) 4 >Emitted(35, 5) Source(31, 9) + SourceIndex(0) 5 >Emitted(35, 10) Source(31, 8) + SourceIndex(0) @@ -712,12 +712,12 @@ sourceFile:tsxEmit3.tsx 4 > = 5 > 100 6 > ; -1 >Emitted(38, 5) Source(37, 2) + SourceIndex(0) name (M) -2 >Emitted(38, 9) Source(37, 6) + SourceIndex(0) name (M) -3 >Emitted(38, 10) Source(37, 7) + SourceIndex(0) name (M) -4 >Emitted(38, 13) Source(37, 10) + SourceIndex(0) name (M) -5 >Emitted(38, 16) Source(37, 13) + SourceIndex(0) name (M) -6 >Emitted(38, 17) Source(37, 14) + SourceIndex(0) name (M) +1 >Emitted(38, 5) Source(37, 2) + SourceIndex(0) +2 >Emitted(38, 9) Source(37, 6) + SourceIndex(0) +3 >Emitted(38, 10) Source(37, 7) + SourceIndex(0) +4 >Emitted(38, 13) Source(37, 10) + SourceIndex(0) +5 >Emitted(38, 16) Source(37, 13) + SourceIndex(0) +6 >Emitted(38, 17) Source(37, 14) + SourceIndex(0) --- >>> // Emit M_1.Foo 1->^^^^ @@ -726,8 +726,8 @@ sourceFile:tsxEmit3.tsx 1-> > 2 > // Emit M_1.Foo -1->Emitted(39, 5) Source(38, 2) + SourceIndex(0) name (M) -2 >Emitted(39, 20) Source(38, 17) + SourceIndex(0) name (M) +1->Emitted(39, 5) Source(38, 2) + SourceIndex(0) +2 >Emitted(39, 20) Source(38, 17) + SourceIndex(0) --- >>> M_1.Foo, ; 1->^^^^ @@ -745,13 +745,13 @@ sourceFile:tsxEmit3.tsx 5 > Foo 6 > /> 7 > ; -1->Emitted(40, 5) Source(39, 2) + SourceIndex(0) name (M) -2 >Emitted(40, 12) Source(39, 5) + SourceIndex(0) name (M) -3 >Emitted(40, 14) Source(39, 7) + SourceIndex(0) name (M) -4 >Emitted(40, 15) Source(39, 8) + SourceIndex(0) name (M) -5 >Emitted(40, 22) Source(39, 11) + SourceIndex(0) name (M) -6 >Emitted(40, 25) Source(39, 14) + SourceIndex(0) name (M) -7 >Emitted(40, 26) Source(39, 15) + SourceIndex(0) name (M) +1->Emitted(40, 5) Source(39, 2) + SourceIndex(0) +2 >Emitted(40, 12) Source(39, 5) + SourceIndex(0) +3 >Emitted(40, 14) Source(39, 7) + SourceIndex(0) +4 >Emitted(40, 15) Source(39, 8) + SourceIndex(0) +5 >Emitted(40, 22) Source(39, 11) + SourceIndex(0) +6 >Emitted(40, 25) Source(39, 14) + SourceIndex(0) +7 >Emitted(40, 26) Source(39, 15) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -774,8 +774,8 @@ sourceFile:tsxEmit3.tsx > // Emit M_1.Foo > Foo, ; > } -1 >Emitted(41, 1) Source(40, 1) + SourceIndex(0) name (M) -2 >Emitted(41, 2) Source(40, 2) + SourceIndex(0) name (M) +1 >Emitted(41, 1) Source(40, 1) + SourceIndex(0) +2 >Emitted(41, 2) Source(40, 2) + SourceIndex(0) 3 >Emitted(41, 4) Source(36, 8) + SourceIndex(0) 4 >Emitted(41, 5) Source(36, 9) + SourceIndex(0) 5 >Emitted(41, 10) Source(36, 8) + SourceIndex(0) diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index e05b5d65d10bb..ffce3bf76f03d 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,2 +1,2 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.ClassA.AisIn1","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor","TopLevelModule2.SubModule3.ClassA.AisIn2_3"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBACIE,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAE/CA,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAEzDA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BACIC,uCAAuCA;4BACvCA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAEDA,0EAA0EA;YAC1EA;gBACIW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,6DAA6DA;gBAC7DA;oBAAAC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAI;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CJ,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAO;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CP,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;YAGnDA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;QAGLA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAA0B;YAEAC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBE,CAACA;YACvBF,aAACA;QAADA,CAACA,AAFD1B,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtB6B;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFM7B,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpBgC,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBE,CAACA;gBACzBF,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3B,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU,EAAC,CAAC;YACtB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa,EAAC,CAAC;gBACzB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU,EAAC,CAAC;YACtB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa,EAAC,CAAC;gBACzB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB,EAAC,CAAC;YACtB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU,EAAC,CAAC;YACtB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 244dbed0b9261..11c98056f5e4b 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -223,10 +223,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(4, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(4, 13) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(4, 23) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(4, 24) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(4, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(4, 13) Source(2, 19) + SourceIndex(0) +3 >Emitted(4, 23) Source(2, 29) + SourceIndex(0) +4 >Emitted(4, 24) Source(74, 6) + SourceIndex(0) --- >>> (function (SubModule1) { 1->^^^^^^^^ @@ -239,11 +239,11 @@ sourceFile:typeResolution.ts 3 > SubModule1 4 > 5 > { -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(5, 20) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(5, 30) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(5, 32) Source(2, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(5, 33) Source(2, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(5, 20) Source(2, 19) + SourceIndex(0) +3 >Emitted(5, 30) Source(2, 29) + SourceIndex(0) +4 >Emitted(5, 32) Source(2, 30) + SourceIndex(0) +5 >Emitted(5, 33) Source(2, 31) + SourceIndex(0) --- >>> var SubSubModule1; 1 >^^^^^^^^^^^^ @@ -312,10 +312,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(6, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(6, 17) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(6, 30) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(6, 31) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(6, 13) Source(3, 9) + SourceIndex(0) +2 >Emitted(6, 17) Source(3, 23) + SourceIndex(0) +3 >Emitted(6, 30) Source(3, 36) + SourceIndex(0) +4 >Emitted(6, 31) Source(59, 10) + SourceIndex(0) --- >>> (function (SubSubModule1) { 1->^^^^^^^^^^^^ @@ -329,24 +329,24 @@ sourceFile:typeResolution.ts 3 > SubSubModule1 4 > 5 > { -1->Emitted(7, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(7, 24) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(7, 37) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(7, 39) Source(3, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1) -5 >Emitted(7, 40) Source(3, 38) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1->Emitted(7, 13) Source(3, 9) + SourceIndex(0) +2 >Emitted(7, 24) Source(3, 23) + SourceIndex(0) +3 >Emitted(7, 37) Source(3, 36) + SourceIndex(0) +4 >Emitted(7, 39) Source(3, 37) + SourceIndex(0) +5 >Emitted(7, 40) Source(3, 38) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(8, 17) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(8, 17) Source(4, 13) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(9, 21) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(9, 21) Source(4, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -373,8 +373,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(10, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) -2 >Emitted(10, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) +1->Emitted(10, 21) Source(23, 13) + SourceIndex(0) +2 >Emitted(10, 22) Source(23, 14) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -384,9 +384,9 @@ sourceFile:typeResolution.ts 1-> 2 > AisIn1_1_1 3 > -1->Emitted(11, 21) Source(5, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(11, 48) Source(5, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -3 >Emitted(11, 51) Source(5, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(11, 21) Source(5, 24) + SourceIndex(0) +2 >Emitted(11, 48) Source(5, 34) + SourceIndex(0) +3 >Emitted(11, 51) Source(5, 17) + SourceIndex(0) --- >>> // Try all qualified names of this type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -394,8 +394,8 @@ sourceFile:typeResolution.ts 1->public AisIn1_1_1() { > 2 > // Try all qualified names of this type -1->Emitted(12, 25) Source(6, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(12, 64) Source(6, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(12, 25) Source(6, 21) + SourceIndex(0) +2 >Emitted(12, 64) Source(6, 60) + SourceIndex(0) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -408,10 +408,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(13, 25) Source(7, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(13, 29) Source(7, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(13, 31) Source(7, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(13, 32) Source(7, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(13, 25) Source(7, 21) + SourceIndex(0) +2 >Emitted(13, 29) Source(7, 25) + SourceIndex(0) +3 >Emitted(13, 31) Source(7, 35) + SourceIndex(0) +4 >Emitted(13, 32) Source(7, 36) + SourceIndex(0) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -426,12 +426,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(14, 25) Source(7, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(14, 27) Source(7, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(14, 28) Source(7, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(14, 38) Source(7, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(14, 40) Source(7, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(14, 41) Source(7, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(14, 25) Source(7, 37) + SourceIndex(0) +2 >Emitted(14, 27) Source(7, 39) + SourceIndex(0) +3 >Emitted(14, 28) Source(7, 40) + SourceIndex(0) +4 >Emitted(14, 38) Source(7, 50) + SourceIndex(0) +5 >Emitted(14, 40) Source(7, 52) + SourceIndex(0) +6 >Emitted(14, 41) Source(7, 53) + SourceIndex(0) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -444,10 +444,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(15, 25) Source(8, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(15, 29) Source(8, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(15, 31) Source(8, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(15, 32) Source(8, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(15, 25) Source(8, 21) + SourceIndex(0) +2 >Emitted(15, 29) Source(8, 25) + SourceIndex(0) +3 >Emitted(15, 31) Source(8, 49) + SourceIndex(0) +4 >Emitted(15, 32) Source(8, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -462,12 +462,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(16, 25) Source(8, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(16, 27) Source(8, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(16, 28) Source(8, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(16, 38) Source(8, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(16, 40) Source(8, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(16, 41) Source(8, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(16, 25) Source(8, 51) + SourceIndex(0) +2 >Emitted(16, 27) Source(8, 53) + SourceIndex(0) +3 >Emitted(16, 28) Source(8, 54) + SourceIndex(0) +4 >Emitted(16, 38) Source(8, 64) + SourceIndex(0) +5 >Emitted(16, 40) Source(8, 66) + SourceIndex(0) +6 >Emitted(16, 41) Source(8, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -480,10 +480,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(17, 25) Source(9, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(17, 29) Source(9, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(17, 31) Source(9, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(17, 32) Source(9, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(17, 25) Source(9, 21) + SourceIndex(0) +2 >Emitted(17, 29) Source(9, 25) + SourceIndex(0) +3 >Emitted(17, 31) Source(9, 60) + SourceIndex(0) +4 >Emitted(17, 32) Source(9, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -498,12 +498,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(18, 25) Source(9, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(18, 27) Source(9, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(18, 28) Source(9, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(18, 38) Source(9, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(18, 40) Source(9, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(18, 41) Source(9, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(18, 25) Source(9, 62) + SourceIndex(0) +2 >Emitted(18, 27) Source(9, 64) + SourceIndex(0) +3 >Emitted(18, 28) Source(9, 65) + SourceIndex(0) +4 >Emitted(18, 38) Source(9, 75) + SourceIndex(0) +5 >Emitted(18, 40) Source(9, 77) + SourceIndex(0) +6 >Emitted(18, 41) Source(9, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -516,10 +516,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(19, 25) Source(10, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(19, 29) Source(10, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(19, 31) Source(10, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(19, 32) Source(10, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(19, 25) Source(10, 21) + SourceIndex(0) +2 >Emitted(19, 29) Source(10, 25) + SourceIndex(0) +3 >Emitted(19, 31) Source(10, 76) + SourceIndex(0) +4 >Emitted(19, 32) Source(10, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -535,12 +535,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(20, 25) Source(10, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(20, 27) Source(10, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(20, 28) Source(10, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(20, 38) Source(10, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(20, 40) Source(10, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(20, 41) Source(10, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(20, 25) Source(10, 78) + SourceIndex(0) +2 >Emitted(20, 27) Source(10, 80) + SourceIndex(0) +3 >Emitted(20, 28) Source(10, 81) + SourceIndex(0) +4 >Emitted(20, 38) Source(10, 91) + SourceIndex(0) +5 >Emitted(20, 40) Source(10, 93) + SourceIndex(0) +6 >Emitted(20, 41) Source(10, 94) + SourceIndex(0) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -549,8 +549,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(21, 25) Source(12, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(21, 66) Source(12, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(21, 25) Source(12, 21) + SourceIndex(0) +2 >Emitted(21, 66) Source(12, 62) + SourceIndex(0) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -563,10 +563,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(22, 25) Source(13, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(22, 29) Source(13, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(22, 31) Source(13, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(22, 32) Source(13, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(22, 25) Source(13, 21) + SourceIndex(0) +2 >Emitted(22, 29) Source(13, 25) + SourceIndex(0) +3 >Emitted(22, 31) Source(13, 35) + SourceIndex(0) +4 >Emitted(22, 32) Source(13, 36) + SourceIndex(0) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -581,12 +581,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(23, 25) Source(13, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(23, 27) Source(13, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(23, 28) Source(13, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(23, 38) Source(13, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(23, 40) Source(13, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(23, 41) Source(13, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(23, 25) Source(13, 37) + SourceIndex(0) +2 >Emitted(23, 27) Source(13, 39) + SourceIndex(0) +3 >Emitted(23, 28) Source(13, 40) + SourceIndex(0) +4 >Emitted(23, 38) Source(13, 50) + SourceIndex(0) +5 >Emitted(23, 40) Source(13, 52) + SourceIndex(0) +6 >Emitted(23, 41) Source(13, 53) + SourceIndex(0) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -599,10 +599,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(24, 25) Source(14, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(24, 29) Source(14, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(24, 31) Source(14, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(24, 32) Source(14, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(24, 25) Source(14, 21) + SourceIndex(0) +2 >Emitted(24, 29) Source(14, 25) + SourceIndex(0) +3 >Emitted(24, 31) Source(14, 76) + SourceIndex(0) +4 >Emitted(24, 32) Source(14, 77) + SourceIndex(0) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -618,12 +618,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(25, 25) Source(14, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(25, 27) Source(14, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(25, 28) Source(14, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(25, 38) Source(14, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(25, 40) Source(14, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(25, 41) Source(14, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(25, 25) Source(14, 78) + SourceIndex(0) +2 >Emitted(25, 27) Source(14, 80) + SourceIndex(0) +3 >Emitted(25, 28) Source(14, 81) + SourceIndex(0) +4 >Emitted(25, 38) Source(14, 91) + SourceIndex(0) +5 >Emitted(25, 40) Source(14, 93) + SourceIndex(0) +6 >Emitted(25, 41) Source(14, 94) + SourceIndex(0) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -632,8 +632,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(26, 25) Source(16, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(26, 62) Source(16, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(26, 25) Source(16, 21) + SourceIndex(0) +2 >Emitted(26, 62) Source(16, 58) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -646,10 +646,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(27, 25) Source(17, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(27, 29) Source(17, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(27, 31) Source(17, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(27, 32) Source(17, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(27, 25) Source(17, 21) + SourceIndex(0) +2 >Emitted(27, 29) Source(17, 25) + SourceIndex(0) +3 >Emitted(27, 31) Source(17, 76) + SourceIndex(0) +4 >Emitted(27, 32) Source(17, 77) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -665,12 +665,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(28, 25) Source(17, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(28, 27) Source(17, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(28, 28) Source(17, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(28, 38) Source(17, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(28, 40) Source(17, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(28, 41) Source(17, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(28, 25) Source(17, 78) + SourceIndex(0) +2 >Emitted(28, 27) Source(17, 80) + SourceIndex(0) +3 >Emitted(28, 28) Source(17, 81) + SourceIndex(0) +4 >Emitted(28, 38) Source(17, 91) + SourceIndex(0) +5 >Emitted(28, 40) Source(17, 93) + SourceIndex(0) +6 >Emitted(28, 41) Source(17, 94) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -679,8 +679,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(29, 25) Source(19, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(29, 47) Source(19, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(29, 25) Source(19, 21) + SourceIndex(0) +2 >Emitted(29, 47) Source(19, 43) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -693,10 +693,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(30, 25) Source(20, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(30, 29) Source(20, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(30, 31) Source(20, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(30, 32) Source(20, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(30, 25) Source(20, 21) + SourceIndex(0) +2 >Emitted(30, 29) Source(20, 25) + SourceIndex(0) +3 >Emitted(30, 31) Source(20, 39) + SourceIndex(0) +4 >Emitted(30, 32) Source(20, 40) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -711,12 +711,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(31, 25) Source(20, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(31, 27) Source(20, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(31, 28) Source(20, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(31, 38) Source(20, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(31, 40) Source(20, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(31, 41) Source(20, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(31, 25) Source(20, 41) + SourceIndex(0) +2 >Emitted(31, 27) Source(20, 43) + SourceIndex(0) +3 >Emitted(31, 28) Source(20, 44) + SourceIndex(0) +4 >Emitted(31, 38) Source(20, 54) + SourceIndex(0) +5 >Emitted(31, 40) Source(20, 56) + SourceIndex(0) +6 >Emitted(31, 41) Source(20, 57) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -729,10 +729,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(32, 25) Source(21, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(32, 29) Source(21, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(32, 31) Source(21, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(32, 32) Source(21, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(32, 25) Source(21, 21) + SourceIndex(0) +2 >Emitted(32, 29) Source(21, 25) + SourceIndex(0) +3 >Emitted(32, 31) Source(21, 53) + SourceIndex(0) +4 >Emitted(32, 32) Source(21, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -747,12 +747,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(33, 25) Source(21, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(33, 27) Source(21, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(33, 28) Source(21, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(33, 38) Source(21, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(33, 40) Source(21, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(33, 41) Source(21, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(33, 25) Source(21, 55) + SourceIndex(0) +2 >Emitted(33, 27) Source(21, 57) + SourceIndex(0) +3 >Emitted(33, 28) Source(21, 58) + SourceIndex(0) +4 >Emitted(33, 38) Source(21, 68) + SourceIndex(0) +5 >Emitted(33, 40) Source(21, 70) + SourceIndex(0) +6 >Emitted(33, 41) Source(21, 71) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -761,8 +761,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(34, 21) Source(22, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(34, 22) Source(22, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(34, 21) Source(22, 17) + SourceIndex(0) +2 >Emitted(34, 22) Source(22, 18) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^^^^^ @@ -770,8 +770,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(35, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(35, 34) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(35, 21) Source(23, 13) + SourceIndex(0) +2 >Emitted(35, 34) Source(23, 14) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -802,10 +802,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(36, 17) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(36, 18) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -3 >Emitted(36, 18) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(36, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(36, 17) Source(23, 13) + SourceIndex(0) +2 >Emitted(36, 18) Source(23, 14) + SourceIndex(0) +3 >Emitted(36, 18) Source(4, 13) + SourceIndex(0) +4 >Emitted(36, 22) Source(23, 14) + SourceIndex(0) --- >>> SubSubModule1.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -835,23 +835,23 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(37, 17) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(37, 37) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(37, 46) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(37, 47) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(37, 17) Source(4, 26) + SourceIndex(0) +2 >Emitted(37, 37) Source(4, 32) + SourceIndex(0) +3 >Emitted(37, 46) Source(23, 14) + SourceIndex(0) +4 >Emitted(37, 47) Source(23, 14) + SourceIndex(0) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 17) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(38, 17) Source(24, 13) + SourceIndex(0) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(39, 21) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(39, 21) Source(24, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -881,8 +881,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(40, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) -2 >Emitted(40, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) +1->Emitted(40, 21) Source(46, 13) + SourceIndex(0) +2 >Emitted(40, 22) Source(46, 14) + SourceIndex(0) --- >>> ClassB.prototype.BisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -892,9 +892,9 @@ sourceFile:typeResolution.ts 1-> 2 > BisIn1_1_1 3 > -1->Emitted(41, 21) Source(25, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(41, 48) Source(25, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -3 >Emitted(41, 51) Source(25, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(41, 21) Source(25, 24) + SourceIndex(0) +2 >Emitted(41, 48) Source(25, 34) + SourceIndex(0) +3 >Emitted(41, 51) Source(25, 17) + SourceIndex(0) --- >>> /** Exactly the same as above in AisIn1_1_1 **/ 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -902,8 +902,8 @@ sourceFile:typeResolution.ts 1->public BisIn1_1_1() { > 2 > /** Exactly the same as above in AisIn1_1_1 **/ -1->Emitted(42, 25) Source(26, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(42, 72) Source(26, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(42, 25) Source(26, 21) + SourceIndex(0) +2 >Emitted(42, 72) Source(26, 68) + SourceIndex(0) --- >>> // Try all qualified names of this type 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -912,8 +912,8 @@ sourceFile:typeResolution.ts > > 2 > // Try all qualified names of this type -1 >Emitted(43, 25) Source(28, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(43, 64) Source(28, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(43, 25) Source(28, 21) + SourceIndex(0) +2 >Emitted(43, 64) Source(28, 60) + SourceIndex(0) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -926,10 +926,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(44, 25) Source(29, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(44, 29) Source(29, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(44, 31) Source(29, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(44, 32) Source(29, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(44, 25) Source(29, 21) + SourceIndex(0) +2 >Emitted(44, 29) Source(29, 25) + SourceIndex(0) +3 >Emitted(44, 31) Source(29, 35) + SourceIndex(0) +4 >Emitted(44, 32) Source(29, 36) + SourceIndex(0) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -944,12 +944,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(45, 25) Source(29, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(45, 27) Source(29, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(45, 28) Source(29, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(45, 38) Source(29, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(45, 40) Source(29, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(45, 41) Source(29, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(45, 25) Source(29, 37) + SourceIndex(0) +2 >Emitted(45, 27) Source(29, 39) + SourceIndex(0) +3 >Emitted(45, 28) Source(29, 40) + SourceIndex(0) +4 >Emitted(45, 38) Source(29, 50) + SourceIndex(0) +5 >Emitted(45, 40) Source(29, 52) + SourceIndex(0) +6 >Emitted(45, 41) Source(29, 53) + SourceIndex(0) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -962,10 +962,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(46, 25) Source(30, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(46, 29) Source(30, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(46, 31) Source(30, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(46, 32) Source(30, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(46, 25) Source(30, 21) + SourceIndex(0) +2 >Emitted(46, 29) Source(30, 25) + SourceIndex(0) +3 >Emitted(46, 31) Source(30, 49) + SourceIndex(0) +4 >Emitted(46, 32) Source(30, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -980,12 +980,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(47, 25) Source(30, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(47, 27) Source(30, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(47, 28) Source(30, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(47, 38) Source(30, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(47, 40) Source(30, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(47, 41) Source(30, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(47, 25) Source(30, 51) + SourceIndex(0) +2 >Emitted(47, 27) Source(30, 53) + SourceIndex(0) +3 >Emitted(47, 28) Source(30, 54) + SourceIndex(0) +4 >Emitted(47, 38) Source(30, 64) + SourceIndex(0) +5 >Emitted(47, 40) Source(30, 66) + SourceIndex(0) +6 >Emitted(47, 41) Source(30, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -998,10 +998,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(48, 25) Source(31, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(48, 29) Source(31, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(48, 31) Source(31, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(48, 32) Source(31, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(48, 25) Source(31, 21) + SourceIndex(0) +2 >Emitted(48, 29) Source(31, 25) + SourceIndex(0) +3 >Emitted(48, 31) Source(31, 60) + SourceIndex(0) +4 >Emitted(48, 32) Source(31, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1016,12 +1016,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(49, 25) Source(31, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(49, 27) Source(31, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(49, 28) Source(31, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(49, 38) Source(31, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(49, 40) Source(31, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(49, 41) Source(31, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(49, 25) Source(31, 62) + SourceIndex(0) +2 >Emitted(49, 27) Source(31, 64) + SourceIndex(0) +3 >Emitted(49, 28) Source(31, 65) + SourceIndex(0) +4 >Emitted(49, 38) Source(31, 75) + SourceIndex(0) +5 >Emitted(49, 40) Source(31, 77) + SourceIndex(0) +6 >Emitted(49, 41) Source(31, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1034,10 +1034,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(50, 25) Source(32, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(50, 29) Source(32, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(50, 31) Source(32, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(50, 32) Source(32, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(50, 25) Source(32, 21) + SourceIndex(0) +2 >Emitted(50, 29) Source(32, 25) + SourceIndex(0) +3 >Emitted(50, 31) Source(32, 76) + SourceIndex(0) +4 >Emitted(50, 32) Source(32, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1053,12 +1053,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(51, 25) Source(32, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(51, 27) Source(32, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(51, 28) Source(32, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(51, 38) Source(32, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(51, 40) Source(32, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(51, 41) Source(32, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(51, 25) Source(32, 78) + SourceIndex(0) +2 >Emitted(51, 27) Source(32, 80) + SourceIndex(0) +3 >Emitted(51, 28) Source(32, 81) + SourceIndex(0) +4 >Emitted(51, 38) Source(32, 91) + SourceIndex(0) +5 >Emitted(51, 40) Source(32, 93) + SourceIndex(0) +6 >Emitted(51, 41) Source(32, 94) + SourceIndex(0) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1067,8 +1067,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(52, 25) Source(34, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(52, 66) Source(34, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(52, 25) Source(34, 21) + SourceIndex(0) +2 >Emitted(52, 66) Source(34, 62) + SourceIndex(0) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1081,10 +1081,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(53, 25) Source(35, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(53, 29) Source(35, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(53, 31) Source(35, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(53, 32) Source(35, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(53, 25) Source(35, 21) + SourceIndex(0) +2 >Emitted(53, 29) Source(35, 25) + SourceIndex(0) +3 >Emitted(53, 31) Source(35, 35) + SourceIndex(0) +4 >Emitted(53, 32) Source(35, 36) + SourceIndex(0) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1099,12 +1099,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(54, 25) Source(35, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(54, 27) Source(35, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(54, 28) Source(35, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(54, 38) Source(35, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(54, 40) Source(35, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(54, 41) Source(35, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(54, 25) Source(35, 37) + SourceIndex(0) +2 >Emitted(54, 27) Source(35, 39) + SourceIndex(0) +3 >Emitted(54, 28) Source(35, 40) + SourceIndex(0) +4 >Emitted(54, 38) Source(35, 50) + SourceIndex(0) +5 >Emitted(54, 40) Source(35, 52) + SourceIndex(0) +6 >Emitted(54, 41) Source(35, 53) + SourceIndex(0) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1117,10 +1117,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(55, 25) Source(36, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(55, 29) Source(36, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(55, 31) Source(36, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(55, 32) Source(36, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(55, 25) Source(36, 21) + SourceIndex(0) +2 >Emitted(55, 29) Source(36, 25) + SourceIndex(0) +3 >Emitted(55, 31) Source(36, 76) + SourceIndex(0) +4 >Emitted(55, 32) Source(36, 77) + SourceIndex(0) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1136,12 +1136,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(56, 25) Source(36, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(56, 27) Source(36, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(56, 28) Source(36, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(56, 38) Source(36, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(56, 40) Source(36, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(56, 41) Source(36, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(56, 25) Source(36, 78) + SourceIndex(0) +2 >Emitted(56, 27) Source(36, 80) + SourceIndex(0) +3 >Emitted(56, 28) Source(36, 81) + SourceIndex(0) +4 >Emitted(56, 38) Source(36, 91) + SourceIndex(0) +5 >Emitted(56, 40) Source(36, 93) + SourceIndex(0) +6 >Emitted(56, 41) Source(36, 94) + SourceIndex(0) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1150,8 +1150,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(57, 25) Source(38, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(57, 62) Source(38, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(57, 25) Source(38, 21) + SourceIndex(0) +2 >Emitted(57, 62) Source(38, 58) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1164,10 +1164,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(58, 25) Source(39, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(58, 29) Source(39, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(58, 31) Source(39, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(58, 32) Source(39, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(58, 25) Source(39, 21) + SourceIndex(0) +2 >Emitted(58, 29) Source(39, 25) + SourceIndex(0) +3 >Emitted(58, 31) Source(39, 76) + SourceIndex(0) +4 >Emitted(58, 32) Source(39, 77) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1182,12 +1182,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(59, 25) Source(39, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(59, 27) Source(39, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(59, 28) Source(39, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(59, 38) Source(39, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(59, 40) Source(39, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(59, 41) Source(39, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(59, 25) Source(39, 78) + SourceIndex(0) +2 >Emitted(59, 27) Source(39, 80) + SourceIndex(0) +3 >Emitted(59, 28) Source(39, 81) + SourceIndex(0) +4 >Emitted(59, 38) Source(39, 91) + SourceIndex(0) +5 >Emitted(59, 40) Source(39, 93) + SourceIndex(0) +6 >Emitted(59, 41) Source(39, 94) + SourceIndex(0) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1200,10 +1200,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(60, 25) Source(40, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(60, 29) Source(40, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(60, 31) Source(40, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(60, 32) Source(40, 63) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(60, 25) Source(40, 21) + SourceIndex(0) +2 >Emitted(60, 29) Source(40, 25) + SourceIndex(0) +3 >Emitted(60, 31) Source(40, 62) + SourceIndex(0) +4 >Emitted(60, 32) Source(40, 63) + SourceIndex(0) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1219,12 +1219,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(61, 25) Source(40, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(61, 27) Source(40, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(61, 28) Source(40, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(61, 36) Source(40, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(61, 38) Source(40, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(61, 39) Source(40, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(61, 25) Source(40, 64) + SourceIndex(0) +2 >Emitted(61, 27) Source(40, 66) + SourceIndex(0) +3 >Emitted(61, 28) Source(40, 67) + SourceIndex(0) +4 >Emitted(61, 36) Source(40, 75) + SourceIndex(0) +5 >Emitted(61, 38) Source(40, 77) + SourceIndex(0) +6 >Emitted(61, 39) Source(40, 78) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1233,8 +1233,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(62, 25) Source(42, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(62, 47) Source(42, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(62, 25) Source(42, 21) + SourceIndex(0) +2 >Emitted(62, 47) Source(42, 43) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1247,10 +1247,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(63, 25) Source(43, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(63, 29) Source(43, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(63, 31) Source(43, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(63, 32) Source(43, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(63, 25) Source(43, 21) + SourceIndex(0) +2 >Emitted(63, 29) Source(43, 25) + SourceIndex(0) +3 >Emitted(63, 31) Source(43, 39) + SourceIndex(0) +4 >Emitted(63, 32) Source(43, 40) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1265,12 +1265,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(64, 25) Source(43, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(64, 27) Source(43, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(64, 28) Source(43, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(64, 38) Source(43, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(64, 40) Source(43, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(64, 41) Source(43, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(64, 25) Source(43, 41) + SourceIndex(0) +2 >Emitted(64, 27) Source(43, 43) + SourceIndex(0) +3 >Emitted(64, 28) Source(43, 44) + SourceIndex(0) +4 >Emitted(64, 38) Source(43, 54) + SourceIndex(0) +5 >Emitted(64, 40) Source(43, 56) + SourceIndex(0) +6 >Emitted(64, 41) Source(43, 57) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1283,10 +1283,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(65, 25) Source(44, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(65, 29) Source(44, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(65, 31) Source(44, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(65, 32) Source(44, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(65, 25) Source(44, 21) + SourceIndex(0) +2 >Emitted(65, 29) Source(44, 25) + SourceIndex(0) +3 >Emitted(65, 31) Source(44, 53) + SourceIndex(0) +4 >Emitted(65, 32) Source(44, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1301,12 +1301,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(66, 25) Source(44, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(66, 27) Source(44, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(66, 28) Source(44, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(66, 38) Source(44, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(66, 40) Source(44, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(66, 41) Source(44, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(66, 25) Source(44, 55) + SourceIndex(0) +2 >Emitted(66, 27) Source(44, 57) + SourceIndex(0) +3 >Emitted(66, 28) Source(44, 58) + SourceIndex(0) +4 >Emitted(66, 38) Source(44, 68) + SourceIndex(0) +5 >Emitted(66, 40) Source(44, 70) + SourceIndex(0) +6 >Emitted(66, 41) Source(44, 71) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1315,8 +1315,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(67, 21) Source(45, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(67, 22) Source(45, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(67, 21) Source(45, 17) + SourceIndex(0) +2 >Emitted(67, 22) Source(45, 18) + SourceIndex(0) --- >>> return ClassB; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1324,8 +1324,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(68, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(68, 34) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(68, 21) Source(46, 13) + SourceIndex(0) +2 >Emitted(68, 34) Source(46, 14) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1359,10 +1359,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(69, 17) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(69, 18) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -3 >Emitted(69, 18) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(69, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(69, 17) Source(46, 13) + SourceIndex(0) +2 >Emitted(69, 18) Source(46, 14) + SourceIndex(0) +3 >Emitted(69, 18) Source(24, 13) + SourceIndex(0) +4 >Emitted(69, 22) Source(46, 14) + SourceIndex(0) --- >>> SubSubModule1.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -1396,10 +1396,10 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(70, 17) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(70, 37) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(70, 46) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(70, 47) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(70, 17) Source(24, 26) + SourceIndex(0) +2 >Emitted(70, 37) Source(24, 32) + SourceIndex(0) +3 >Emitted(70, 46) Source(46, 14) + SourceIndex(0) +4 >Emitted(70, 47) Source(46, 14) + SourceIndex(0) --- >>> var NonExportedClassQ = (function () { 1->^^^^^^^^^^^^^^^^ @@ -1407,21 +1407,21 @@ sourceFile:typeResolution.ts 1-> > export interface InterfaceX { XisIn1_1_1(); } > -1->Emitted(71, 17) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(71, 17) Source(48, 13) + SourceIndex(0) --- >>> function NonExportedClassQ() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class NonExportedClassQ { > -1->Emitted(72, 21) Source(49, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +1->Emitted(72, 21) Source(49, 17) + SourceIndex(0) --- >>> function QQ() { 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(73, 25) Source(50, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +1->Emitted(73, 25) Source(50, 21) + SourceIndex(0) --- >>> /* Sampling of stuff from AisIn1_1_1 */ 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1429,8 +1429,8 @@ sourceFile:typeResolution.ts 1->function QQ() { > 2 > /* Sampling of stuff from AisIn1_1_1 */ -1->Emitted(74, 29) Source(51, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(74, 68) Source(51, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(74, 29) Source(51, 25) + SourceIndex(0) +2 >Emitted(74, 68) Source(51, 64) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1443,10 +1443,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(75, 29) Source(52, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(75, 33) Source(52, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(75, 35) Source(52, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(75, 36) Source(52, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(75, 29) Source(52, 25) + SourceIndex(0) +2 >Emitted(75, 33) Source(52, 29) + SourceIndex(0) +3 >Emitted(75, 35) Source(52, 80) + SourceIndex(0) +4 >Emitted(75, 36) Source(52, 81) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1461,12 +1461,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(76, 29) Source(52, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(76, 31) Source(52, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(76, 32) Source(52, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(76, 42) Source(52, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(76, 44) Source(52, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(76, 45) Source(52, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(76, 29) Source(52, 82) + SourceIndex(0) +2 >Emitted(76, 31) Source(52, 84) + SourceIndex(0) +3 >Emitted(76, 32) Source(52, 85) + SourceIndex(0) +4 >Emitted(76, 42) Source(52, 95) + SourceIndex(0) +5 >Emitted(76, 44) Source(52, 97) + SourceIndex(0) +6 >Emitted(76, 45) Source(52, 98) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1479,10 +1479,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(77, 29) Source(53, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(77, 33) Source(53, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(77, 35) Source(53, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(77, 36) Source(53, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(77, 29) Source(53, 25) + SourceIndex(0) +2 >Emitted(77, 33) Source(53, 29) + SourceIndex(0) +3 >Emitted(77, 35) Source(53, 80) + SourceIndex(0) +4 >Emitted(77, 36) Source(53, 81) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1497,12 +1497,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(78, 29) Source(53, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(78, 31) Source(53, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(78, 32) Source(53, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(78, 42) Source(53, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(78, 44) Source(53, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(78, 45) Source(53, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(78, 29) Source(53, 82) + SourceIndex(0) +2 >Emitted(78, 31) Source(53, 84) + SourceIndex(0) +3 >Emitted(78, 32) Source(53, 85) + SourceIndex(0) +4 >Emitted(78, 42) Source(53, 95) + SourceIndex(0) +5 >Emitted(78, 44) Source(53, 97) + SourceIndex(0) +6 >Emitted(78, 45) Source(53, 98) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1515,10 +1515,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(79, 29) Source(54, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(79, 33) Source(54, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(79, 35) Source(54, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(79, 36) Source(54, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(79, 29) Source(54, 25) + SourceIndex(0) +2 >Emitted(79, 33) Source(54, 29) + SourceIndex(0) +3 >Emitted(79, 35) Source(54, 43) + SourceIndex(0) +4 >Emitted(79, 36) Source(54, 44) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1533,12 +1533,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(80, 29) Source(54, 45) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(80, 31) Source(54, 47) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(80, 32) Source(54, 48) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(80, 42) Source(54, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(80, 44) Source(54, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(80, 45) Source(54, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(80, 29) Source(54, 45) + SourceIndex(0) +2 >Emitted(80, 31) Source(54, 47) + SourceIndex(0) +3 >Emitted(80, 32) Source(54, 48) + SourceIndex(0) +4 >Emitted(80, 42) Source(54, 58) + SourceIndex(0) +5 >Emitted(80, 44) Source(54, 60) + SourceIndex(0) +6 >Emitted(80, 45) Source(54, 61) + SourceIndex(0) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1551,10 +1551,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(81, 29) Source(55, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(81, 33) Source(55, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(81, 35) Source(55, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(81, 36) Source(55, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(81, 29) Source(55, 25) + SourceIndex(0) +2 >Emitted(81, 33) Source(55, 29) + SourceIndex(0) +3 >Emitted(81, 35) Source(55, 66) + SourceIndex(0) +4 >Emitted(81, 36) Source(55, 67) + SourceIndex(0) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1569,12 +1569,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(82, 29) Source(55, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(82, 31) Source(55, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(82, 32) Source(55, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(82, 40) Source(55, 79) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(82, 42) Source(55, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(82, 43) Source(55, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(82, 29) Source(55, 68) + SourceIndex(0) +2 >Emitted(82, 31) Source(55, 70) + SourceIndex(0) +3 >Emitted(82, 32) Source(55, 71) + SourceIndex(0) +4 >Emitted(82, 40) Source(55, 79) + SourceIndex(0) +5 >Emitted(82, 42) Source(55, 81) + SourceIndex(0) +6 >Emitted(82, 43) Source(55, 82) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1582,8 +1582,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(83, 25) Source(56, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(83, 26) Source(56, 22) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(83, 25) Source(56, 21) + SourceIndex(0) +2 >Emitted(83, 26) Source(56, 22) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1592,8 +1592,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(84, 21) Source(57, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) -2 >Emitted(84, 22) Source(57, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +1 >Emitted(84, 21) Source(57, 17) + SourceIndex(0) +2 >Emitted(84, 22) Source(57, 18) + SourceIndex(0) --- >>> return NonExportedClassQ; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1601,8 +1601,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(85, 21) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -2 >Emitted(85, 45) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +1->Emitted(85, 21) Source(58, 13) + SourceIndex(0) +2 >Emitted(85, 45) Source(58, 14) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1624,10 +1624,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(86, 17) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -2 >Emitted(86, 18) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -3 >Emitted(86, 18) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(86, 22) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(86, 17) Source(58, 13) + SourceIndex(0) +2 >Emitted(86, 18) Source(58, 14) + SourceIndex(0) +3 >Emitted(86, 18) Source(48, 13) + SourceIndex(0) +4 >Emitted(86, 22) Source(58, 14) + SourceIndex(0) --- >>> })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); 1->^^^^^^^^^^^^ @@ -1705,15 +1705,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(87, 13) Source(59, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(87, 14) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(87, 16) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(87, 29) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -5 >Emitted(87, 32) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -6 >Emitted(87, 56) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -7 >Emitted(87, 61) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -8 >Emitted(87, 85) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -9 >Emitted(87, 93) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1->Emitted(87, 13) Source(59, 9) + SourceIndex(0) +2 >Emitted(87, 14) Source(59, 10) + SourceIndex(0) +3 >Emitted(87, 16) Source(3, 23) + SourceIndex(0) +4 >Emitted(87, 29) Source(3, 36) + SourceIndex(0) +5 >Emitted(87, 32) Source(3, 23) + SourceIndex(0) +6 >Emitted(87, 56) Source(3, 36) + SourceIndex(0) +7 >Emitted(87, 61) Source(3, 23) + SourceIndex(0) +8 >Emitted(87, 85) Source(3, 36) + SourceIndex(0) +9 >Emitted(87, 93) Source(59, 10) + SourceIndex(0) --- >>> // Should have no effect on S1.SS1.ClassA above because it is not exported 1 >^^^^^^^^^^^^ @@ -1722,29 +1722,29 @@ sourceFile:typeResolution.ts > > 2 > // Should have no effect on S1.SS1.ClassA above because it is not exported -1 >Emitted(88, 13) Source(61, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(88, 13) Source(61, 9) + SourceIndex(0) +2 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(89, 13) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(89, 13) Source(62, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class ClassA { > -1->Emitted(90, 17) Source(63, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +1->Emitted(90, 17) Source(63, 13) + SourceIndex(0) --- >>> function AA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(91, 21) Source(64, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) +1->Emitted(91, 21) Source(64, 17) + SourceIndex(0) --- >>> var a2; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1757,10 +1757,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1->Emitted(92, 25) Source(65, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(92, 29) Source(65, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(92, 31) Source(65, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(92, 32) Source(65, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(92, 25) Source(65, 21) + SourceIndex(0) +2 >Emitted(92, 29) Source(65, 25) + SourceIndex(0) +3 >Emitted(92, 31) Source(65, 49) + SourceIndex(0) +4 >Emitted(92, 32) Source(65, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1775,12 +1775,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(93, 25) Source(65, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(93, 27) Source(65, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(93, 28) Source(65, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(93, 38) Source(65, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(93, 40) Source(65, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(93, 41) Source(65, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(93, 25) Source(65, 51) + SourceIndex(0) +2 >Emitted(93, 27) Source(65, 53) + SourceIndex(0) +3 >Emitted(93, 28) Source(65, 54) + SourceIndex(0) +4 >Emitted(93, 38) Source(65, 64) + SourceIndex(0) +5 >Emitted(93, 40) Source(65, 66) + SourceIndex(0) +6 >Emitted(93, 41) Source(65, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1793,10 +1793,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(94, 25) Source(66, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(94, 29) Source(66, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(94, 31) Source(66, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(94, 32) Source(66, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(94, 25) Source(66, 21) + SourceIndex(0) +2 >Emitted(94, 29) Source(66, 25) + SourceIndex(0) +3 >Emitted(94, 31) Source(66, 60) + SourceIndex(0) +4 >Emitted(94, 32) Source(66, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1811,12 +1811,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(95, 25) Source(66, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(95, 27) Source(66, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(95, 28) Source(66, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(95, 38) Source(66, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(95, 40) Source(66, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(95, 41) Source(66, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(95, 25) Source(66, 62) + SourceIndex(0) +2 >Emitted(95, 27) Source(66, 64) + SourceIndex(0) +3 >Emitted(95, 28) Source(66, 65) + SourceIndex(0) +4 >Emitted(95, 38) Source(66, 75) + SourceIndex(0) +5 >Emitted(95, 40) Source(66, 77) + SourceIndex(0) +6 >Emitted(95, 41) Source(66, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1829,10 +1829,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(96, 25) Source(67, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(96, 29) Source(67, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(96, 31) Source(67, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(96, 32) Source(67, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(96, 25) Source(67, 21) + SourceIndex(0) +2 >Emitted(96, 29) Source(67, 25) + SourceIndex(0) +3 >Emitted(96, 31) Source(67, 76) + SourceIndex(0) +4 >Emitted(96, 32) Source(67, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1848,12 +1848,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(97, 25) Source(67, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(97, 27) Source(67, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(97, 28) Source(67, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(97, 38) Source(67, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(97, 40) Source(67, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(97, 41) Source(67, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(97, 25) Source(67, 78) + SourceIndex(0) +2 >Emitted(97, 27) Source(67, 80) + SourceIndex(0) +3 >Emitted(97, 28) Source(67, 81) + SourceIndex(0) +4 >Emitted(97, 38) Source(67, 91) + SourceIndex(0) +5 >Emitted(97, 40) Source(67, 93) + SourceIndex(0) +6 >Emitted(97, 41) Source(67, 94) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1862,8 +1862,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(98, 25) Source(69, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(98, 47) Source(69, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(98, 25) Source(69, 21) + SourceIndex(0) +2 >Emitted(98, 47) Source(69, 43) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1876,10 +1876,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(99, 25) Source(70, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(99, 29) Source(70, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(99, 31) Source(70, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(99, 32) Source(70, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(99, 25) Source(70, 21) + SourceIndex(0) +2 >Emitted(99, 29) Source(70, 25) + SourceIndex(0) +3 >Emitted(99, 31) Source(70, 53) + SourceIndex(0) +4 >Emitted(99, 32) Source(70, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1894,12 +1894,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(100, 25) Source(70, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(100, 27) Source(70, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(100, 28) Source(70, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(100, 38) Source(70, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(100, 40) Source(70, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(100, 41) Source(70, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(100, 25) Source(70, 55) + SourceIndex(0) +2 >Emitted(100, 27) Source(70, 57) + SourceIndex(0) +3 >Emitted(100, 28) Source(70, 58) + SourceIndex(0) +4 >Emitted(100, 38) Source(70, 68) + SourceIndex(0) +5 >Emitted(100, 40) Source(70, 70) + SourceIndex(0) +6 >Emitted(100, 41) Source(70, 71) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1907,8 +1907,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(101, 21) Source(71, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(101, 22) Source(71, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(101, 21) Source(71, 17) + SourceIndex(0) +2 >Emitted(101, 22) Source(71, 18) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -1917,8 +1917,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(102, 17) Source(72, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) -2 >Emitted(102, 18) Source(72, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) +1 >Emitted(102, 17) Source(72, 13) + SourceIndex(0) +2 >Emitted(102, 18) Source(72, 14) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ @@ -1926,8 +1926,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(103, 17) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -2 >Emitted(103, 30) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +1->Emitted(103, 17) Source(73, 9) + SourceIndex(0) +2 >Emitted(103, 30) Source(73, 10) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -1950,10 +1950,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(104, 13) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -2 >Emitted(104, 14) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -3 >Emitted(104, 14) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(104, 18) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(104, 13) Source(73, 9) + SourceIndex(0) +2 >Emitted(104, 14) Source(73, 10) + SourceIndex(0) +3 >Emitted(104, 14) Source(62, 9) + SourceIndex(0) +4 >Emitted(104, 18) Source(73, 10) + SourceIndex(0) --- >>> })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); 1->^^^^^^^^ @@ -2047,15 +2047,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(105, 9) Source(74, 5) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(105, 10) Source(74, 6) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(105, 12) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(105, 22) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(105, 25) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(105, 51) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(105, 56) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -8 >Emitted(105, 82) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -9 >Emitted(105, 90) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(105, 9) Source(74, 5) + SourceIndex(0) +2 >Emitted(105, 10) Source(74, 6) + SourceIndex(0) +3 >Emitted(105, 12) Source(2, 19) + SourceIndex(0) +4 >Emitted(105, 22) Source(2, 29) + SourceIndex(0) +5 >Emitted(105, 25) Source(2, 19) + SourceIndex(0) +6 >Emitted(105, 51) Source(2, 29) + SourceIndex(0) +7 >Emitted(105, 56) Source(2, 19) + SourceIndex(0) +8 >Emitted(105, 82) Source(2, 29) + SourceIndex(0) +9 >Emitted(105, 90) Source(74, 6) + SourceIndex(0) --- >>> var SubModule2; 1 >^^^^^^^^ @@ -2080,10 +2080,10 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(106, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(106, 13) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(106, 23) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(106, 24) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(106, 9) Source(76, 5) + SourceIndex(0) +2 >Emitted(106, 13) Source(76, 19) + SourceIndex(0) +3 >Emitted(106, 23) Source(76, 29) + SourceIndex(0) +4 >Emitted(106, 24) Source(87, 6) + SourceIndex(0) --- >>> (function (SubModule2) { 1->^^^^^^^^ @@ -2096,11 +2096,11 @@ sourceFile:typeResolution.ts 3 > SubModule2 4 > 5 > { -1->Emitted(107, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(107, 20) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(107, 30) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(107, 32) Source(76, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(107, 33) Source(76, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(107, 9) Source(76, 5) + SourceIndex(0) +2 >Emitted(107, 20) Source(76, 19) + SourceIndex(0) +3 >Emitted(107, 30) Source(76, 29) + SourceIndex(0) +4 >Emitted(107, 32) Source(76, 30) + SourceIndex(0) +5 >Emitted(107, 33) Source(76, 31) + SourceIndex(0) --- >>> var SubSubModule2; 1 >^^^^^^^^^^^^ @@ -2120,10 +2120,10 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1 >Emitted(108, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(108, 17) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(108, 30) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(108, 31) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1 >Emitted(108, 13) Source(77, 9) + SourceIndex(0) +2 >Emitted(108, 17) Source(77, 23) + SourceIndex(0) +3 >Emitted(108, 30) Source(77, 36) + SourceIndex(0) +4 >Emitted(108, 31) Source(84, 10) + SourceIndex(0) --- >>> (function (SubSubModule2) { 1->^^^^^^^^^^^^ @@ -2137,11 +2137,11 @@ sourceFile:typeResolution.ts 3 > SubSubModule2 4 > 5 > { -1->Emitted(109, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(109, 24) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(109, 37) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(109, 39) Source(77, 37) + SourceIndex(0) name (TopLevelModule1.SubModule2) -5 >Emitted(109, 40) Source(77, 38) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1->Emitted(109, 13) Source(77, 9) + SourceIndex(0) +2 >Emitted(109, 24) Source(77, 23) + SourceIndex(0) +3 >Emitted(109, 37) Source(77, 36) + SourceIndex(0) +4 >Emitted(109, 39) Source(77, 37) + SourceIndex(0) +5 >Emitted(109, 40) Source(77, 38) + SourceIndex(0) --- >>> // No code here since these are the mirror of the above calls 1->^^^^^^^^^^^^^^^^ @@ -2149,21 +2149,21 @@ sourceFile:typeResolution.ts 1-> > 2 > // No code here since these are the mirror of the above calls -1->Emitted(110, 17) Source(78, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(110, 17) Source(78, 13) + SourceIndex(0) +2 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(111, 17) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(111, 17) Source(79, 13) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(112, 21) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1->Emitted(112, 21) Source(79, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2171,8 +2171,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassA { public AisIn1_2_2() { } 2 > } -1->Emitted(113, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) -2 >Emitted(113, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) +1->Emitted(113, 21) Source(79, 59) + SourceIndex(0) +2 >Emitted(113, 22) Source(79, 60) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2185,19 +2185,19 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1_2_2() { 5 > } -1->Emitted(114, 21) Source(79, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(114, 48) Source(79, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(114, 51) Source(79, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -4 >Emitted(114, 65) Source(79, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) -5 >Emitted(114, 66) Source(79, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) +1->Emitted(114, 21) Source(79, 42) + SourceIndex(0) +2 >Emitted(114, 48) Source(79, 52) + SourceIndex(0) +3 >Emitted(114, 51) Source(79, 35) + SourceIndex(0) +4 >Emitted(114, 65) Source(79, 57) + SourceIndex(0) +5 >Emitted(114, 66) Source(79, 58) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(115, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(115, 34) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1 >Emitted(115, 21) Source(79, 59) + SourceIndex(0) +2 >Emitted(115, 34) Source(79, 60) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2209,10 +2209,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { public AisIn1_2_2() { } } -1 >Emitted(116, 17) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(116, 18) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(116, 18) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(116, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(116, 17) Source(79, 59) + SourceIndex(0) +2 >Emitted(116, 18) Source(79, 60) + SourceIndex(0) +3 >Emitted(116, 18) Source(79, 13) + SourceIndex(0) +4 >Emitted(116, 22) Source(79, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -2223,23 +2223,23 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { public AisIn1_2_2() { } } 4 > -1->Emitted(117, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(117, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(117, 17) Source(79, 26) + SourceIndex(0) +2 >Emitted(117, 37) Source(79, 32) + SourceIndex(0) +3 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) +4 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(118, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(118, 17) Source(80, 13) + SourceIndex(0) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(119, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1->Emitted(119, 21) Source(80, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2247,8 +2247,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassB { public BisIn1_2_2() { } 2 > } -1->Emitted(120, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) -2 >Emitted(120, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +1->Emitted(120, 21) Source(80, 59) + SourceIndex(0) +2 >Emitted(120, 22) Source(80, 60) + SourceIndex(0) --- >>> ClassB.prototype.BisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2261,19 +2261,19 @@ sourceFile:typeResolution.ts 3 > 4 > public BisIn1_2_2() { 5 > } -1->Emitted(121, 21) Source(80, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(121, 48) Source(80, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(121, 51) Source(80, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -4 >Emitted(121, 65) Source(80, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) -5 >Emitted(121, 66) Source(80, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) +1->Emitted(121, 21) Source(80, 42) + SourceIndex(0) +2 >Emitted(121, 48) Source(80, 52) + SourceIndex(0) +3 >Emitted(121, 51) Source(80, 35) + SourceIndex(0) +4 >Emitted(121, 65) Source(80, 57) + SourceIndex(0) +5 >Emitted(121, 66) Source(80, 58) + SourceIndex(0) --- >>> return ClassB; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(122, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(122, 34) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1 >Emitted(122, 21) Source(80, 59) + SourceIndex(0) +2 >Emitted(122, 34) Source(80, 60) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2285,10 +2285,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassB { public BisIn1_2_2() { } } -1 >Emitted(123, 17) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(123, 18) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(123, 18) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(123, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(123, 17) Source(80, 59) + SourceIndex(0) +2 >Emitted(123, 18) Source(80, 60) + SourceIndex(0) +3 >Emitted(123, 18) Source(80, 13) + SourceIndex(0) +4 >Emitted(123, 22) Source(80, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -2299,23 +2299,23 @@ sourceFile:typeResolution.ts 2 > ClassB 3 > { public BisIn1_2_2() { } } 4 > -1->Emitted(124, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(124, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(124, 17) Source(80, 26) + SourceIndex(0) +2 >Emitted(124, 37) Source(80, 32) + SourceIndex(0) +3 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) +4 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) --- >>> var ClassC = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(125, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(125, 17) Source(81, 13) + SourceIndex(0) --- >>> function ClassC() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(126, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1->Emitted(126, 21) Source(81, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2323,8 +2323,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassC { public CisIn1_2_2() { } 2 > } -1->Emitted(127, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) -2 >Emitted(127, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +1->Emitted(127, 21) Source(81, 59) + SourceIndex(0) +2 >Emitted(127, 22) Source(81, 60) + SourceIndex(0) --- >>> ClassC.prototype.CisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2337,19 +2337,19 @@ sourceFile:typeResolution.ts 3 > 4 > public CisIn1_2_2() { 5 > } -1->Emitted(128, 21) Source(81, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(128, 48) Source(81, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(128, 51) Source(81, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -4 >Emitted(128, 65) Source(81, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) -5 >Emitted(128, 66) Source(81, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) +1->Emitted(128, 21) Source(81, 42) + SourceIndex(0) +2 >Emitted(128, 48) Source(81, 52) + SourceIndex(0) +3 >Emitted(128, 51) Source(81, 35) + SourceIndex(0) +4 >Emitted(128, 65) Source(81, 57) + SourceIndex(0) +5 >Emitted(128, 66) Source(81, 58) + SourceIndex(0) --- >>> return ClassC; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(129, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(129, 34) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1 >Emitted(129, 21) Source(81, 59) + SourceIndex(0) +2 >Emitted(129, 34) Source(81, 60) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2361,10 +2361,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassC { public CisIn1_2_2() { } } -1 >Emitted(130, 17) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(130, 18) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(130, 18) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(130, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(130, 17) Source(81, 59) + SourceIndex(0) +2 >Emitted(130, 18) Source(81, 60) + SourceIndex(0) +3 >Emitted(130, 18) Source(81, 13) + SourceIndex(0) +4 >Emitted(130, 22) Source(81, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassC = ClassC; 1->^^^^^^^^^^^^^^^^ @@ -2376,10 +2376,10 @@ sourceFile:typeResolution.ts 2 > ClassC 3 > { public CisIn1_2_2() { } } 4 > -1->Emitted(131, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(131, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(131, 17) Source(81, 26) + SourceIndex(0) +2 >Emitted(131, 37) Source(81, 32) + SourceIndex(0) +3 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) +4 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) --- >>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); 1->^^^^^^^^^^^^ @@ -2410,15 +2410,15 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1->Emitted(132, 13) Source(84, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(132, 14) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(132, 16) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(132, 29) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -5 >Emitted(132, 32) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -6 >Emitted(132, 56) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -7 >Emitted(132, 61) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -8 >Emitted(132, 85) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -9 >Emitted(132, 93) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1->Emitted(132, 13) Source(84, 9) + SourceIndex(0) +2 >Emitted(132, 14) Source(84, 10) + SourceIndex(0) +3 >Emitted(132, 16) Source(77, 23) + SourceIndex(0) +4 >Emitted(132, 29) Source(77, 36) + SourceIndex(0) +5 >Emitted(132, 32) Source(77, 23) + SourceIndex(0) +6 >Emitted(132, 56) Source(77, 36) + SourceIndex(0) +7 >Emitted(132, 61) Source(77, 23) + SourceIndex(0) +8 >Emitted(132, 85) Source(77, 36) + SourceIndex(0) +9 >Emitted(132, 93) Source(84, 10) + SourceIndex(0) --- >>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); 1 >^^^^^^^^ @@ -2453,15 +2453,15 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(133, 9) Source(87, 5) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(133, 10) Source(87, 6) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(133, 12) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(133, 22) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(133, 25) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(133, 51) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(133, 56) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -8 >Emitted(133, 82) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -9 >Emitted(133, 90) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(133, 9) Source(87, 5) + SourceIndex(0) +2 >Emitted(133, 10) Source(87, 6) + SourceIndex(0) +3 >Emitted(133, 12) Source(76, 19) + SourceIndex(0) +4 >Emitted(133, 22) Source(76, 29) + SourceIndex(0) +5 >Emitted(133, 25) Source(76, 19) + SourceIndex(0) +6 >Emitted(133, 51) Source(76, 29) + SourceIndex(0) +7 >Emitted(133, 56) Source(76, 19) + SourceIndex(0) +8 >Emitted(133, 82) Source(76, 29) + SourceIndex(0) +9 >Emitted(133, 90) Source(87, 6) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^ @@ -2469,13 +2469,13 @@ sourceFile:typeResolution.ts 1 > > > -1 >Emitted(134, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(134, 9) Source(89, 5) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(135, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +1->Emitted(135, 13) Source(89, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^ @@ -2485,8 +2485,8 @@ sourceFile:typeResolution.ts > public AisIn1() { } > 2 > } -1->Emitted(136, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) -2 >Emitted(136, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +1->Emitted(136, 13) Source(91, 5) + SourceIndex(0) +2 >Emitted(136, 14) Source(91, 6) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1 = function () { }; 1->^^^^^^^^^^^^ @@ -2499,11 +2499,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1() { 5 > } -1->Emitted(137, 13) Source(90, 16) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(137, 36) Source(90, 22) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(137, 39) Source(90, 9) + SourceIndex(0) name (TopLevelModule1.ClassA) -4 >Emitted(137, 53) Source(90, 27) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) -5 >Emitted(137, 54) Source(90, 28) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) +1->Emitted(137, 13) Source(90, 16) + SourceIndex(0) +2 >Emitted(137, 36) Source(90, 22) + SourceIndex(0) +3 >Emitted(137, 39) Source(90, 9) + SourceIndex(0) +4 >Emitted(137, 53) Source(90, 27) + SourceIndex(0) +5 >Emitted(137, 54) Source(90, 28) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^ @@ -2511,8 +2511,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(138, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(138, 26) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) +1 >Emitted(138, 13) Source(91, 5) + SourceIndex(0) +2 >Emitted(138, 26) Source(91, 6) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^ @@ -2526,10 +2526,10 @@ sourceFile:typeResolution.ts 4 > class ClassA { > public AisIn1() { } > } -1 >Emitted(139, 9) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(139, 10) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(139, 10) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(139, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(139, 9) Source(91, 5) + SourceIndex(0) +2 >Emitted(139, 10) Source(91, 6) + SourceIndex(0) +3 >Emitted(139, 10) Source(89, 5) + SourceIndex(0) +4 >Emitted(139, 14) Source(91, 6) + SourceIndex(0) --- >>> var NotExportedModule; 1->^^^^^^^^ @@ -2549,10 +2549,10 @@ sourceFile:typeResolution.ts 4 > { > export class ClassA { } > } -1->Emitted(140, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(140, 13) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(140, 30) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(140, 31) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(140, 9) Source(97, 5) + SourceIndex(0) +2 >Emitted(140, 13) Source(97, 12) + SourceIndex(0) +3 >Emitted(140, 30) Source(97, 29) + SourceIndex(0) +4 >Emitted(140, 31) Source(99, 6) + SourceIndex(0) --- >>> (function (NotExportedModule) { 1->^^^^^^^^ @@ -2566,24 +2566,24 @@ sourceFile:typeResolution.ts 3 > NotExportedModule 4 > 5 > { -1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(141, 20) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(141, 37) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(141, 39) Source(97, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(141, 40) Source(97, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) +2 >Emitted(141, 20) Source(97, 12) + SourceIndex(0) +3 >Emitted(141, 37) Source(97, 29) + SourceIndex(0) +4 >Emitted(141, 39) Source(97, 30) + SourceIndex(0) +5 >Emitted(141, 40) Source(97, 31) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(142, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(142, 13) Source(98, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(143, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(143, 17) Source(98, 9) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2591,16 +2591,16 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^-> 1->export class ClassA { 2 > } -1->Emitted(144, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) -2 >Emitted(144, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +1->Emitted(144, 17) Source(98, 31) + SourceIndex(0) +2 >Emitted(144, 18) Source(98, 32) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(145, 30) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) +2 >Emitted(145, 30) Source(98, 32) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2612,10 +2612,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { } -1 >Emitted(146, 13) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(146, 14) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -3 >Emitted(146, 14) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(146, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1 >Emitted(146, 13) Source(98, 31) + SourceIndex(0) +2 >Emitted(146, 14) Source(98, 32) + SourceIndex(0) +3 >Emitted(146, 14) Source(98, 9) + SourceIndex(0) +4 >Emitted(146, 18) Source(98, 32) + SourceIndex(0) --- >>> NotExportedModule.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2627,10 +2627,10 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { } 4 > -1->Emitted(147, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(147, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(147, 13) Source(98, 22) + SourceIndex(0) +2 >Emitted(147, 37) Source(98, 28) + SourceIndex(0) +3 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) +4 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) --- >>> })(NotExportedModule || (NotExportedModule = {})); 1->^^^^^^^^ @@ -2651,13 +2651,13 @@ sourceFile:typeResolution.ts 7 > { > export class ClassA { } > } -1->Emitted(148, 9) Source(99, 5) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(148, 10) Source(99, 6) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(148, 12) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(148, 29) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(148, 34) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(148, 51) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(148, 59) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(148, 9) Source(99, 5) + SourceIndex(0) +2 >Emitted(148, 10) Source(99, 6) + SourceIndex(0) +3 >Emitted(148, 12) Source(97, 12) + SourceIndex(0) +4 >Emitted(148, 29) Source(97, 29) + SourceIndex(0) +5 >Emitted(148, 34) Source(97, 12) + SourceIndex(0) +6 >Emitted(148, 51) Source(97, 29) + SourceIndex(0) +7 >Emitted(148, 59) Source(99, 6) + SourceIndex(0) --- >>> })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); 1->^^^^ @@ -2778,8 +2778,8 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -1->Emitted(149, 5) Source(100, 1) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(149, 6) Source(100, 2) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(149, 5) Source(100, 1) + SourceIndex(0) +2 >Emitted(149, 6) Source(100, 2) + SourceIndex(0) 3 >Emitted(149, 8) Source(1, 15) + SourceIndex(0) 4 >Emitted(149, 23) Source(1, 30) + SourceIndex(0) 5 >Emitted(149, 26) Source(1, 15) + SourceIndex(0) @@ -2843,10 +2843,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1 >Emitted(152, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(152, 13) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(152, 23) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(152, 24) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1 >Emitted(152, 9) Source(103, 5) + SourceIndex(0) +2 >Emitted(152, 13) Source(103, 19) + SourceIndex(0) +3 >Emitted(152, 23) Source(103, 29) + SourceIndex(0) +4 >Emitted(152, 24) Source(107, 6) + SourceIndex(0) --- >>> (function (SubModule3) { 1->^^^^^^^^ @@ -2860,24 +2860,24 @@ sourceFile:typeResolution.ts 3 > SubModule3 4 > 5 > { -1->Emitted(153, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(153, 20) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(153, 30) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(153, 32) Source(103, 30) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(153, 33) Source(103, 31) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(153, 9) Source(103, 5) + SourceIndex(0) +2 >Emitted(153, 20) Source(103, 19) + SourceIndex(0) +3 >Emitted(153, 30) Source(103, 29) + SourceIndex(0) +4 >Emitted(153, 32) Source(103, 30) + SourceIndex(0) +5 >Emitted(153, 33) Source(103, 31) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(154, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(154, 13) Source(104, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(155, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1->Emitted(155, 17) Source(104, 9) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2887,8 +2887,8 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > 2 > } -1->Emitted(156, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) -2 >Emitted(156, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +1->Emitted(156, 17) Source(106, 9) + SourceIndex(0) +2 >Emitted(156, 18) Source(106, 10) + SourceIndex(0) --- >>> ClassA.prototype.AisIn2_3 = function () { }; 1->^^^^^^^^^^^^^^^^ @@ -2901,11 +2901,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn2_3() { 5 > } -1->Emitted(157, 17) Source(105, 20) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(157, 42) Source(105, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(157, 45) Source(105, 13) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -4 >Emitted(157, 59) Source(105, 33) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) -5 >Emitted(157, 60) Source(105, 34) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) +1->Emitted(157, 17) Source(105, 20) + SourceIndex(0) +2 >Emitted(157, 42) Source(105, 28) + SourceIndex(0) +3 >Emitted(157, 45) Source(105, 13) + SourceIndex(0) +4 >Emitted(157, 59) Source(105, 33) + SourceIndex(0) +5 >Emitted(157, 60) Source(105, 34) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^ @@ -2913,8 +2913,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(158, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(158, 30) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1 >Emitted(158, 17) Source(106, 9) + SourceIndex(0) +2 >Emitted(158, 30) Source(106, 10) + SourceIndex(0) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2928,10 +2928,10 @@ sourceFile:typeResolution.ts 4 > export class ClassA { > public AisIn2_3() { } > } -1 >Emitted(159, 13) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(159, 14) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(159, 14) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(159, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1 >Emitted(159, 13) Source(106, 9) + SourceIndex(0) +2 >Emitted(159, 14) Source(106, 10) + SourceIndex(0) +3 >Emitted(159, 14) Source(104, 9) + SourceIndex(0) +4 >Emitted(159, 18) Source(106, 10) + SourceIndex(0) --- >>> SubModule3.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2945,10 +2945,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } 4 > -1->Emitted(160, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(160, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(160, 13) Source(104, 22) + SourceIndex(0) +2 >Emitted(160, 30) Source(104, 28) + SourceIndex(0) +3 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) +4 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) --- >>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); 1->^^^^^^^^ @@ -2974,15 +2974,15 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1->Emitted(161, 9) Source(107, 5) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(161, 10) Source(107, 6) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(161, 12) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(161, 22) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(161, 25) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -6 >Emitted(161, 51) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -7 >Emitted(161, 56) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -8 >Emitted(161, 82) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -9 >Emitted(161, 90) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(161, 9) Source(107, 5) + SourceIndex(0) +2 >Emitted(161, 10) Source(107, 6) + SourceIndex(0) +3 >Emitted(161, 12) Source(103, 19) + SourceIndex(0) +4 >Emitted(161, 22) Source(103, 29) + SourceIndex(0) +5 >Emitted(161, 25) Source(103, 19) + SourceIndex(0) +6 >Emitted(161, 51) Source(103, 29) + SourceIndex(0) +7 >Emitted(161, 56) Source(103, 19) + SourceIndex(0) +8 >Emitted(161, 82) Source(103, 29) + SourceIndex(0) +9 >Emitted(161, 90) Source(107, 6) + SourceIndex(0) --- >>> })(TopLevelModule2 || (TopLevelModule2 = {})); 1 >^^^^ @@ -3006,8 +3006,8 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(162, 5) Source(108, 1) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(162, 6) Source(108, 2) + SourceIndex(0) name (TopLevelModule2) +1 >Emitted(162, 5) Source(108, 1) + SourceIndex(0) +2 >Emitted(162, 6) Source(108, 2) + SourceIndex(0) 3 >Emitted(162, 8) Source(102, 8) + SourceIndex(0) 4 >Emitted(162, 23) Source(102, 23) + SourceIndex(0) 5 >Emitted(162, 28) Source(102, 8) + SourceIndex(0) From 08045dfd3164a8759658b307f42001ccfc815533 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Nov 2015 17:10:22 -0800 Subject: [PATCH 275/353] Refactor getCommonSourceDirectory into a closure function --- src/compiler/program.ts | 45 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index d5b2eb1aea4f5..3dd9c06ac343a 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -394,9 +394,7 @@ namespace ts { getTypeChecker, getClassifiableNames, getDiagnosticsProducingTypeChecker, - getCommonSourceDirectory: () => { - return typeof commonSourceDirectory === "undefined" ? (commonSourceDirectory = computeCommonSourceDirectory(files)) : commonSourceDirectory; - }, + getCommonSourceDirectory, emit, getCurrentDirectory: () => currentDirectory, getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(), @@ -407,6 +405,25 @@ namespace ts { }; return program; + function getCommonSourceDirectory() { + if (typeof commonSourceDirectory === "undefined") { + if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { + // If a rootDir is specified and is valid use it as the commonSourceDirectory + commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory); + } + else { + commonSourceDirectory = computeCommonSourceDirectory(files); + } + if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { + // Make sure directory path ends with directory separator so this string can directly + // used to replace with "" to get the relative path of the source file and the relative path doesn't + // start with / making it rooted path + commonSourceDirectory += directorySeparator; + } + } + return commonSourceDirectory; + } + function getClassifiableNames() { if (!classifiableNames) { // Initialize a checker so that all our files are bound. @@ -1059,24 +1076,12 @@ namespace ts { options.sourceRoot || // there is --sourceRoot specified options.mapRoot) { // there is --mapRoot specified - if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) { - // If a rootDir is specified and is valid use it as the commonSourceDirectory - commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory); - } - else { - // Compute the commonSourceDirectory from the input files - commonSourceDirectory = computeCommonSourceDirectory(files); - // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure - if (options.outDir && commonSourceDirectory === "" && forEach(files, file => getRootLength(file.fileName) > 1)) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files)); - } - } + // Precalculate and cache the common source directory + const dir = getCommonSourceDirectory(); - if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { - // Make sure directory path ends with directory separator so this string can directly - // used to replace with "" to get the relative path of the source file and the relative path doesn't - // start with / making it rooted path - commonSourceDirectory += directorySeparator; + // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure + if (options.outDir && dir === "" && forEach(files, file => getRootLength(file.fileName) > 1)) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files)); } } From ba3805d6f27ac0e2964fda866860b78b837306d4 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Nov 2015 17:29:16 -0800 Subject: [PATCH 276/353] add a new test --- tests/cases/compiler/commonSourceDir6.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/cases/compiler/commonSourceDir6.ts diff --git a/tests/cases/compiler/commonSourceDir6.ts b/tests/cases/compiler/commonSourceDir6.ts new file mode 100644 index 0000000000000..ff2b1309035cf --- /dev/null +++ b/tests/cases/compiler/commonSourceDir6.ts @@ -0,0 +1,17 @@ +// @outFile: concat.js +// @outDir: a +// @module: amd +// @Filename: a/bar.ts +import {z} from "./foo"; +export var x = z + z; + +// @Filename: a/foo.ts +import {pi} from "../baz"; +export var i = Math.sqrt(-1); +export var z = pi * pi; + +// @Filename: baz.ts +import {x} from "a/bar"; +import {i} from "a/foo"; +export var pi = Math.PI; +export var y = x * i; \ No newline at end of file From 5915fbd292c317cfd0c268cca35d3a40a9a9948c Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 19 Nov 2015 09:53:32 -0800 Subject: [PATCH 277/353] Adds minimal support for 'this' types in decorator metadata, emitting 'Object' for now. --- src/compiler/emitter.ts | 1 + tests/baselines/reference/decoratorMetadata.js | 12 ++++++++++++ tests/baselines/reference/decoratorMetadata.symbols | 8 ++++++++ tests/baselines/reference/decoratorMetadata.types | 8 ++++++++ .../conformance/decorators/decoratorMetadata.ts | 4 ++++ 5 files changed, 33 insertions(+) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 384ed82625a4e..c2a65addfb42d 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6006,6 +6006,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi case SyntaxKind.UnionType: case SyntaxKind.IntersectionType: case SyntaxKind.AnyKeyword: + case SyntaxKind.ThisType: break; default: diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 3c4637d9dab7e..35d19ae6fe97f 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -12,6 +12,10 @@ declare var decorator: any; class MyComponent { constructor(public Service: Service) { } + + @decorator + method(x: this) { + } } //// [service.js] @@ -37,6 +41,14 @@ var MyComponent = (function () { function MyComponent(Service) { this.Service = Service; } + MyComponent.prototype.method = function (x) { + }; + __decorate([ + decorator, + __metadata('design:type', Function), + __metadata('design:paramtypes', [Object]), + __metadata('design:returntype', void 0) + ], MyComponent.prototype, "method", null); MyComponent = __decorate([ decorator, __metadata('design:paramtypes', [service_1.default]) diff --git a/tests/baselines/reference/decoratorMetadata.symbols b/tests/baselines/reference/decoratorMetadata.symbols index 706f5ace8a921..842982286d48f 100644 --- a/tests/baselines/reference/decoratorMetadata.symbols +++ b/tests/baselines/reference/decoratorMetadata.symbols @@ -19,4 +19,12 @@ class MyComponent { >Service : Symbol(Service, Decl(component.ts, 6, 16)) >Service : Symbol(Service, Decl(component.ts, 0, 6)) } + + @decorator +>decorator : Symbol(decorator, Decl(component.ts, 2, 11)) + + method(x: this) { +>method : Symbol(method, Decl(component.ts, 7, 5)) +>x : Symbol(x, Decl(component.ts, 10, 11)) + } } diff --git a/tests/baselines/reference/decoratorMetadata.types b/tests/baselines/reference/decoratorMetadata.types index b0ce80fb1e40f..a25f55f01b101 100644 --- a/tests/baselines/reference/decoratorMetadata.types +++ b/tests/baselines/reference/decoratorMetadata.types @@ -19,4 +19,12 @@ class MyComponent { >Service : Service >Service : Service } + + @decorator +>decorator : any + + method(x: this) { +>method : (x: this) => void +>x : this + } } diff --git a/tests/cases/conformance/decorators/decoratorMetadata.ts b/tests/cases/conformance/decorators/decoratorMetadata.ts index 3f62290930946..6d7792bb832db 100644 --- a/tests/cases/conformance/decorators/decoratorMetadata.ts +++ b/tests/cases/conformance/decorators/decoratorMetadata.ts @@ -14,4 +14,8 @@ declare var decorator: any; class MyComponent { constructor(public Service: Service) { } + + @decorator + method(x: this) { + } } \ No newline at end of file From 075bea0ab86d4e1a987f0f1024911a873904af84 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 19 Nov 2015 12:48:01 -0800 Subject: [PATCH 278/353] I forgot to commit the baselines. T.T --- tests/baselines/reference/commonSourceDir6.js | 29 +++++++++++ .../reference/commonSourceDir6.symbols | 42 ++++++++++++++++ .../reference/commonSourceDir6.types | 48 +++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 tests/baselines/reference/commonSourceDir6.js create mode 100644 tests/baselines/reference/commonSourceDir6.symbols create mode 100644 tests/baselines/reference/commonSourceDir6.types diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js new file mode 100644 index 0000000000000..c08c864500648 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir6.js @@ -0,0 +1,29 @@ +//// [tests/cases/compiler/commonSourceDir6.ts] //// + +//// [bar.ts] +import {z} from "./foo"; +export var x = z + z; + +//// [foo.ts] +import {pi} from "../baz"; +export var i = Math.sqrt(-1); +export var z = pi * pi; + +//// [baz.ts] +import {x} from "a/bar"; +import {i} from "a/foo"; +export var pi = Math.PI; +export var y = x * i; + +//// [concat.js] +define("tests/cases/compiler/baz", ["require", "exports", "tests/cases/compiler/a/bar", "tests/cases/compiler/a/foo"], function (require, exports, bar_1, foo_1) { + exports.pi = Math.PI; + exports.y = bar_1.x * foo_1.i; +}); +define("tests/cases/compiler/a/foo", ["require", "exports", "tests/cases/compiler/baz"], function (require, exports, baz_1) { + exports.i = Math.sqrt(-1); + exports.z = baz_1.pi * baz_1.pi; +}); +define("tests/cases/compiler/a/bar", ["require", "exports", "tests/cases/compiler/a/foo"], function (require, exports, foo_2) { + exports.x = foo_2.z + foo_2.z; +}); diff --git a/tests/baselines/reference/commonSourceDir6.symbols b/tests/baselines/reference/commonSourceDir6.symbols new file mode 100644 index 0000000000000..e9d5edb28b205 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir6.symbols @@ -0,0 +1,42 @@ +=== tests/cases/compiler/a/bar.ts === +import {z} from "./foo"; +>z : Symbol(z, Decl(bar.ts, 0, 8)) + +export var x = z + z; +>x : Symbol(x, Decl(bar.ts, 1, 10)) +>z : Symbol(z, Decl(bar.ts, 0, 8)) +>z : Symbol(z, Decl(bar.ts, 0, 8)) + +=== tests/cases/compiler/a/foo.ts === +import {pi} from "../baz"; +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) + +export var i = Math.sqrt(-1); +>i : Symbol(i, Decl(foo.ts, 1, 10)) +>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --)) + +export var z = pi * pi; +>z : Symbol(z, Decl(foo.ts, 2, 10)) +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) +>pi : Symbol(pi, Decl(foo.ts, 0, 8)) + +=== tests/cases/compiler/baz.ts === +import {x} from "a/bar"; +>x : Symbol(x, Decl(baz.ts, 0, 8)) + +import {i} from "a/foo"; +>i : Symbol(i, Decl(baz.ts, 1, 8)) + +export var pi = Math.PI; +>pi : Symbol(pi, Decl(baz.ts, 2, 10)) +>Math.PI : Symbol(Math.PI, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>PI : Symbol(Math.PI, Decl(lib.d.ts, --, --)) + +export var y = x * i; +>y : Symbol(y, Decl(baz.ts, 3, 10)) +>x : Symbol(x, Decl(baz.ts, 0, 8)) +>i : Symbol(i, Decl(baz.ts, 1, 8)) + diff --git a/tests/baselines/reference/commonSourceDir6.types b/tests/baselines/reference/commonSourceDir6.types new file mode 100644 index 0000000000000..e30cdd2deeea5 --- /dev/null +++ b/tests/baselines/reference/commonSourceDir6.types @@ -0,0 +1,48 @@ +=== tests/cases/compiler/a/bar.ts === +import {z} from "./foo"; +>z : number + +export var x = z + z; +>x : number +>z + z : number +>z : number +>z : number + +=== tests/cases/compiler/a/foo.ts === +import {pi} from "../baz"; +>pi : number + +export var i = Math.sqrt(-1); +>i : number +>Math.sqrt(-1) : number +>Math.sqrt : (x: number) => number +>Math : Math +>sqrt : (x: number) => number +>-1 : number +>1 : number + +export var z = pi * pi; +>z : number +>pi * pi : number +>pi : number +>pi : number + +=== tests/cases/compiler/baz.ts === +import {x} from "a/bar"; +>x : number + +import {i} from "a/foo"; +>i : number + +export var pi = Math.PI; +>pi : number +>Math.PI : number +>Math : Math +>PI : number + +export var y = x * i; +>y : number +>x * i : number +>x : number +>i : number + From 93af2b2beb2bc9f787285db906c47dc1825627bb Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 19 Nov 2015 15:31:56 -0800 Subject: [PATCH 279/353] Comment cleanup. --- src/compiler/emitter.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index c2a65addfb42d..d9ca067e6ce12 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2651,7 +2651,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitCallTarget(node: Expression): Expression { - if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || /*node.kind === SyntaxKind.ThisType ||*/ node.kind === SyntaxKind.SuperKeyword) { + if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.SuperKeyword) { emit(node); return node; } @@ -7869,8 +7869,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: return emitAccessor(node); - // case SyntaxKind.ThisType: - // console.log("ThisType: emitJavaScriptWorker"); case SyntaxKind.ThisKeyword: return emitThis(node); case SyntaxKind.SuperKeyword: From a3bec922fbf9d4c4759aeeed57a8007f8f985d9e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 12:16:29 -0800 Subject: [PATCH 280/353] When the node contains decorators the actual start of the node is after skipping trivia from decorators end --- src/compiler/emitter.ts | 2 +- .../sourceMapValidationDecorators.js.map | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 90 +++++++++---------- 3 files changed, 42 insertions(+), 52 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 48746d828f5a7..76682dadc5002 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -851,7 +851,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function recordEmitNodeStartSpan(node: Node) { // Get the token pos after skipping to the token (ignoring the leading trivia) - recordSourceMapSpan(skipTrivia(currentText, node.pos)); + recordSourceMapSpan(skipTrivia(currentText, node.decorators ? node.decorators.end : node.pos)); } function recordEmitNodeEndSpan(node: Node) { diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map index 4a8b3258659e0..00de6b40b804a 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js.map +++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationDecorators.js.map] -{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AAOA;IAGIA,iBAGSA,QAAgBA;QAEvBC,WAEcA;aAFdA,WAEcA,CAFdA,sBAEcA,CAFdA,IAEcA;YAFdA,0BAEcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAFLA;QAGIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAEDH,sBAEIA,8BAASA;aAFbA;YAGII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACvBA,0BAAKA,QAEJA;IAEDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACfA,sBAACA,UAASA;IAMlBA;QACEA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OAFlBA,uBAAEA,QAKTA;IAEDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;QAMrBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OANtBA,8BAASA,QAEZA;IAfDA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACRA,aAAEA,UAAcA;IAzBnCA;QAACA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;QAGdA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;QAGxBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;gBAqC7BA;IAADA,cAACA;AAADA,CAACA,AA9CD,IA8CC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AASA;IACIA,iBAGSA,QAAgBA;QAIvBC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAIDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAV/BA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACvBA,0BAAKA,QAEJA;IAIDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACfA,sBAACA,UAASA;IAMlBA;QACEA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OAFlBA,uBAAEA,QAKTA;IAIDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;QAMrBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OANtBA,8BAASA,QAEZA;IAbDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACRA,aAAEA,UAAcA;IAvBnCA;QAFCA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;QAGdA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;QAGxBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;gBAqC7BA;IAADA,cAACA;AAADA,CAACA,AA5CD,IA4CC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index d9c8d0cc976f0..b6d01db06a21f 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -27,16 +27,16 @@ sourceFile:sourceMapValidationDecorators.ts >declare function ParameterDecorator1(target: Object, key: string | symbol, paramIndex: number): void; >declare function ParameterDecorator2(x: number): (target: Object, key: string | symbol, paramIndex: number) => void; > + >@ClassDecorator1 + >@ClassDecorator2(10) > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(10, 1) + SourceIndex(0) --- >>> function Greeter(greeting) { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^ -1->@ClassDecorator1 - >@ClassDecorator2(10) - >class Greeter { +1->class Greeter { > 2 > constructor( > @ParameterDecorator1 @@ -53,11 +53,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >, > + > @ParameterDecorator1 + > @ParameterDecorator2(30) > -2 > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] -1 >Emitted(12, 9) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +2 > ...b: string[] +1 >Emitted(12, 9) Source(18, 7) + SourceIndex(0) name (Greeter.constructor) 2 >Emitted(12, 20) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> for (var _i = 1; _i < arguments.length; _i++) { @@ -68,32 +68,24 @@ sourceFile:sourceMapValidationDecorators.ts 5 > ^ 6 > ^^^^ 1-> -2 > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] +2 > ...b: string[] 3 > -4 > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] +4 > ...b: string[] 5 > -6 > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] -1->Emitted(13, 14) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +6 > ...b: string[] +1->Emitted(13, 14) Source(18, 7) + SourceIndex(0) name (Greeter.constructor) 2 >Emitted(13, 25) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(13, 26) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +3 >Emitted(13, 26) Source(18, 7) + SourceIndex(0) name (Greeter.constructor) 4 >Emitted(13, 48) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(13, 49) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +5 >Emitted(13, 49) Source(18, 7) + SourceIndex(0) name (Greeter.constructor) 6 >Emitted(13, 53) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> b[_i - 1] = arguments[_i]; 1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > -2 > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] -1 >Emitted(14, 13) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +2 > ...b: string[] +1 >Emitted(14, 13) Source(18, 7) + SourceIndex(0) name (Greeter.constructor) 2 >Emitted(14, 39) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> } @@ -142,7 +134,7 @@ sourceFile:sourceMapValidationDecorators.ts 3 > 1->Emitted(18, 5) Source(23, 5) + SourceIndex(0) name (Greeter) 2 >Emitted(18, 28) Source(23, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(18, 31) Source(21, 5) + SourceIndex(0) name (Greeter) +3 >Emitted(18, 31) Source(23, 5) + SourceIndex(0) name (Greeter) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^ @@ -156,9 +148,7 @@ sourceFile:sourceMapValidationDecorators.ts 9 > ^^^ 10> ^^^^^^^ 11> ^ -1->@PropertyDecorator1 - > @PropertyDecorator2(40) - > greet() { +1->greet() { > 2 > return 3 > @@ -262,12 +252,12 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1-> > + > @PropertyDecorator1 + > @PropertyDecorator2(80) > -2 > @PropertyDecorator1 - > @PropertyDecorator2(80) - > get +2 > get 3 > greetings -1->Emitted(24, 5) Source(42, 5) + SourceIndex(0) name (Greeter) +1->Emitted(24, 5) Source(44, 5) + SourceIndex(0) name (Greeter) 2 >Emitted(24, 27) Source(44, 9) + SourceIndex(0) name (Greeter) 3 >Emitted(24, 57) Source(44, 18) + SourceIndex(0) name (Greeter) --- @@ -275,7 +265,7 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(25, 14) Source(42, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(25, 14) Source(44, 5) + SourceIndex(0) name (Greeter) --- >>> return this.greeting; 1->^^^^^^^^^^^^ @@ -285,9 +275,7 @@ sourceFile:sourceMapValidationDecorators.ts 5 > ^ 6 > ^^^^^^^^ 7 > ^ -1->@PropertyDecorator1 - > @PropertyDecorator2(80) - > get greetings() { +1->get greetings() { > 2 > return 3 > @@ -393,13 +381,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(35, 5) Source(21, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(35, 5) Source(23, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1->@ +1-> 2 > PropertyDecorator1 1->Emitted(36, 9) Source(21, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(36, 27) Source(21, 24) + SourceIndex(0) name (Greeter) @@ -442,14 +430,16 @@ sourceFile:sourceMapValidationDecorators.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > + > @PropertyDecorator1 + > @PropertyDecorator2(50) > -1 >Emitted(39, 5) Source(27, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(39, 5) Source(29, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1->@ +1-> 2 > PropertyDecorator1 1->Emitted(40, 9) Source(27, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(40, 27) Source(27, 24) + SourceIndex(0) name (Greeter) @@ -558,14 +548,16 @@ sourceFile:sourceMapValidationDecorators.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > + > @PropertyDecorator1 + > @PropertyDecorator2(80) > -1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(47, 5) Source(44, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^-> -1->@ +1-> 2 > PropertyDecorator1 1->Emitted(48, 9) Source(42, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(48, 27) Source(42, 24) + SourceIndex(0) name (Greeter) @@ -652,13 +644,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(53, 5) Source(31, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(53, 5) Source(33, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1->@ +1-> 2 > PropertyDecorator1 1->Emitted(54, 9) Source(31, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(54, 27) Source(31, 24) + SourceIndex(0) name (Greeter) @@ -698,13 +690,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(57, 5) Source(8, 1) + SourceIndex(0) name (Greeter) +1 >Emitted(57, 5) Source(10, 1) + SourceIndex(0) name (Greeter) --- >>> ClassDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^ 3 > ^^^^^^-> -1->@ +1-> 2 > ClassDecorator1 1->Emitted(58, 9) Source(8, 2) + SourceIndex(0) name (Greeter) 2 >Emitted(58, 24) Source(8, 17) + SourceIndex(0) name (Greeter) @@ -872,9 +864,7 @@ sourceFile:sourceMapValidationDecorators.ts 1 > 2 >} 3 > -4 > @ClassDecorator1 - > @ClassDecorator2(10) - > class Greeter { +4 > class Greeter { > constructor( > @ParameterDecorator1 > @ParameterDecorator2(20) @@ -921,7 +911,7 @@ sourceFile:sourceMapValidationDecorators.ts > } 1 >Emitted(66, 1) Source(54, 1) + SourceIndex(0) name (Greeter) 2 >Emitted(66, 2) Source(54, 2) + SourceIndex(0) name (Greeter) -3 >Emitted(66, 2) Source(8, 1) + SourceIndex(0) +3 >Emitted(66, 2) Source(10, 1) + SourceIndex(0) 4 >Emitted(66, 6) Source(54, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationDecorators.js.map \ No newline at end of file From e23b0c65ea7bd2cbc742703c2b2b7e937a7995d7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 15:43:35 -0800 Subject: [PATCH 281/353] Fix the source map emit for decorators Handled #5584 --- src/compiler/emitter.ts | 66 ++-- src/compiler/utilities.ts | 17 - .../sourceMapValidationDecorators.js.map | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 355 +++++++----------- 4 files changed, 170 insertions(+), 270 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 76682dadc5002..4dbdc36e31e6f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -503,10 +503,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let emit = emitNodeWithCommentsAndWithoutSourcemap; /** Called just before starting emit of a node */ - let emitStart = function (node: Node) { }; + let emitStart = function (node: Node | TextRange) { }; /** Called once the emit of the node is done */ - let emitEnd = function (node: Node) { }; + let emitEnd = function (node: Node | TextRange) { }; /** Emit the text for the given token that comes after startPos * This by default writes the text provided with the given tokenKind @@ -849,12 +849,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function recordEmitNodeStartSpan(node: Node) { + function recordEmitNodeStartSpan(node: Node | TextRange) { // Get the token pos after skipping to the token (ignoring the leading trivia) - recordSourceMapSpan(skipTrivia(currentText, node.decorators ? node.decorators.end : node.pos)); + recordSourceMapSpan(skipTrivia(currentText, (node as Node).decorators ? (node as Node).decorators.end : node.pos)); } - function recordEmitNodeEndSpan(node: Node) { + function recordEmitNodeEndSpan(node: Node | TextRange) { recordSourceMapSpan(node.end); } @@ -5656,10 +5656,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 parameterDecorators = 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 && !parameterDecorators) { return; } @@ -5675,28 +5675,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // writeLine(); - emitStart(node); + emitStart(node.decorators || parameterDecorators); 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 (parameterDecorators) { + argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0); + } emitSerializedTypeMetadata(node, /*leadingComma*/ argumentsWritten >= 0); decreaseIndent(); writeLine(); write("], "); emitDeclarationName(node); - write(");"); - emitEnd(node); + write(")"); + emitEnd(node.decorators || parameterDecorators); + write(";"); writeLine(); } @@ -5712,11 +5711,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; let functionLikeMember: FunctionLikeDeclaration; @@ -5743,6 +5737,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi functionLikeMember = member; } } + const parameterDecorators = functionLikeMember && forEach(functionLikeMember.parameters, parameter => parameter.decorators); + + // skip a member if it or any of its parameters are not decorated + if (!decorators && !parameterDecorators) { + continue; + } // Emit the call to __decorate. Given the following: // @@ -5776,29 +5776,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // writeLine(); - emitStart(member); + emitStart(decorators || parameterDecorators); 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 (parameterDecorators) { + 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) { @@ -5813,8 +5810,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - write(");"); - emitEnd(member); + write(")"); + emitEnd(decorators || parameterDecorators); + write(";"); writeLine(); } } @@ -5827,11 +5825,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; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index eef6dbe970250..3c8e5deb467d2 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -909,23 +909,6 @@ namespace ts { return false; } - export function childIsDecorated(node: Node): boolean { - switch (node.kind) { - case SyntaxKind.ClassDeclaration: - return forEach((node).members, nodeOrChildIsDecorated); - - case SyntaxKind.MethodDeclaration: - case SyntaxKind.SetAccessor: - return forEach((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; } diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map index 00de6b40b804a..355cb0cb55ffb 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js.map +++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationDecorators.js.map] -{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AASA;IACIA,iBAGSA,QAAgBA;QAIvBC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAIDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAV/BA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACvBA,0BAAKA,QAEJA;IAIDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACfA,sBAACA,UAASA;IAMlBA;QACEA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OAFlBA,uBAAEA,QAKTA;IAIDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;QAMrBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;OANtBA,8BAASA,QAEZA;IAbDA;QAFCA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;OACRA,aAAEA,UAAcA;IAvBnCA;QAFCA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;QAGdA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;QAGxBA,WAACA,mBAAmBA,CAAAA;QACpBA,WAACA,mBAAmBA,CAACA,EAAEA,CAACA,CAAAA;gBAqC7BA;IAADA,cAACA;AAADA,CAACA,AA5CD,IA4CC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AASA;IACIA,iBAGSA,QAAgBA;QAIvBC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAIDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ9BA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;wCAAAA;IAKtBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;sCAAAA;IAQpBA;mBAAAA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;qCAAAA;IAKzBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;mBAMpBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;4CAPHA;IAZtBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;6BAAAA;IAxB1BA;QAAAA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;mBAGbA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;mBAGvBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;eARVA;IA6CpBA,cAACA;AAADA,CAACA,AA5CD,IA4CC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index b6d01db06a21f..face3de621813 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -381,7 +381,7 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(35, 5) Source(23, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(35, 5) Source(21, 6) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -412,28 +412,20 @@ sourceFile:sourceMapValidationDecorators.ts 5 >Emitted(37, 31) Source(22, 28) + SourceIndex(0) name (Greeter) --- >>> ], Greeter.prototype, "greet", null); -1->^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^ -1-> - > -2 > greet -3 > () { - > return "

" + this.greeting + "

"; - > } -1->Emitted(38, 8) Source(23, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(38, 34) Source(23, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(38, 42) Source(25, 6) + SourceIndex(0) name (Greeter) +1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1-> +1->Emitted(38, 41) Source(22, 28) + SourceIndex(0) name (Greeter) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > + > greet() { + > return "

" + this.greeting + "

"; + > } > - > @PropertyDecorator1 - > @PropertyDecorator2(50) - > -1 >Emitted(39, 5) Source(29, 5) + SourceIndex(0) name (Greeter) + > @ +1 >Emitted(39, 5) Source(27, 6) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -464,94 +456,66 @@ sourceFile:sourceMapValidationDecorators.ts 5 >Emitted(41, 31) Source(28, 28) + SourceIndex(0) name (Greeter) --- >>> ], Greeter.prototype, "x", void 0); -1->^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^ -1-> - > private -2 > x -3 > : string; -1->Emitted(42, 8) Source(29, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(42, 30) Source(29, 14) + SourceIndex(0) name (Greeter) -3 >Emitted(42, 40) Source(29, 23) + SourceIndex(0) name (Greeter) +1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1-> +1->Emitted(42, 39) Source(28, 28) + SourceIndex(0) name (Greeter) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > + > private x: string; > > @PropertyDecorator1 > @PropertyDecorator2(60) > private static x1: number = 10; > - > -1 >Emitted(43, 5) Source(35, 5) + SourceIndex(0) name (Greeter) + > private fn( + > @ +1 >Emitted(43, 5) Source(36, 8) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator1), -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^-> -1->private fn( - > -2 > @ -3 > ParameterDecorator1 -4 > -1->Emitted(44, 9) Source(36, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(44, 20) Source(36, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(44, 39) Source(36, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(44, 40) Source(36, 27) + SourceIndex(0) name (Greeter) +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^-> +1-> +2 > ParameterDecorator1 +1->Emitted(44, 20) Source(36, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(44, 39) Source(36, 27) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator2(70)) -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^ -7 > ^ +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ 1-> - > -2 > @ -3 > ParameterDecorator2 -4 > ( -5 > 70 -6 > ) -7 > -1->Emitted(45, 9) Source(37, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(45, 20) Source(37, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(45, 39) Source(37, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(45, 40) Source(37, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(45, 42) Source(37, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(45, 43) Source(37, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(45, 44) Source(37, 31) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator2 +3 > ( +4 > 70 +5 > ) +1->Emitted(45, 20) Source(37, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(45, 39) Source(37, 27) + SourceIndex(0) name (Greeter) +3 >Emitted(45, 40) Source(37, 28) + SourceIndex(0) name (Greeter) +4 >Emitted(45, 42) Source(37, 30) + SourceIndex(0) name (Greeter) +5 >Emitted(45, 43) Source(37, 31) + SourceIndex(0) name (Greeter) --- >>> ], Greeter.prototype, "fn", null); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^ +1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > -2 > fn -3 > ( - > @ParameterDecorator1 - > @ParameterDecorator2(70) - > x: number) { - > return this.greeting; - > } -1 >Emitted(46, 8) Source(35, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(46, 31) Source(35, 15) + SourceIndex(0) name (Greeter) -3 >Emitted(46, 39) Source(40, 6) + SourceIndex(0) name (Greeter) +1 >Emitted(46, 38) Source(37, 31) + SourceIndex(0) name (Greeter) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > +1 > + > x: number) { + > return this.greeting; + > } > - > @PropertyDecorator1 - > @PropertyDecorator2(80) - > -1 >Emitted(47, 5) Source(44, 5) + SourceIndex(0) name (Greeter) + > @ +1 >Emitted(47, 5) Source(42, 6) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -582,69 +546,49 @@ sourceFile:sourceMapValidationDecorators.ts 5 >Emitted(49, 31) Source(43, 28) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator1), -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^-> +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^-> 1-> > get greetings() { > return this.greeting; > } > > set greetings( - > -2 > @ -3 > ParameterDecorator1 -4 > -1->Emitted(50, 9) Source(49, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(50, 20) Source(49, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(50, 39) Source(49, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(50, 40) Source(49, 27) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator1 +1->Emitted(50, 20) Source(49, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(50, 39) Source(49, 27) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator2(90)) -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^ -7 > ^ -8 > ^^^-> +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ +6 > ^^^^-> 1-> - > -2 > @ -3 > ParameterDecorator2 -4 > ( -5 > 90 -6 > ) -7 > -1->Emitted(51, 9) Source(50, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(51, 20) Source(50, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(51, 39) Source(50, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(51, 40) Source(50, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(51, 42) Source(50, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(51, 43) Source(50, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(51, 44) Source(50, 31) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator2 +3 > ( +4 > 90 +5 > ) +1->Emitted(51, 20) Source(50, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(51, 39) Source(50, 27) + SourceIndex(0) name (Greeter) +3 >Emitted(51, 40) Source(50, 28) + SourceIndex(0) name (Greeter) +4 >Emitted(51, 42) Source(50, 30) + SourceIndex(0) name (Greeter) +5 >Emitted(51, 43) Source(50, 31) + SourceIndex(0) name (Greeter) --- >>> ], Greeter.prototype, "greetings", null); -1->^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^ +1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1-> -2 > greetings -3 > () { - > return this.greeting; - > } -1->Emitted(52, 8) Source(44, 9) + SourceIndex(0) name (Greeter) -2 >Emitted(52, 38) Source(44, 18) + SourceIndex(0) name (Greeter) -3 >Emitted(52, 46) Source(46, 6) + SourceIndex(0) name (Greeter) +1->Emitted(52, 45) Source(43, 28) + SourceIndex(0) name (Greeter) --- >>> __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(53, 5) Source(33, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(53, 5) Source(31, 6) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ @@ -675,22 +619,15 @@ sourceFile:sourceMapValidationDecorators.ts 5 >Emitted(55, 31) Source(32, 28) + SourceIndex(0) name (Greeter) --- >>> ], Greeter, "x1", void 0); -1->^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^^^^^ -1-> - > private static -2 > x1 -3 > : number = 10; -1->Emitted(56, 8) Source(33, 20) + SourceIndex(0) name (Greeter) -2 >Emitted(56, 21) Source(33, 22) + SourceIndex(0) name (Greeter) -3 >Emitted(56, 31) Source(33, 36) + SourceIndex(0) name (Greeter) +1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1-> +1->Emitted(56, 30) Source(32, 28) + SourceIndex(0) name (Greeter) --- >>> Greeter = __decorate([ 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(57, 5) Source(10, 1) + SourceIndex(0) name (Greeter) +1 >Emitted(57, 5) Source(8, 2) + SourceIndex(0) name (Greeter) --- >>> ClassDecorator1, 1->^^^^^^^^ @@ -721,93 +658,83 @@ sourceFile:sourceMapValidationDecorators.ts 5 >Emitted(59, 28) Source(9, 21) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator1), -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^-> +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^-> 1-> >class Greeter { > constructor( - > -2 > @ -3 > ParameterDecorator1 -4 > -1->Emitted(60, 9) Source(12, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(60, 20) Source(12, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(60, 39) Source(12, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(60, 40) Source(12, 27) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator1 +1->Emitted(60, 20) Source(12, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(60, 39) Source(12, 27) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator2(20)), -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^ -7 > ^ +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ 1-> - > -2 > @ -3 > ParameterDecorator2 -4 > ( -5 > 20 -6 > ) -7 > -1->Emitted(61, 9) Source(13, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(61, 20) Source(13, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(61, 39) Source(13, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(61, 40) Source(13, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(61, 42) Source(13, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(61, 43) Source(13, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(61, 44) Source(13, 31) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator2 +3 > ( +4 > 20 +5 > ) +1->Emitted(61, 20) Source(13, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(61, 39) Source(13, 27) + SourceIndex(0) name (Greeter) +3 >Emitted(61, 40) Source(13, 28) + SourceIndex(0) name (Greeter) +4 >Emitted(61, 42) Source(13, 30) + SourceIndex(0) name (Greeter) +5 >Emitted(61, 43) Source(13, 31) + SourceIndex(0) name (Greeter) --- >>> __param(1, ParameterDecorator1), -1 >^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^-> +1 >^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^-> 1 > > public greeting: string, > - > -2 > @ -3 > ParameterDecorator1 -4 > -1 >Emitted(62, 9) Source(16, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(62, 20) Source(16, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(62, 39) Source(16, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(62, 40) Source(16, 27) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator1 +1 >Emitted(62, 20) Source(16, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(62, 39) Source(16, 27) + SourceIndex(0) name (Greeter) --- >>> __param(1, ParameterDecorator2(30)) -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^ -7 > ^ +1->^^^^^^^^^^^^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^ +5 > ^ 1-> - > -2 > @ -3 > ParameterDecorator2 -4 > ( -5 > 30 -6 > ) -7 > -1->Emitted(63, 9) Source(17, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(63, 20) Source(17, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(63, 39) Source(17, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(63, 40) Source(17, 28) + SourceIndex(0) name (Greeter) -5 >Emitted(63, 42) Source(17, 30) + SourceIndex(0) name (Greeter) -6 >Emitted(63, 43) Source(17, 31) + SourceIndex(0) name (Greeter) -7 >Emitted(63, 44) Source(17, 31) + SourceIndex(0) name (Greeter) + > @ +2 > ParameterDecorator2 +3 > ( +4 > 30 +5 > ) +1->Emitted(63, 20) Source(17, 8) + SourceIndex(0) name (Greeter) +2 >Emitted(63, 39) Source(17, 27) + SourceIndex(0) name (Greeter) +3 >Emitted(63, 40) Source(17, 28) + SourceIndex(0) name (Greeter) +4 >Emitted(63, 42) Source(17, 30) + SourceIndex(0) name (Greeter) +5 >Emitted(63, 43) Source(17, 31) + SourceIndex(0) name (Greeter) --- >>> ], Greeter); -1 >^^^^^^^^^^^^^^^^ -2 > ^^^^-> -1 > +1 >^^^^^^^^^^^^^^^ +2 > ^^^^^-> +1 > +1 >Emitted(64, 16) Source(9, 21) + SourceIndex(0) name (Greeter) +--- +>>> return Greeter; +1->^^^^ +2 > ^^^^^^^^^^^^^^ +1-> + >class Greeter { + > constructor( + > @ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string, + > + > @ParameterDecorator1 + > @ParameterDecorator2(30) > ...b: string[]) { > } > @@ -844,13 +771,7 @@ sourceFile:sourceMapValidationDecorators.ts > greetings: string) { > this.greeting = greetings; > } - >} -1 >Emitted(64, 17) Source(54, 2) + SourceIndex(0) name (Greeter) ---- ->>> return Greeter; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> + > 2 > } 1->Emitted(65, 5) Source(54, 1) + SourceIndex(0) name (Greeter) 2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0) name (Greeter) From c84a9f154b52c6ef15e2386602f78d38cce4e9d6 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 15:50:24 -0800 Subject: [PATCH 282/353] Test cases for breakpoints with decorators --- .../reference/bpSpan_decorators.baseline | 539 ++++++++++++++++++ .../breakpointValidationDecorators.ts | 60 ++ 2 files changed, 599 insertions(+) create mode 100644 tests/baselines/reference/bpSpan_decorators.baseline create mode 100644 tests/cases/fourslash/breakpointValidationDecorators.ts diff --git a/tests/baselines/reference/bpSpan_decorators.baseline b/tests/baselines/reference/bpSpan_decorators.baseline new file mode 100644 index 0000000000000..dc7a9556d0712 --- /dev/null +++ b/tests/baselines/reference/bpSpan_decorators.baseline @@ -0,0 +1,539 @@ + +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":952} + >@ClassDecorator1 + >@ClassDecorator2(10) + >class Greeter { + > constructor( + > @ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string, + > + > @ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[]) { + > } + > + > @PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + > + > @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 8, col 0) to (line 54, col 1) +-------------------------------- +9 >@ClassDecorator2(10) + + ~ => Pos: (611 to 611) SpanInfo: {"start":594,"length":952} + >@ClassDecorator1 + >@ClassDecorator2(10) + >class Greeter { + > constructor( + > @ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string, + > + > @ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[]) { + > } + > + > @PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + > + > @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 8, col 0) to (line 54, col 1) +9 >@ClassDecorator2(10) + + ~~~~~~~~~~~~~~~~~~~~ => Pos: (612 to 631) SpanInfo: {"start":612,"length":19} + >ClassDecorator2(10) + >:=> (line 9, col 1) to (line 9, col 20) +-------------------------------- +10 >class Greeter { + + ~~~~~~~~~~~~~~~~ => Pos: (632 to 647) SpanInfo: {"start":594,"length":952} + >@ClassDecorator1 + >@ClassDecorator2(10) + >class Greeter { + > constructor( + > @ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string, + > + > @ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[]) { + > } + > + > @PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + > + > @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 8, 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":85} + >@ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string + >:=> (line 12, col 8) to (line 14, col 31) +-------------------------------- +13 > @ParameterDecorator2(20) + + ~~~~~~~~~ => Pos: (694 to 702) SpanInfo: {"start":673,"length":85} + >@ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string + >:=> (line 12, col 8) to (line 14, col 31) +13 > @ParameterDecorator2(20) + + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (703 to 726) SpanInfo: {"start":703,"length":23} + >ParameterDecorator2(20) + >:=> (line 13, col 9) to (line 13, col 32) +-------------------------------- +14 > public greeting: string, + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (727 to 759) SpanInfo: {"start":673,"length":85} + >@ParameterDecorator1 + > @ParameterDecorator2(20) + > public greeting: string + >:=> (line 12, col 8) to (line 14, col 31) +-------------------------------- +15 > + + ~ => Pos: (760 to 760) SpanInfo: undefined +-------------------------------- +16 > @ParameterDecorator1 + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (761 to 789) SpanInfo: {"start":769,"length":80} + >@ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[] + >:=> (line 16, col 8) to (line 18, col 26) +-------------------------------- +17 > @ParameterDecorator2(30) + + ~~~~~~~~~ => Pos: (790 to 798) SpanInfo: {"start":769,"length":80} + >@ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[] + >:=> (line 16, col 8) to (line 18, col 26) +17 > @ParameterDecorator2(30) + + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (799 to 822) SpanInfo: {"start":799,"length":23} + >ParameterDecorator2(30) + >:=> (line 17, col 9) to (line 17, col 32) +-------------------------------- +18 > ...b: string[]) { + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (823 to 849) SpanInfo: {"start":769,"length":80} + >@ParameterDecorator1 + > @ParameterDecorator2(30) + > ...b: string[] + >:=> (line 16, col 8) 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":116} + >@PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + >:=> (line 21, col 4) to (line 25, col 5) +-------------------------------- +22 > @PropertyDecorator2(40) + + ~~~~~ => Pos: (884 to 888) SpanInfo: {"start":864,"length":116} + >@PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + >:=> (line 21, col 4) to (line 25, col 5) +22 > @PropertyDecorator2(40) + + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (889 to 911) SpanInfo: {"start":889,"length":22} + >PropertyDecorator2(40) + >:=> (line 22, col 5) to (line 22, col 27) +-------------------------------- +23 > greet() { + + ~~~~~~~~~~~ => Pos: (912 to 922) SpanInfo: {"start":864,"length":116} + >@PropertyDecorator1 + > @PropertyDecorator2(40) + > greet() { + > return "

" + this.greeting + "

"; + > } + >:=> (line 21, col 4) to (line 25, col 5) +23 > greet() { + + ~~~ => Pos: (923 to 925) SpanInfo: {"start":934,"length":39} + >return "

" + this.greeting + "

" + >:=> (line 24, col 8) to (line 24, col 47) +-------------------------------- +24 > return "

" + this.greeting + "

"; + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (926 to 974) SpanInfo: {"start":934,"length":39} + >return "

" + this.greeting + "

" + >:=> (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: undefined +-------------------------------- +28 > @PropertyDecorator2(50) + + ~~~~~ => Pos: (1006 to 1010) SpanInfo: undefined +28 > @PropertyDecorator2(50) + + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1011 to 1033) SpanInfo: {"start":1011,"length":22} + >PropertyDecorator2(50) + >:=> (line 28, col 5) 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":83} + >@PropertyDecorator1 + > @PropertyDecorator2(60) + > private static x1: number = 10; + >:=> (line 31, col 4) to (line 33, col 35) +-------------------------------- +32 > @PropertyDecorator2(60) + + ~~~~~ => Pos: (1082 to 1086) SpanInfo: {"start":1062,"length":83} + >@PropertyDecorator1 + > @PropertyDecorator2(60) + > private static x1: number = 10; + >:=> (line 31, col 4) to (line 33, col 35) +32 > @PropertyDecorator2(60) + + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1087 to 1109) SpanInfo: {"start":1087,"length":22} + >PropertyDecorator2(60) + >:=> (line 32, col 5) to (line 32, col 27) +-------------------------------- +33 > private static x1: number = 10; + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1110 to 1145) SpanInfo: {"start":1062,"length":83} + >@PropertyDecorator1 + > @PropertyDecorator2(60) + > private static x1: number = 10; + >:=> (line 31, 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":1254,"length":20} + >return this.greeting + >:=> (line 39, col 8) to (line 39, col 28) +-------------------------------- +37 > @ParameterDecorator2(70) + + ~~~~~~~~~ => Pos: (1192 to 1200) SpanInfo: {"start":1254,"length":20} + >return this.greeting + >:=> (line 39, col 8) to (line 39, col 28) +37 > @ParameterDecorator2(70) + + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1201 to 1224) SpanInfo: {"start":1201,"length":23} + >ParameterDecorator2(70) + >:=> (line 37, col 9) 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":105} + >@PropertyDecorator1 + > @PropertyDecorator2(80) + > get greetings() { + > return this.greeting; + > } + >:=> (line 42, col 4) to (line 46, col 5) +-------------------------------- +43 > @PropertyDecorator2(80) + + ~~~~~ => Pos: (1307 to 1311) SpanInfo: {"start":1287,"length":105} + >@PropertyDecorator1 + > @PropertyDecorator2(80) + > get greetings() { + > return this.greeting; + > } + >:=> (line 42, col 4) to (line 46, col 5) +43 > @PropertyDecorator2(80) + + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1312 to 1334) SpanInfo: {"start":1312,"length":22} + >PropertyDecorator2(80) + >:=> (line 43, col 5) to (line 43, col 27) +-------------------------------- +44 > get greetings() { + + ~~~~~~~~~~~~~~~~~~~ => Pos: (1335 to 1353) SpanInfo: {"start":1287,"length":105} + >@PropertyDecorator1 + > @PropertyDecorator2(80) + > get greetings() { + > return this.greeting; + > } + >:=> (line 42, 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":1512,"length":25} + >this.greeting = greetings + >:=> (line 52, col 8) to (line 52, col 33) +-------------------------------- +50 > @ParameterDecorator2(90) + + ~~~~~~~~~ => Pos: (1442 to 1450) SpanInfo: {"start":1512,"length":25} + >this.greeting = greetings + >:=> (line 52, col 8) to (line 52, col 33) +50 > @ParameterDecorator2(90) + + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1451 to 1474) SpanInfo: {"start":1451,"length":23} + >ParameterDecorator2(90) + >:=> (line 50, col 9) 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) \ No newline at end of file diff --git a/tests/cases/fourslash/breakpointValidationDecorators.ts b/tests/cases/fourslash/breakpointValidationDecorators.ts new file mode 100644 index 0000000000000..9eb4463e00209 --- /dev/null +++ b/tests/cases/fourslash/breakpointValidationDecorators.ts @@ -0,0 +1,60 @@ +/// + +// @BaselineFile: bpSpan_decorators.baseline +// @Filename: bpSpan_decorators.ts +////declare function ClassDecorator1(target: Function): void; +////declare function ClassDecorator2(x: number): (target: Function) => void; +////declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void; +////declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void; +////declare function ParameterDecorator1(target: Object, key: string | symbol, paramIndex: number): void; +////declare function ParameterDecorator2(x: number): (target: Object, key: string | symbol, paramIndex: number) => void; +//// +////@ClassDecorator1 +////@ClassDecorator2(10) +////class Greeter { +//// constructor( +//// @ParameterDecorator1 +//// @ParameterDecorator2(20) +//// public greeting: string, +//// +//// @ParameterDecorator1 +//// @ParameterDecorator2(30) +//// ...b: string[]) { +//// } +//// +//// @PropertyDecorator1 +//// @PropertyDecorator2(40) +//// greet() { +//// return "

" + this.greeting + "

"; +//// } +//// +//// @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; +//// } +////} + +verify.baselineCurrentFileBreakpointLocations(); \ No newline at end of file From 858a99b4f198ff265d129d116e540044e6f40aad Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 16:24:13 -0800 Subject: [PATCH 283/353] Setting breakpoint inside decorator expression results in setting breakpoint on all the decorators On resolution, this would be call to __decorate --- src/services/breakpoints.ts | 18 +- .../reference/bpSpan_decorators.baseline | 226 +++++++----------- 2 files changed, 108 insertions(+), 136 deletions(-) diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index e307b21979e26..dea27d0f8d006 100644 --- a/src/services/breakpoints.ts +++ b/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,20 @@ namespace ts.BreakpointResolver { return spanInNode(tokenAtLocation); function textSpan(startNode: Node, endNode?: Node) { - return createTextSpanFromBounds(startNode.getStart(), (endNode || startNode).getEnd()); + return createTextSpanFromBounds(startNode.getStart(sourceFile), (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(nodeArray: NodeArray) { + return createTextSpanFromBounds(skipTrivia(sourceFile.text, nodeArray.pos), nodeArray.end); + } + function spanInPreviousNode(node: Node): TextSpan { return spanInNode(findPrecedingToken(node.pos, sourceFile)); } @@ -65,6 +69,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 +216,9 @@ namespace ts.BreakpointResolver { // span in statement return spanInNode((node).statement); + case SyntaxKind.Decorator: + return spanInNodeArray(node.parent.decorators); + // No breakpoint in interface, type alias case SyntaxKind.InterfaceDeclaration: case SyntaxKind.TypeAliasDeclaration: diff --git a/tests/baselines/reference/bpSpan_decorators.baseline b/tests/baselines/reference/bpSpan_decorators.baseline index dc7a9556d0712..bba31d1df409e 100644 --- a/tests/baselines/reference/bpSpan_decorators.baseline +++ b/tests/baselines/reference/bpSpan_decorators.baseline @@ -29,7 +29,7 @@ -------------------------------- 8 >@ClassDecorator1 - ~~~~~~~~~~~~~~~~~ => Pos: (594 to 610) SpanInfo: {"start":594,"length":952} + ~ => Pos: (594 to 594) SpanInfo: {"start":594,"length":952} >@ClassDecorator1 >@ClassDecorator2(10) >class Greeter { @@ -78,63 +78,19 @@ > } >} >:=> (line 8, col 0) to (line 54, col 1) --------------------------------- -9 >@ClassDecorator2(10) +8 >@ClassDecorator1 - ~ => Pos: (611 to 611) SpanInfo: {"start":594,"length":952} - >@ClassDecorator1 + ~~~~~~~~~~~~~~~~ => Pos: (595 to 610) SpanInfo: {"start":595,"length":36} + >ClassDecorator1 >@ClassDecorator2(10) - >class Greeter { - > constructor( - > @ParameterDecorator1 - > @ParameterDecorator2(20) - > public greeting: string, - > - > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[]) { - > } - > - > @PropertyDecorator1 - > @PropertyDecorator2(40) - > greet() { - > return "

" + this.greeting + "

"; - > } - > - > @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 8, col 0) to (line 54, col 1) + >:=> (line 8, col 1) to (line 9, col 20) +-------------------------------- 9 >@ClassDecorator2(10) - ~~~~~~~~~~~~~~~~~~~~ => Pos: (612 to 631) SpanInfo: {"start":612,"length":19} - >ClassDecorator2(10) - >:=> (line 9, col 1) to (line 9, col 20) + ~~~~~~~~~~~~~~~~~~~~~ => Pos: (611 to 631) SpanInfo: {"start":595,"length":36} + >ClassDecorator1 + >@ClassDecorator2(10) + >:=> (line 8, col 1) to (line 9, col 20) -------------------------------- 10 >class Greeter { @@ -196,24 +152,24 @@ -------------------------------- 12 > @ParameterDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (665 to 693) SpanInfo: {"start":673,"length":85} + ~~~~~~~~~ => Pos: (665 to 673) SpanInfo: {"start":673,"length":85} >@ParameterDecorator1 > @ParameterDecorator2(20) > public greeting: string >:=> (line 12, col 8) to (line 14, col 31) --------------------------------- -13 > @ParameterDecorator2(20) +12 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (694 to 702) SpanInfo: {"start":673,"length":85} - >@ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~ => Pos: (674 to 693) SpanInfo: {"start":674,"length":52} + >ParameterDecorator1 > @ParameterDecorator2(20) - > public greeting: string - >:=> (line 12, col 8) to (line 14, col 31) + >:=> (line 12, col 9) to (line 13, col 32) +-------------------------------- 13 > @ParameterDecorator2(20) - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (703 to 726) SpanInfo: {"start":703,"length":23} - >ParameterDecorator2(20) - >:=> (line 13, col 9) to (line 13, col 32) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (694 to 726) SpanInfo: {"start":674,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(20) + >:=> (line 12, col 9) to (line 13, col 32) -------------------------------- 14 > public greeting: string, @@ -229,24 +185,24 @@ -------------------------------- 16 > @ParameterDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (761 to 789) SpanInfo: {"start":769,"length":80} + ~~~~~~~~~ => Pos: (761 to 769) SpanInfo: {"start":769,"length":80} >@ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] >:=> (line 16, col 8) to (line 18, col 26) --------------------------------- -17 > @ParameterDecorator2(30) +16 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (790 to 798) SpanInfo: {"start":769,"length":80} - >@ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~ => Pos: (770 to 789) SpanInfo: {"start":770,"length":52} + >ParameterDecorator1 > @ParameterDecorator2(30) - > ...b: string[] - >:=> (line 16, col 8) to (line 18, col 26) + >:=> (line 16, col 9) to (line 17, col 32) +-------------------------------- 17 > @ParameterDecorator2(30) - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (799 to 822) SpanInfo: {"start":799,"length":23} - >ParameterDecorator2(30) - >:=> (line 17, col 9) to (line 17, col 32) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (790 to 822) SpanInfo: {"start":770,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(30) + >:=> (line 16, col 9) to (line 17, col 32) -------------------------------- 18 > ...b: string[]) { @@ -273,28 +229,26 @@ -------------------------------- 21 > @PropertyDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (860 to 883) SpanInfo: {"start":864,"length":116} + ~~~~~ => Pos: (860 to 864) SpanInfo: {"start":864,"length":116} >@PropertyDecorator1 > @PropertyDecorator2(40) > greet() { > return "

" + this.greeting + "

"; > } >:=> (line 21, col 4) to (line 25, col 5) --------------------------------- -22 > @PropertyDecorator2(40) +21 > @PropertyDecorator1 - ~~~~~ => Pos: (884 to 888) SpanInfo: {"start":864,"length":116} - >@PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~ => Pos: (865 to 883) SpanInfo: {"start":865,"length":46} + >PropertyDecorator1 > @PropertyDecorator2(40) - > greet() { - > return "

" + this.greeting + "

"; - > } - >:=> (line 21, col 4) to (line 25, col 5) + >:=> (line 21, col 5) to (line 22, col 27) +-------------------------------- 22 > @PropertyDecorator2(40) - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (889 to 911) SpanInfo: {"start":889,"length":22} - >PropertyDecorator2(40) - >:=> (line 22, col 5) to (line 22, col 27) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (884 to 911) SpanInfo: {"start":865,"length":46} + >PropertyDecorator1 + > @PropertyDecorator2(40) + >:=> (line 21, col 5) to (line 22, col 27) -------------------------------- 23 > greet() { @@ -329,16 +283,20 @@ -------------------------------- 27 > @PropertyDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (982 to 1005) SpanInfo: undefined --------------------------------- -28 > @PropertyDecorator2(50) + ~~~~~ => Pos: (982 to 986) SpanInfo: undefined +27 > @PropertyDecorator1 - ~~~~~ => Pos: (1006 to 1010) SpanInfo: undefined + ~~~~~~~~~~~~~~~~~~~ => Pos: (987 to 1005) SpanInfo: {"start":987,"length":46} + >PropertyDecorator1 + > @PropertyDecorator2(50) + >:=> (line 27, col 5) to (line 28, col 27) +-------------------------------- 28 > @PropertyDecorator2(50) - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1011 to 1033) SpanInfo: {"start":1011,"length":22} - >PropertyDecorator2(50) - >:=> (line 28, col 5) to (line 28, col 27) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1006 to 1033) SpanInfo: {"start":987,"length":46} + >PropertyDecorator1 + > @PropertyDecorator2(50) + >:=> (line 27, col 5) to (line 28, col 27) -------------------------------- 29 > private x: string; @@ -350,24 +308,24 @@ -------------------------------- 31 > @PropertyDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1058 to 1081) SpanInfo: {"start":1062,"length":83} + ~~~~~ => Pos: (1058 to 1062) SpanInfo: {"start":1062,"length":83} >@PropertyDecorator1 > @PropertyDecorator2(60) > private static x1: number = 10; >:=> (line 31, col 4) to (line 33, col 35) --------------------------------- -32 > @PropertyDecorator2(60) +31 > @PropertyDecorator1 - ~~~~~ => Pos: (1082 to 1086) SpanInfo: {"start":1062,"length":83} - >@PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~ => Pos: (1063 to 1081) SpanInfo: {"start":1063,"length":46} + >PropertyDecorator1 > @PropertyDecorator2(60) - > private static x1: number = 10; - >:=> (line 31, col 4) to (line 33, col 35) + >:=> (line 31, col 5) to (line 32, col 27) +-------------------------------- 32 > @PropertyDecorator2(60) - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1087 to 1109) SpanInfo: {"start":1087,"length":22} - >PropertyDecorator2(60) - >:=> (line 32, col 5) to (line 32, col 27) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1082 to 1109) SpanInfo: {"start":1063,"length":46} + >PropertyDecorator1 + > @PropertyDecorator2(60) + >:=> (line 31, col 5) to (line 32, col 27) -------------------------------- 33 > private static x1: number = 10; @@ -394,20 +352,22 @@ -------------------------------- 36 > @ParameterDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1163 to 1191) SpanInfo: {"start":1254,"length":20} + ~~~~~~~~~ => Pos: (1163 to 1171) SpanInfo: {"start":1254,"length":20} >return this.greeting >:=> (line 39, col 8) to (line 39, col 28) --------------------------------- -37 > @ParameterDecorator2(70) +36 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (1192 to 1200) SpanInfo: {"start":1254,"length":20} - >return this.greeting - >:=> (line 39, col 8) to (line 39, col 28) + ~~~~~~~~~~~~~~~~~~~~ => Pos: (1172 to 1191) SpanInfo: {"start":1172,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(70) + >:=> (line 36, col 9) to (line 37, col 32) +-------------------------------- 37 > @ParameterDecorator2(70) - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1201 to 1224) SpanInfo: {"start":1201,"length":23} - >ParameterDecorator2(70) - >:=> (line 37, col 9) to (line 37, col 32) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1192 to 1224) SpanInfo: {"start":1172,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(70) + >:=> (line 36, col 9) to (line 37, col 32) -------------------------------- 38 > x: number) { @@ -433,28 +393,26 @@ -------------------------------- 42 > @PropertyDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1283 to 1306) SpanInfo: {"start":1287,"length":105} + ~~~~~ => Pos: (1283 to 1287) SpanInfo: {"start":1287,"length":105} >@PropertyDecorator1 > @PropertyDecorator2(80) > get greetings() { > return this.greeting; > } >:=> (line 42, col 4) to (line 46, col 5) --------------------------------- -43 > @PropertyDecorator2(80) +42 > @PropertyDecorator1 - ~~~~~ => Pos: (1307 to 1311) SpanInfo: {"start":1287,"length":105} - >@PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~ => Pos: (1288 to 1306) SpanInfo: {"start":1288,"length":46} + >PropertyDecorator1 > @PropertyDecorator2(80) - > get greetings() { - > return this.greeting; - > } - >:=> (line 42, col 4) to (line 46, col 5) + >:=> (line 42, col 5) to (line 43, col 27) +-------------------------------- 43 > @PropertyDecorator2(80) - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1312 to 1334) SpanInfo: {"start":1312,"length":22} - >PropertyDecorator2(80) - >:=> (line 43, col 5) to (line 43, col 27) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1307 to 1334) SpanInfo: {"start":1288,"length":46} + >PropertyDecorator1 + > @PropertyDecorator2(80) + >:=> (line 42, col 5) to (line 43, col 27) -------------------------------- 44 > get greetings() { @@ -500,20 +458,22 @@ -------------------------------- 49 > @ParameterDecorator1 - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1413 to 1441) SpanInfo: {"start":1512,"length":25} + ~~~~~~~~~ => Pos: (1413 to 1421) SpanInfo: {"start":1512,"length":25} >this.greeting = greetings >:=> (line 52, col 8) to (line 52, col 33) --------------------------------- -50 > @ParameterDecorator2(90) +49 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (1442 to 1450) SpanInfo: {"start":1512,"length":25} - >this.greeting = greetings - >:=> (line 52, col 8) to (line 52, col 33) + ~~~~~~~~~~~~~~~~~~~~ => Pos: (1422 to 1441) SpanInfo: {"start":1422,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(90) + >:=> (line 49, col 9) to (line 50, col 32) +-------------------------------- 50 > @ParameterDecorator2(90) - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1451 to 1474) SpanInfo: {"start":1451,"length":23} - >ParameterDecorator2(90) - >:=> (line 50, col 9) to (line 50, col 32) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1442 to 1474) SpanInfo: {"start":1422,"length":52} + >ParameterDecorator1 + > @ParameterDecorator2(90) + >:=> (line 49, col 9) to (line 50, col 32) -------------------------------- 51 > greetings: string) { From 83e569e6c3f966611624ee6f07d5e9aa128e3674 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 16:34:38 -0800 Subject: [PATCH 284/353] Breakpoints on the node with decorator should start at actual syntax and not from decorators --- src/services/breakpoints.ts | 5 +- .../reference/bpSpan_decorators.baseline | 92 +++++++------------ 2 files changed, 38 insertions(+), 59 deletions(-) diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index dea27d0f8d006..31ab5d2adec5d 100644 --- a/src/services/breakpoints.ts +++ b/src/services/breakpoints.ts @@ -39,7 +39,10 @@ namespace ts.BreakpointResolver { return spanInNode(tokenAtLocation); function textSpan(startNode: Node, endNode?: Node) { - return createTextSpanFromBounds(startNode.getStart(sourceFile), (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 { diff --git a/tests/baselines/reference/bpSpan_decorators.baseline b/tests/baselines/reference/bpSpan_decorators.baseline index bba31d1df409e..179cdb08906f5 100644 --- a/tests/baselines/reference/bpSpan_decorators.baseline +++ b/tests/baselines/reference/bpSpan_decorators.baseline @@ -29,9 +29,7 @@ -------------------------------- 8 >@ClassDecorator1 - ~ => Pos: (594 to 594) SpanInfo: {"start":594,"length":952} - >@ClassDecorator1 - >@ClassDecorator2(10) + ~ => Pos: (594 to 594) SpanInfo: {"start":632,"length":914} >class Greeter { > constructor( > @ParameterDecorator1 @@ -77,7 +75,7 @@ > this.greeting = greetings; > } >} - >:=> (line 8, col 0) to (line 54, col 1) + >:=> (line 10, col 0) to (line 54, col 1) 8 >@ClassDecorator1 ~~~~~~~~~~~~~~~~ => Pos: (595 to 610) SpanInfo: {"start":595,"length":36} @@ -94,9 +92,7 @@ -------------------------------- 10 >class Greeter { - ~~~~~~~~~~~~~~~~ => Pos: (632 to 647) SpanInfo: {"start":594,"length":952} - >@ClassDecorator1 - >@ClassDecorator2(10) + ~~~~~~~~~~~~~~~~ => Pos: (632 to 647) SpanInfo: {"start":632,"length":914} >class Greeter { > constructor( > @ParameterDecorator1 @@ -142,7 +138,7 @@ > this.greeting = greetings; > } >} - >:=> (line 8, col 0) to (line 54, col 1) + >:=> (line 10, col 0) to (line 54, col 1) -------------------------------- 11 > constructor( @@ -152,11 +148,9 @@ -------------------------------- 12 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (665 to 673) SpanInfo: {"start":673,"length":85} - >@ParameterDecorator1 - > @ParameterDecorator2(20) - > public greeting: string - >:=> (line 12, col 8) to (line 14, col 31) + ~~~~~~~~~ => Pos: (665 to 673) SpanInfo: {"start":735,"length":23} + >public greeting: string + >:=> (line 14, col 8) to (line 14, col 31) 12 > @ParameterDecorator1 ~~~~~~~~~~~~~~~~~~~~ => Pos: (674 to 693) SpanInfo: {"start":674,"length":52} @@ -173,11 +167,9 @@ -------------------------------- 14 > public greeting: string, - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (727 to 759) SpanInfo: {"start":673,"length":85} - >@ParameterDecorator1 - > @ParameterDecorator2(20) - > public greeting: string - >:=> (line 12, col 8) to (line 14, col 31) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (727 to 759) SpanInfo: {"start":735,"length":23} + >public greeting: string + >:=> (line 14, col 8) to (line 14, col 31) -------------------------------- 15 > @@ -185,11 +177,9 @@ -------------------------------- 16 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (761 to 769) SpanInfo: {"start":769,"length":80} - >@ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] - >:=> (line 16, col 8) to (line 18, col 26) + ~~~~~~~~~ => Pos: (761 to 769) SpanInfo: {"start":835,"length":14} + >...b: string[] + >:=> (line 18, col 12) to (line 18, col 26) 16 > @ParameterDecorator1 ~~~~~~~~~~~~~~~~~~~~ => Pos: (770 to 789) SpanInfo: {"start":770,"length":52} @@ -206,11 +196,9 @@ -------------------------------- 18 > ...b: string[]) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (823 to 849) SpanInfo: {"start":769,"length":80} - >@ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[] - >:=> (line 16, col 8) to (line 18, col 26) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ => 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} @@ -229,13 +217,11 @@ -------------------------------- 21 > @PropertyDecorator1 - ~~~~~ => Pos: (860 to 864) SpanInfo: {"start":864,"length":116} - >@PropertyDecorator1 - > @PropertyDecorator2(40) - > greet() { + ~~~~~ => Pos: (860 to 864) SpanInfo: {"start":916,"length":64} + >greet() { > return "

" + this.greeting + "

"; > } - >:=> (line 21, col 4) to (line 25, col 5) + >:=> (line 23, col 4) to (line 25, col 5) 21 > @PropertyDecorator1 ~~~~~~~~~~~~~~~~~~~ => Pos: (865 to 883) SpanInfo: {"start":865,"length":46} @@ -252,13 +238,11 @@ -------------------------------- 23 > greet() { - ~~~~~~~~~~~ => Pos: (912 to 922) SpanInfo: {"start":864,"length":116} - >@PropertyDecorator1 - > @PropertyDecorator2(40) - > greet() { + ~~~~~~~~~~~ => Pos: (912 to 922) SpanInfo: {"start":916,"length":64} + >greet() { > return "

" + this.greeting + "

"; > } - >:=> (line 21, col 4) to (line 25, col 5) + >:=> (line 23, col 4) to (line 25, col 5) 23 > greet() { ~~~ => Pos: (923 to 925) SpanInfo: {"start":934,"length":39} @@ -308,11 +292,9 @@ -------------------------------- 31 > @PropertyDecorator1 - ~~~~~ => Pos: (1058 to 1062) SpanInfo: {"start":1062,"length":83} - >@PropertyDecorator1 - > @PropertyDecorator2(60) - > private static x1: number = 10; - >:=> (line 31, col 4) to (line 33, col 35) + ~~~~~ => Pos: (1058 to 1062) SpanInfo: {"start":1114,"length":31} + >private static x1: number = 10; + >:=> (line 33, col 4) to (line 33, col 35) 31 > @PropertyDecorator1 ~~~~~~~~~~~~~~~~~~~ => Pos: (1063 to 1081) SpanInfo: {"start":1063,"length":46} @@ -329,11 +311,9 @@ -------------------------------- 33 > private static x1: number = 10; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1110 to 1145) SpanInfo: {"start":1062,"length":83} - >@PropertyDecorator1 - > @PropertyDecorator2(60) - > private static x1: number = 10; - >:=> (line 31, col 4) to (line 33, col 35) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1110 to 1145) SpanInfo: {"start":1114,"length":31} + >private static x1: number = 10; + >:=> (line 33, col 4) to (line 33, col 35) -------------------------------- 34 > @@ -393,13 +373,11 @@ -------------------------------- 42 > @PropertyDecorator1 - ~~~~~ => Pos: (1283 to 1287) SpanInfo: {"start":1287,"length":105} - >@PropertyDecorator1 - > @PropertyDecorator2(80) - > get greetings() { + ~~~~~ => Pos: (1283 to 1287) SpanInfo: {"start":1339,"length":53} + >get greetings() { > return this.greeting; > } - >:=> (line 42, col 4) to (line 46, col 5) + >:=> (line 44, col 4) to (line 46, col 5) 42 > @PropertyDecorator1 ~~~~~~~~~~~~~~~~~~~ => Pos: (1288 to 1306) SpanInfo: {"start":1288,"length":46} @@ -416,13 +394,11 @@ -------------------------------- 44 > get greetings() { - ~~~~~~~~~~~~~~~~~~~ => Pos: (1335 to 1353) SpanInfo: {"start":1287,"length":105} - >@PropertyDecorator1 - > @PropertyDecorator2(80) - > get greetings() { + ~~~~~~~~~~~~~~~~~~~ => Pos: (1335 to 1353) SpanInfo: {"start":1339,"length":53} + >get greetings() { > return this.greeting; > } - >:=> (line 42, col 4) to (line 46, col 5) + >:=> (line 44, col 4) to (line 46, col 5) 44 > get greetings() { ~~~ => Pos: (1354 to 1356) SpanInfo: {"start":1365,"length":20} From ba2238fe583c2e8c7290efd9b61708900f69e2d0 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 19 Nov 2015 16:46:25 -0800 Subject: [PATCH 285/353] Decorators node array should have pos at token @ instead of actual decorator expression --- src/compiler/parser.ts | 2 +- .../reference/bpSpan_decorators.baseline | 199 +++++------------- .../sourceMapValidationDecorators.js.map | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 30 +-- 4 files changed, 71 insertions(+), 162 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 212594f7b7dbd..fbf84fb6dbbe1 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -4890,7 +4890,7 @@ namespace ts { if (!decorators) { decorators = >[]; - decorators.pos = scanner.getStartPos(); + decorators.pos = decoratorStart; } const decorator = createNode(SyntaxKind.Decorator, decoratorStart); diff --git a/tests/baselines/reference/bpSpan_decorators.baseline b/tests/baselines/reference/bpSpan_decorators.baseline index 179cdb08906f5..f6bb700e0989f 100644 --- a/tests/baselines/reference/bpSpan_decorators.baseline +++ b/tests/baselines/reference/bpSpan_decorators.baseline @@ -29,66 +29,17 @@ -------------------------------- 8 >@ClassDecorator1 - ~ => Pos: (594 to 594) SpanInfo: {"start":632,"length":914} - >class Greeter { - > constructor( - > @ParameterDecorator1 - > @ParameterDecorator2(20) - > public greeting: string, - > - > @ParameterDecorator1 - > @ParameterDecorator2(30) - > ...b: string[]) { - > } - > - > @PropertyDecorator1 - > @PropertyDecorator2(40) - > greet() { - > return "

" + this.greeting + "

"; - > } - > - > @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) -8 >@ClassDecorator1 - - ~~~~~~~~~~~~~~~~ => Pos: (595 to 610) SpanInfo: {"start":595,"length":36} - >ClassDecorator1 + ~~~~~~~~~~~~~~~~~ => Pos: (594 to 610) SpanInfo: {"start":594,"length":37} + >@ClassDecorator1 >@ClassDecorator2(10) - >:=> (line 8, col 1) to (line 9, col 20) + >:=> (line 8, col 0) to (line 9, col 20) -------------------------------- 9 >@ClassDecorator2(10) - ~~~~~~~~~~~~~~~~~~~~~ => Pos: (611 to 631) SpanInfo: {"start":595,"length":36} - >ClassDecorator1 + ~~~~~~~~~~~~~~~~~~~~~ => Pos: (611 to 631) SpanInfo: {"start":594,"length":37} + >@ClassDecorator1 >@ClassDecorator2(10) - >:=> (line 8, col 1) to (line 9, col 20) + >:=> (line 8, col 0) to (line 9, col 20) -------------------------------- 10 >class Greeter { @@ -148,22 +99,17 @@ -------------------------------- 12 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (665 to 673) SpanInfo: {"start":735,"length":23} - >public greeting: string - >:=> (line 14, col 8) to (line 14, col 31) -12 > @ParameterDecorator1 - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (674 to 693) SpanInfo: {"start":674,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (665 to 693) SpanInfo: {"start":673,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(20) - >:=> (line 12, col 9) to (line 13, col 32) + >:=> (line 12, col 8) to (line 13, col 32) -------------------------------- 13 > @ParameterDecorator2(20) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (694 to 726) SpanInfo: {"start":674,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (694 to 726) SpanInfo: {"start":673,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(20) - >:=> (line 12, col 9) to (line 13, col 32) + >:=> (line 12, col 8) to (line 13, col 32) -------------------------------- 14 > public greeting: string, @@ -177,22 +123,17 @@ -------------------------------- 16 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (761 to 769) SpanInfo: {"start":835,"length":14} - >...b: string[] - >:=> (line 18, col 12) to (line 18, col 26) -16 > @ParameterDecorator1 - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (770 to 789) SpanInfo: {"start":770,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (761 to 789) SpanInfo: {"start":769,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(30) - >:=> (line 16, col 9) to (line 17, col 32) + >:=> (line 16, col 8) to (line 17, col 32) -------------------------------- 17 > @ParameterDecorator2(30) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (790 to 822) SpanInfo: {"start":770,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (790 to 822) SpanInfo: {"start":769,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(30) - >:=> (line 16, col 9) to (line 17, col 32) + >:=> (line 16, col 8) to (line 17, col 32) -------------------------------- 18 > ...b: string[]) { @@ -217,24 +158,17 @@ -------------------------------- 21 > @PropertyDecorator1 - ~~~~~ => Pos: (860 to 864) SpanInfo: {"start":916,"length":64} - >greet() { - > return "

" + this.greeting + "

"; - > } - >:=> (line 23, col 4) to (line 25, col 5) -21 > @PropertyDecorator1 - - ~~~~~~~~~~~~~~~~~~~ => Pos: (865 to 883) SpanInfo: {"start":865,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (860 to 883) SpanInfo: {"start":864,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(40) - >:=> (line 21, col 5) to (line 22, col 27) + >:=> (line 21, col 4) to (line 22, col 27) -------------------------------- 22 > @PropertyDecorator2(40) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (884 to 911) SpanInfo: {"start":865,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (884 to 911) SpanInfo: {"start":864,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(40) - >:=> (line 21, col 5) to (line 22, col 27) + >:=> (line 21, col 4) to (line 22, col 27) -------------------------------- 23 > greet() { @@ -267,20 +201,17 @@ -------------------------------- 27 > @PropertyDecorator1 - ~~~~~ => Pos: (982 to 986) SpanInfo: undefined -27 > @PropertyDecorator1 - - ~~~~~~~~~~~~~~~~~~~ => Pos: (987 to 1005) SpanInfo: {"start":987,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (982 to 1005) SpanInfo: {"start":986,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(50) - >:=> (line 27, col 5) to (line 28, col 27) + >:=> (line 27, col 4) to (line 28, col 27) -------------------------------- 28 > @PropertyDecorator2(50) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1006 to 1033) SpanInfo: {"start":987,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1006 to 1033) SpanInfo: {"start":986,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(50) - >:=> (line 27, col 5) to (line 28, col 27) + >:=> (line 27, col 4) to (line 28, col 27) -------------------------------- 29 > private x: string; @@ -292,22 +223,17 @@ -------------------------------- 31 > @PropertyDecorator1 - ~~~~~ => Pos: (1058 to 1062) SpanInfo: {"start":1114,"length":31} - >private static x1: number = 10; - >:=> (line 33, col 4) to (line 33, col 35) -31 > @PropertyDecorator1 - - ~~~~~~~~~~~~~~~~~~~ => Pos: (1063 to 1081) SpanInfo: {"start":1063,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1058 to 1081) SpanInfo: {"start":1062,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(60) - >:=> (line 31, col 5) to (line 32, col 27) + >:=> (line 31, col 4) to (line 32, col 27) -------------------------------- 32 > @PropertyDecorator2(60) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1082 to 1109) SpanInfo: {"start":1063,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1082 to 1109) SpanInfo: {"start":1062,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(60) - >:=> (line 31, col 5) to (line 32, col 27) + >:=> (line 31, col 4) to (line 32, col 27) -------------------------------- 33 > private static x1: number = 10; @@ -332,22 +258,17 @@ -------------------------------- 36 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (1163 to 1171) SpanInfo: {"start":1254,"length":20} - >return this.greeting - >:=> (line 39, col 8) to (line 39, col 28) -36 > @ParameterDecorator1 - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (1172 to 1191) SpanInfo: {"start":1172,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1163 to 1191) SpanInfo: {"start":1171,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(70) - >:=> (line 36, col 9) to (line 37, col 32) + >:=> (line 36, col 8) to (line 37, col 32) -------------------------------- 37 > @ParameterDecorator2(70) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1192 to 1224) SpanInfo: {"start":1172,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1192 to 1224) SpanInfo: {"start":1171,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(70) - >:=> (line 36, col 9) to (line 37, col 32) + >:=> (line 36, col 8) to (line 37, col 32) -------------------------------- 38 > x: number) { @@ -373,24 +294,17 @@ -------------------------------- 42 > @PropertyDecorator1 - ~~~~~ => Pos: (1283 to 1287) SpanInfo: {"start":1339,"length":53} - >get greetings() { - > return this.greeting; - > } - >:=> (line 44, col 4) to (line 46, col 5) -42 > @PropertyDecorator1 - - ~~~~~~~~~~~~~~~~~~~ => Pos: (1288 to 1306) SpanInfo: {"start":1288,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1283 to 1306) SpanInfo: {"start":1287,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(80) - >:=> (line 42, col 5) to (line 43, col 27) + >:=> (line 42, col 4) to (line 43, col 27) -------------------------------- 43 > @PropertyDecorator2(80) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1307 to 1334) SpanInfo: {"start":1288,"length":46} - >PropertyDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1307 to 1334) SpanInfo: {"start":1287,"length":47} + >@PropertyDecorator1 > @PropertyDecorator2(80) - >:=> (line 42, col 5) to (line 43, col 27) + >:=> (line 42, col 4) to (line 43, col 27) -------------------------------- 44 > get greetings() { @@ -434,22 +348,17 @@ -------------------------------- 49 > @ParameterDecorator1 - ~~~~~~~~~ => Pos: (1413 to 1421) SpanInfo: {"start":1512,"length":25} - >this.greeting = greetings - >:=> (line 52, col 8) to (line 52, col 33) -49 > @ParameterDecorator1 - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (1422 to 1441) SpanInfo: {"start":1422,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1413 to 1441) SpanInfo: {"start":1421,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(90) - >:=> (line 49, col 9) to (line 50, col 32) + >:=> (line 49, col 8) to (line 50, col 32) -------------------------------- 50 > @ParameterDecorator2(90) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1442 to 1474) SpanInfo: {"start":1422,"length":52} - >ParameterDecorator1 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1442 to 1474) SpanInfo: {"start":1421,"length":53} + >@ParameterDecorator1 > @ParameterDecorator2(90) - >:=> (line 49, col 9) to (line 50, col 32) + >:=> (line 49, col 8) to (line 50, col 32) -------------------------------- 51 > greetings: string) { diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map index 355cb0cb55ffb..4af925231cd27 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js.map +++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationDecorators.js.map] -{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AASA;IACIA,iBAGSA,QAAgBA;QAIvBC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAIDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ9BA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;wCAAAA;IAKtBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;sCAAAA;IAQpBA;mBAAAA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;qCAAAA;IAKzBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;mBAMpBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;4CAPHA;IAZtBA;QAAAA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;6BAAAA;IAxB1BA;QAAAA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;mBAGbA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;mBAGvBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;eARVA;IA6CpBA,cAACA;AAADA,CAACA,AA5CD,IA4CC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;AASA;IACIA,iBAGSA,QAAgBA;QAIvBC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAIDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;wCAAAA;IAKvBA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;sCAAAA;IAQrBA;mBAACA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;qCAAAA;IAK1BA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;mBAMpBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;4CAPHA;IAZvBA;QAACA,kBAAkBA;QAClBA,kBAAkBA,CAACA,EAAEA,CAACA;6BAAAA;IAxB3BA;QAACA,eAAeA;QACfA,eAAeA,CAACA,EAAEA,CAACA;mBAGbA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;mBAGvBA,mBAAmBA;mBACnBA,mBAAmBA,CAACA,EAAEA,CAACA;eARVA;IA6CpBA,cAACA;AAADA,CAACA,AA5CD,IA4CC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index face3de621813..1e270c40593ac 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -381,13 +381,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(35, 5) Source(21, 6) + SourceIndex(0) name (Greeter) +1 >Emitted(35, 5) Source(21, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1-> +1->@ 2 > PropertyDecorator1 1->Emitted(36, 9) Source(21, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(36, 27) Source(21, 24) + SourceIndex(0) name (Greeter) @@ -424,14 +424,14 @@ sourceFile:sourceMapValidationDecorators.ts > return "

" + this.greeting + "

"; > } > - > @ -1 >Emitted(39, 5) Source(27, 6) + SourceIndex(0) name (Greeter) + > +1 >Emitted(39, 5) Source(27, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1-> +1->@ 2 > PropertyDecorator1 1->Emitted(40, 9) Source(27, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(40, 27) Source(27, 24) + SourceIndex(0) name (Greeter) @@ -471,14 +471,14 @@ sourceFile:sourceMapValidationDecorators.ts > private static x1: number = 10; > > private fn( - > @ -1 >Emitted(43, 5) Source(36, 8) + SourceIndex(0) name (Greeter) + > +1 >Emitted(43, 5) Source(36, 7) + SourceIndex(0) name (Greeter) --- >>> __param(0, ParameterDecorator1), 1->^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^-> -1-> +1->@ 2 > ParameterDecorator1 1->Emitted(44, 20) Source(36, 8) + SourceIndex(0) name (Greeter) 2 >Emitted(44, 39) Source(36, 27) + SourceIndex(0) name (Greeter) @@ -514,14 +514,14 @@ sourceFile:sourceMapValidationDecorators.ts > return this.greeting; > } > - > @ -1 >Emitted(47, 5) Source(42, 6) + SourceIndex(0) name (Greeter) + > +1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^-> -1-> +1->@ 2 > PropertyDecorator1 1->Emitted(48, 9) Source(42, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(48, 27) Source(42, 24) + SourceIndex(0) name (Greeter) @@ -588,13 +588,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(53, 5) Source(31, 6) + SourceIndex(0) name (Greeter) +1 >Emitted(53, 5) Source(31, 5) + SourceIndex(0) name (Greeter) --- >>> PropertyDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^-> -1-> +1->@ 2 > PropertyDecorator1 1->Emitted(54, 9) Source(31, 6) + SourceIndex(0) name (Greeter) 2 >Emitted(54, 27) Source(31, 24) + SourceIndex(0) name (Greeter) @@ -627,13 +627,13 @@ sourceFile:sourceMapValidationDecorators.ts 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(57, 5) Source(8, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(57, 5) Source(8, 1) + SourceIndex(0) name (Greeter) --- >>> ClassDecorator1, 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^ 3 > ^^^^^^-> -1-> +1->@ 2 > ClassDecorator1 1->Emitted(58, 9) Source(8, 2) + SourceIndex(0) name (Greeter) 2 >Emitted(58, 24) Source(8, 17) + SourceIndex(0) name (Greeter) From f5b8619199535d0ef593abbaff9e909d495499c7 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 19 Nov 2015 17:08:51 -0800 Subject: [PATCH 286/353] Adds StringLiteralType to SyntaxKind to disambiguate string literals in a type position. --- src/compiler/checker.ts | 16 +++++++-------- src/compiler/declarationEmitter.ts | 2 +- src/compiler/emitter.ts | 11 +++++----- src/compiler/parser.ts | 24 ++++++++++++++++------ src/compiler/types.ts | 32 ++++++++++++++++++++---------- src/compiler/utilities.ts | 3 --- src/services/services.ts | 7 +++++-- src/services/utilities.ts | 15 +++++++------- 8 files changed, 67 insertions(+), 43 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8f47b90cfb774..a155387d2ee12 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -532,7 +532,7 @@ namespace ts { } // Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. + // yet we never want to treat an export specifier as putting a member in scope. // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol @@ -3201,7 +3201,7 @@ namespace ts { case SyntaxKind.BooleanKeyword: case SyntaxKind.SymbolKeyword: case SyntaxKind.VoidKeyword: - case SyntaxKind.StringLiteral: + case SyntaxKind.StringLiteralType: return true; case SyntaxKind.ArrayType: return isIndependentType((node).elementType); @@ -3862,7 +3862,7 @@ namespace ts { paramSymbol = resolvedSymbol; } parameters.push(paramSymbol); - if (param.type && param.type.kind === SyntaxKind.StringLiteral) { + if (param.type && param.type.kind === SyntaxKind.StringLiteralType) { hasStringLiterals = true; } @@ -4531,7 +4531,7 @@ namespace ts { return links.resolvedType; } - function getStringLiteralType(node: StringLiteral): StringLiteralType { + function getStringLiteralType(node: StringLiteral | StringLiteralTypeNode): StringLiteralType { const text = node.text; if (hasProperty(stringLiteralTypes, text)) { return stringLiteralTypes[text]; @@ -4542,7 +4542,7 @@ namespace ts { return type; } - function getTypeFromStringLiteral(node: StringLiteral): Type { + function getTypeFromStringLiteral(node: StringLiteral | StringLiteralTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { links.resolvedType = getStringLiteralType(node); @@ -4587,8 +4587,8 @@ namespace ts { return voidType; case SyntaxKind.ThisType: return getTypeFromThisTypeNode(node); - case SyntaxKind.StringLiteral: - return getTypeFromStringLiteral(node); + case SyntaxKind.StringLiteralType: + return getTypeFromStringLiteral(node); case SyntaxKind.TypeReference: return getTypeFromTypeReference(node); case SyntaxKind.TypePredicate: @@ -11397,7 +11397,7 @@ namespace ts { // we can get here in two cases // 1. mixed static and instance class members // 2. something with the same name was defined before the set of overloads that prevents them from merging - // here we'll report error only for the first case since for second we should already report error in binder + // here we'll report error only for the first case since for second we should already report error in binder if (reportError) { const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; error(errorNode, diagnostic); diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 59f89226d5fad..a9bcbd830f01f 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -379,7 +379,7 @@ namespace ts { case SyntaxKind.SymbolKeyword: case SyntaxKind.VoidKeyword: case SyntaxKind.ThisType: - case SyntaxKind.StringLiteral: + case SyntaxKind.StringLiteralType: return writeTextOfNode(currentText, type); case SyntaxKind.ExpressionWithTypeArguments: return emitExpressionWithTypeArguments(type); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 2e07d7a634ee9..40b37e04191ab 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1310,7 +1310,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function isBinaryOrOctalIntegerLiteral(node: LiteralExpression, text: string): boolean { + function isBinaryOrOctalIntegerLiteral(node: LiteralLikeNode, text: string): boolean { if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) { switch (text.charCodeAt(1)) { case CharacterCodes.b: @@ -1324,7 +1324,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return false; } - function emitLiteral(node: LiteralExpression) { + function emitLiteral(node: LiteralExpression | TemplateLiteralFragment) { const text = getLiteralText(node); if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap) && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) { @@ -1339,7 +1339,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function getLiteralText(node: LiteralExpression) { + function getLiteralText(node: LiteralExpression | TemplateLiteralFragment) { // Any template literal or string literal with an extended escape // (e.g. "\u{0067}") will need to be downleveled as a escaped string literal. if (languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) { @@ -1398,7 +1398,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(`"${text}"`); } - function emitDownlevelTaggedTemplateArray(node: TaggedTemplateExpression, literalEmitter: (literal: LiteralExpression) => void) { + function emitDownlevelTaggedTemplateArray(node: TaggedTemplateExpression, literalEmitter: (literal: LiteralExpression | TemplateLiteralFragment) => void) { write("["); if (node.template.kind === SyntaxKind.NoSubstitutionTemplateLiteral) { literalEmitter(node.template); @@ -5964,7 +5964,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitSerializedTypeNode(node: TypeNode) { if (node) { - switch (node.kind) { case SyntaxKind.VoidKeyword: write("void 0"); @@ -5990,7 +5989,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return; case SyntaxKind.StringKeyword: - case SyntaxKind.StringLiteral: + case SyntaxKind.StringLiteralType: write("String"); return; diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 6dbadd074d450..b12db7b0fb15c 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1869,7 +1869,7 @@ namespace ts { function parseTemplateExpression(): TemplateExpression { const template = createNode(SyntaxKind.TemplateExpression); - template.head = parseLiteralNode(); + template.head = parseTemplateLiteralFragment(); Debug.assert(template.head.kind === SyntaxKind.TemplateHead, "Template head has wrong token kind"); const templateSpans = >[]; @@ -1890,22 +1890,34 @@ namespace ts { const span = createNode(SyntaxKind.TemplateSpan); span.expression = allowInAnd(parseExpression); - let literal: LiteralExpression; + let literal: TemplateLiteralFragment; if (token === SyntaxKind.CloseBraceToken) { reScanTemplateToken(); - literal = parseLiteralNode(); + literal = parseTemplateLiteralFragment(); } else { - literal = parseExpectedToken(SyntaxKind.TemplateTail, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, tokenToString(SyntaxKind.CloseBraceToken)); + literal = parseExpectedToken(SyntaxKind.TemplateTail, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, tokenToString(SyntaxKind.CloseBraceToken)); } span.literal = literal; return finishNode(span); } + function parseStringLiteralTypeNode(): StringLiteralTypeNode { + return parseLiteralLikeNode(SyntaxKind.StringLiteralType, /*internName*/ true); + } + function parseLiteralNode(internName?: boolean): LiteralExpression { - const node = createNode(token); + return parseLiteralLikeNode(token, internName); + } + + function parseTemplateLiteralFragment(): TemplateLiteralFragment { + return parseLiteralLikeNode(token, /*internName*/ false); + } + + function parseLiteralLikeNode(kind: SyntaxKind, internName: boolean): LiteralLikeNode { + const node = createNode(kind); const text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; @@ -2392,7 +2404,7 @@ namespace ts { const node = tryParse(parseKeywordAndNoDot); return node || parseTypeReferenceOrTypePredicate(); case SyntaxKind.StringLiteral: - return parseLiteralNode(/*internName*/ true); + return parseStringLiteralTypeNode(); case SyntaxKind.VoidKeyword: return parseTokenNode(); case SyntaxKind.ThisKeyword: diff --git a/src/compiler/types.ts b/src/compiler/types.ts index cfa28c4616181..b4edfe2fa995d 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -205,6 +205,7 @@ namespace ts { IntersectionType, ParenthesizedType, ThisType, + StringLiteralType, // Binding patterns ObjectBindingPattern, ArrayBindingPattern, @@ -350,7 +351,7 @@ namespace ts { FirstFutureReservedWord = ImplementsKeyword, LastFutureReservedWord = YieldKeyword, FirstTypeNode = TypePredicate, - LastTypeNode = ThisType, + LastTypeNode = StringLiteralType, FirstPunctuation = OpenBraceToken, LastPunctuation = CaretEqualsToken, FirstToken = Unknown, @@ -790,10 +791,13 @@ namespace ts { type: TypeNode; } - // Note that a StringLiteral AST node is both an Expression and a TypeNode. The latter is - // because string literals can appear in type annotations as well. + // @kind(SyntaxKind.StringLiteralType) + export interface StringLiteralTypeNode extends LiteralLikeNode, TypeNode { + _stringLiteralTypeBrand: any; + } + // @kind(SyntaxKind.StringLiteral) - export interface StringLiteral extends LiteralExpression, TypeNode { + export interface StringLiteral extends LiteralExpression { _stringLiteralBrand: any; } @@ -911,24 +915,32 @@ namespace ts { body: ConciseBody; } + export interface LiteralLikeNode extends Node { + text: string; + isUnterminated?: boolean; + hasExtendedUnicodeEscape?: boolean; + } + // The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral, // or any literal of a template, this means quotes have been removed and escapes have been converted to actual characters. // For a NumericLiteral, the stored value is the toString() representation of the number. For example 1, 1.00, and 1e0 are all stored as just "1". // @kind(SyntaxKind.NumericLiteral) // @kind(SyntaxKind.RegularExpressionLiteral) // @kind(SyntaxKind.NoSubstitutionTemplateLiteral) + export interface LiteralExpression extends LiteralLikeNode, PrimaryExpression { + _literalExpressionBrand: any; + } + // @kind(SyntaxKind.TemplateHead) // @kind(SyntaxKind.TemplateMiddle) // @kind(SyntaxKind.TemplateTail) - export interface LiteralExpression extends PrimaryExpression { - text: string; - isUnterminated?: boolean; - hasExtendedUnicodeEscape?: boolean; + export interface TemplateLiteralFragment extends LiteralLikeNode { + _templateLiteralFragmentBrand: any; } // @kind(SyntaxKind.TemplateExpression) export interface TemplateExpression extends PrimaryExpression { - head: LiteralExpression; + head: TemplateLiteralFragment; templateSpans: NodeArray; } @@ -937,7 +949,7 @@ namespace ts { // @kind(SyntaxKind.TemplateSpan) export interface TemplateSpan extends Node { expression: Expression; - literal: LiteralExpression; + literal: TemplateLiteralFragment; } // @kind(SyntaxKind.ParenthesizedExpression) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 1e4ee1bed47d4..22228343cf34b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -464,9 +464,6 @@ namespace ts { return true; case SyntaxKind.VoidKeyword: return node.parent.kind !== SyntaxKind.VoidExpression; - case SyntaxKind.StringLiteral: - // Specialized signatures can have string literals as their parameters' type names - return node.parent.kind === SyntaxKind.Parameter; case SyntaxKind.ExpressionWithTypeArguments: return !isExpressionWithTypeArgumentsInClassExtendsClause(node); diff --git a/src/services/services.ts b/src/services/services.ts index 95179ac0bc013..995966bdd5217 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3535,6 +3535,7 @@ namespace ts { function isInStringOrRegularExpressionOrTemplateLiteral(contextToken: Node): boolean { if (contextToken.kind === SyntaxKind.StringLiteral + || contextToken.kind === SyntaxKind.StringLiteralType || contextToken.kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(contextToken.kind)) { let start = contextToken.getStart(); @@ -6532,6 +6533,7 @@ namespace ts { case SyntaxKind.PropertyAccessExpression: case SyntaxKind.QualifiedName: case SyntaxKind.StringLiteral: + case SyntaxKind.StringLiteralType: case SyntaxKind.FalseKeyword: case SyntaxKind.TrueKeyword: case SyntaxKind.NullKeyword: @@ -6993,7 +6995,7 @@ namespace ts { else if (tokenKind === SyntaxKind.NumericLiteral) { return ClassificationType.numericLiteral; } - else if (tokenKind === SyntaxKind.StringLiteral) { + else if (tokenKind === SyntaxKind.StringLiteral || tokenKind === SyntaxKind.StringLiteralType) { return ClassificationType.stringLiteral; } else if (tokenKind === SyntaxKind.RegularExpressionLiteral) { @@ -7912,7 +7914,7 @@ namespace ts { addResult(start, end, classFromKind(token)); if (end >= text.length) { - if (token === SyntaxKind.StringLiteral) { + if (token === SyntaxKind.StringLiteral || token === SyntaxKind.StringLiteralType) { // Check to see if we finished up on a multiline string literal. let tokenText = scanner.getTokenText(); if (scanner.isUnterminated()) { @@ -8062,6 +8064,7 @@ namespace ts { case SyntaxKind.NumericLiteral: return ClassificationType.numericLiteral; case SyntaxKind.StringLiteral: + case SyntaxKind.StringLiteralType: return ClassificationType.stringLiteral; case SyntaxKind.RegularExpressionLiteral: return ClassificationType.regularExpressionLiteral; diff --git a/src/services/utilities.ts b/src/services/utilities.ts index a7198b4cc6d9f..b3b4ec31a02f0 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -257,14 +257,14 @@ namespace ts { return syntaxList; } - /* Gets the token whose text has range [start, end) and + /* Gets the token whose text has range [start, end) and * position >= start and (position < end or (position === end && token is keyword or identifier)) */ export function getTouchingWord(sourceFile: SourceFile, position: number): Node { return getTouchingToken(sourceFile, position, n => isWord(n.kind)); } - /* Gets the token whose text has range [start, end) and position >= start + /* Gets the token whose text has range [start, end) and position >= start * and (position < end or (position === end && token is keyword or identifier or numeric\string litera)) */ export function getTouchingPropertyName(sourceFile: SourceFile, position: number): Node { @@ -391,8 +391,8 @@ namespace ts { const start = child.getStart(sourceFile); const lookInPreviousChild = (start >= position) || // cursor in the leading trivia - (child.kind === SyntaxKind.JsxText && start === child.end); // whitespace only JsxText - + (child.kind === SyntaxKind.JsxText && start === child.end); // whitespace only JsxText + if (lookInPreviousChild) { // actual start of the node is past the position - previous token should be at the end of previous child let candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i); @@ -407,7 +407,7 @@ namespace ts { Debug.assert(startNode !== undefined || n.kind === SyntaxKind.SourceFile); - // Here we know that none of child token nodes embrace the position, + // Here we know that none of child token nodes embrace the position, // the only known case is when position is at the end of the file. // Try to find the rightmost token in the file without filtering. // Namely we are skipping the check: 'position < node.end' @@ -429,7 +429,7 @@ namespace ts { export function isInString(sourceFile: SourceFile, position: number) { let token = getTokenAtPosition(sourceFile, position); - return token && token.kind === SyntaxKind.StringLiteral && position > token.getStart(); + return token && (token.kind === SyntaxKind.StringLiteral || token.kind === SyntaxKind.StringLiteralType) && position > token.getStart(); } export function isInComment(sourceFile: SourceFile, position: number) { @@ -445,7 +445,7 @@ namespace ts { if (token && position <= token.getStart()) { let commentRanges = getLeadingCommentRanges(sourceFile.text, token.pos); - + // The end marker of a single-line comment does not include the newline character. // In the following case, we are inside a comment (^ denotes the cursor position): // @@ -565,6 +565,7 @@ namespace ts { export function isStringOrRegularExpressionOrTemplateLiteral(kind: SyntaxKind): boolean { if (kind === SyntaxKind.StringLiteral + || kind === SyntaxKind.StringLiteralType || kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(kind)) { return true; From 68c292c44503bde380317f8144770b5ca2a1971b Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 19 Nov 2015 17:42:12 -0800 Subject: [PATCH 287/353] Adds a generic algorithm to create a shallow, memberwise clone of a node. --- src/compiler/core.ts | 2 +- src/compiler/emitter.ts | 6 ++-- src/compiler/utilities.ts | 72 ++++++++++++++++++++++++++++++++------- 3 files changed, 62 insertions(+), 18 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index c93f3aebc2d42..79f0251c5651f 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -860,4 +860,4 @@ namespace ts { } return copiedList; } -} +} diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 48746d828f5a7..d2f9abc7354f5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -549,7 +549,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi [ModuleKind.CommonJS]() {}, }; - + return doEmit; function doEmit(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) { @@ -5991,9 +5991,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } // Clone the type name and parent it to a location outside of the current declaration. - const typeName = cloneEntityName(node.typeName); - typeName.parent = location; - + const typeName = cloneEntityName(node.typeName, location); const result = resolver.getTypeReferenceSerializationKind(typeName); switch (result) { case TypeReferenceSerializationKind.Unknown: diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index eef6dbe970250..040877394cc6a 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1580,20 +1580,66 @@ namespace ts { return isFunctionLike(n) || n.kind === SyntaxKind.ModuleDeclaration || n.kind === SyntaxKind.SourceFile; } - export function cloneEntityName(node: EntityName): EntityName { - if (node.kind === SyntaxKind.Identifier) { - const clone = createSynthesizedNode(SyntaxKind.Identifier); - clone.text = (node).text; - return clone; + /** + * Creates a shallow, memberwise clone of a node. The "pos", "end", "flags", and "parent" properties + * are excluded by default, and can be provided via the "location", "flags", and "parent" parameters. + * @param node The node to clone. + * @param location An optional TextRange to use to supply the new position. + * @param flags The NodeFlags to use for the cloned node. + * @param parent The parent for the new node. + */ + export function cloneNode(node: T, location?: TextRange, flags?: NodeFlags, parent?: Node): T { + // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of + // the original node. We also need to exclude specific properties and only include own- + // properties (to skip members already defined on the shared prototype). + const clone = location !== undefined + ? createNode(node.kind, location.pos, location.end) + : createSynthesizedNode(node.kind); + + for (const key in node) { + if (isExcludedPropertyForClone(key) || !node.hasOwnProperty(key)) { + continue; + } + + (clone)[key] = (node)[key]; } - else { - const clone = createSynthesizedNode(SyntaxKind.QualifiedName); - clone.left = cloneEntityName((node).left); - clone.left.parent = clone; - clone.right = cloneEntityName((node).right); - clone.right.parent = clone; - return clone; + + if (flags !== undefined) { + clone.flags = flags; } + + if (parent !== undefined) { + clone.parent = parent; + } + + return clone; + } + + function isExcludedPropertyForClone(property: string) { + return property === "pos" + || property === "end" + || property === "flags" + || property === "parent"; + } + + /** + * Creates a deep clone of an EntityName, with new parent pointers. + * @param node The EntityName to clone. + * @param parent The parent for the cloned node. + */ + export function cloneEntityName(node: EntityName, parent?: Node): EntityName { + const clone = cloneNode(node, node, node.flags, parent); + if (isQualifiedName(clone)) { + const { left, right } = clone; + clone.left = cloneEntityName(left, clone); + clone.right = cloneNode(right, right, right.flags, parent); + } + + return clone; + } + + export function isQualifiedName(node: Node): node is QualifiedName { + return node.kind === SyntaxKind.QualifiedName; } export function nodeIsSynthesized(node: Node): boolean { @@ -1936,7 +1982,7 @@ namespace ts { const bundledSources = filter(host.getSourceFiles(), sourceFile => !isDeclarationFile(sourceFile) && // Not a declaration file (!isExternalModule(sourceFile) || // non module file - (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted + (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted if (bundledSources.length) { const jsFilePath = options.outFile || options.out; const emitFileNames: EmitFileNames = { From 9b0231d9b897b44b75d7828afe61bb1048beff38 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 19 Nov 2015 17:50:28 -0800 Subject: [PATCH 288/353] Minor change to getStringLiteralType --- src/compiler/checker.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a155387d2ee12..61dabb6d50bb1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4531,8 +4531,7 @@ namespace ts { return links.resolvedType; } - function getStringLiteralType(node: StringLiteral | StringLiteralTypeNode): StringLiteralType { - const text = node.text; + function getStringLiteralType(text: string): StringLiteralType { if (hasProperty(stringLiteralTypes, text)) { return stringLiteralTypes[text]; } @@ -4545,7 +4544,7 @@ namespace ts { function getTypeFromStringLiteral(node: StringLiteral | StringLiteralTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { - links.resolvedType = getStringLiteralType(node); + links.resolvedType = getStringLiteralType(node.text); } return links.resolvedType; } @@ -8747,7 +8746,7 @@ namespace ts { // for the argument. In that case, we should check the argument. if (argType === undefined) { argType = arg.kind === SyntaxKind.StringLiteral && !reportErrors - ? getStringLiteralType(arg) + ? getStringLiteralType((arg).text) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); } @@ -8942,7 +8941,7 @@ namespace ts { case SyntaxKind.Identifier: case SyntaxKind.NumericLiteral: case SyntaxKind.StringLiteral: - return getStringLiteralType(element.name); + return getStringLiteralType((element.name).text); case SyntaxKind.ComputedPropertyName: const nameType = checkComputedPropertyName(element.name); @@ -10564,7 +10563,8 @@ namespace ts { function checkStringLiteralExpression(node: StringLiteral): Type { const contextualType = getContextualType(node); if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { - return getStringLiteralType(node); + // TODO (drosen): Consider using getTypeFromStringLiteral instead + return getStringLiteralType(node.text); } return stringType; From c93f454549ab564f2ec0f00c0e71e428abae7cd4 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 20 Nov 2015 08:30:50 -0800 Subject: [PATCH 289/353] Implement #5173 Give more helpful error when trying to set default values on an interface --- src/compiler/diagnosticMessages.json | 6 +++++- src/compiler/parser.ts | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 5b70c70ae4b83..03934153e4f3c 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -783,6 +783,10 @@ "category": "Error", "code": 1245 }, + "An interface property cannot have an initializer.": { + "category": "Error", + "code": 1246 + }, "'with' statements are not allowed in an async function block.": { "category": "Error", @@ -2418,7 +2422,7 @@ "Not all code paths return a value.": { "category": "Error", "code": 7030 - }, + }, "You cannot rename this element.": { "category": "Error", "code": 8000 diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 212594f7b7dbd..3681906169666 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2230,6 +2230,7 @@ namespace ts { const fullStart = scanner.getStartPos(); const name = parsePropertyName(); const questionToken = parseOptionalToken(SyntaxKind.QuestionToken); + const modifiers = parseModifiers(); if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { const method = createNode(SyntaxKind.MethodSignature, fullStart); @@ -2247,6 +2248,26 @@ namespace ts { property.name = name; property.questionToken = questionToken; property.type = parseTypeAnnotation(); + + // Although interfaces cannot not have initializers, we attempt to parse an initializer + // so we can report that an interface cannot have an initializer. + // + // For instance properties specifically, since they are evaluated inside the constructor, + // we do *not * want to parse yield expressions, so we specifically turn the yield context + // off. The grammar would look something like this: + // + // MemberVariableDeclaration[Yield]: + // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; + // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; + // + // The checker may still error in the static case to explicitly disallow the yield expression. + const initializer = modifiers && modifiers.flags & NodeFlags.Static + ? allowInAnd(parseNonParameterInitializer) + : doOutsideOfContext(ParserContextFlags.Yield | ParserContextFlags.DisallowIn, parseNonParameterInitializer); + if (initializer !== undefined) { + parseErrorAtCurrentToken(Diagnostics.An_interface_property_cannot_have_an_initializer); + } + parseTypeMemberSemicolon(); return finishNode(property); } From dc629d5a543c3faefe83660fa36a9898d3431540 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Nov 2015 10:07:36 -0800 Subject: [PATCH 290/353] Reduce union and intersection types before inference --- src/compiler/checker.ts | 47 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 009447df19a0a..0a79b148da60d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6086,6 +6086,17 @@ namespace ts { } function inferFromTypes(source: Type, target: Type) { + if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union || + source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) { + // Source and target are both unions or both intersections. To improve the quality of + // inferences we first reduce the types by removing constituents that are identically + // matched by a constituent in the other type. For example, when inferring from + // 'string | string[]' to 'string | T', we reduce the types to 'string[]' and 'T'. + const reducedSource = reduceUnionOrIntersectionType(source, target); + const reducedTarget = reduceUnionOrIntersectionType(target, source); + source = reducedSource; + target = reducedTarget; + } if (target.flags & TypeFlags.TypeParameter) { // If target is a type parameter, make an inference, unless the source type contains // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions). @@ -6096,7 +6107,6 @@ namespace ts { if (source.flags & TypeFlags.ContainsAnyFunctionType) { return; } - const typeParameters = context.typeParameters; for (let i = 0; i < typeParameters.length; i++) { if (target === typeParameters[i]) { @@ -6244,6 +6254,41 @@ namespace ts { } } + function typeIdenticalToSomeType(source: Type, target: UnionOrIntersectionType): boolean { + for (let t of target.types) { + if (isTypeIdenticalTo(source, t)) { + return true; + } + } + return false; + } + + /** + * Return the reduced form of the source type. This type is computed by by removing all source + * constituents that have an identical match in the target type. + */ + function reduceUnionOrIntersectionType(source: UnionOrIntersectionType, target: UnionOrIntersectionType) { + let sourceTypes = source.types; + let sourceIndex = 0; + let modified = false; + while (sourceIndex < sourceTypes.length) { + if (typeIdenticalToSomeType(sourceTypes[sourceIndex], target)) { + if (!modified) { + sourceTypes = sourceTypes.slice(0); + modified = true; + } + sourceTypes.splice(sourceIndex, 1); + } + else { + sourceIndex++; + } + } + if (modified) { + return source.flags & TypeFlags.Union ? getUnionType(sourceTypes, /*noSubtypeReduction*/ true) : getIntersectionType(sourceTypes); + } + return source; + } + function getInferenceCandidates(context: InferenceContext, index: number): Type[] { const inferences = context.inferences[index]; return inferences.primary || inferences.secondary || emptyArray; From a0842aaf047b95816bb1b3ed46a6f9d308051cb0 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Nov 2015 10:08:00 -0800 Subject: [PATCH 291/353] Adding tests --- .../unionAndIntersectionInference1.ts | 72 +++++++++++++++++++ .../unionAndIntersectionInference2.ts | 23 ++++++ 2 files changed, 95 insertions(+) create mode 100644 tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts create mode 100644 tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts new file mode 100644 index 0000000000000..7066c3e679084 --- /dev/null +++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts @@ -0,0 +1,72 @@ +// Repro from #2264 + +interface Y { 'i am a very certain type': Y } +var y: Y = undefined; +function destructure( + something: a | Y, + haveValue: (value: a) => r, + haveY: (value: Y) => r +): r { + return something === y ? haveY(y) : haveValue(something); +} + +var value = Math.random() > 0.5 ? 'hey!' : undefined; + +var result = destructure(value, text => 'string', y => 'other one'); // text: string, y: Y + +// Repro from #4212 + +function isVoid(value: void | a): value is void { + return undefined; +} + +function isNonVoid(value: void | a) : value is a { + return undefined; +} + +function foo1(value: void|a): void { + if (isVoid(value)) { + value; // value is void + } else { + value; // value is a + } +} + +function baz1(value: void|a): void { + if (isNonVoid(value)) { + value; // value is a + } else { + value; // value is void + } +} + +// Repro from #5417 + +type Maybe = T | void; + +function get(x: U | void): U { + return null; // just an example +} + +let foo: Maybe; +get(foo).toUpperCase(); // Ok + +// Repro from #5456 + +interface Man { + walks: boolean; +} + +interface Bear { + roars: boolean; +} + +interface Pig { + oinks: boolean; +} + +declare function pigify(y: T & Bear): T & Pig; +declare var mbp: Man & Bear; + +pigify(mbp).oinks; // OK, mbp is treated as Pig +pigify(mbp).walks; // Ok, mbp is treated as Man diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts new file mode 100644 index 0000000000000..1b6a928ce028c --- /dev/null +++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts @@ -0,0 +1,23 @@ +declare function f1(x: T | string): T; + +var a1: string; +var b1: string | string[]; +var c1: string[] | string; +var d1: string | { name: string }; +var e1: number | string | boolean; +f1(a1); // string +f1(b1); // string[] +f1(c1); // string[] +f1(d1); // { name: string } +f1(e1); // number | boolean + +declare function f2(x: T & { name: string }): T; + +var a2: string & { name: string }; +var b2: { name: string } & string[]; +var c2: string & { name: string } & number; +var d2: string & { name: string } & number & { name: string }; +f2(a2); // string +f2(b2); // string[] +f2(c2); // string & number +f2(d2); // string & number From 11f4e3c3301052bd3aa8db092782c173ac72ac0d Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Nov 2015 10:08:32 -0800 Subject: [PATCH 292/353] Accepting new baselines --- .../unionAndIntersectionInference1.js | 113 +++++++++ .../unionAndIntersectionInference1.symbols | 202 ++++++++++++++++ .../unionAndIntersectionInference1.types | 226 ++++++++++++++++++ .../unionAndIntersectionInference2.js | 45 ++++ .../unionAndIntersectionInference2.symbols | 85 +++++++ .../unionAndIntersectionInference2.types | 94 ++++++++ 6 files changed, 765 insertions(+) create mode 100644 tests/baselines/reference/unionAndIntersectionInference1.js create mode 100644 tests/baselines/reference/unionAndIntersectionInference1.symbols create mode 100644 tests/baselines/reference/unionAndIntersectionInference1.types create mode 100644 tests/baselines/reference/unionAndIntersectionInference2.js create mode 100644 tests/baselines/reference/unionAndIntersectionInference2.symbols create mode 100644 tests/baselines/reference/unionAndIntersectionInference2.types diff --git a/tests/baselines/reference/unionAndIntersectionInference1.js b/tests/baselines/reference/unionAndIntersectionInference1.js new file mode 100644 index 0000000000000..235eb23ebf847 --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference1.js @@ -0,0 +1,113 @@ +//// [unionAndIntersectionInference1.ts] +// Repro from #2264 + +interface Y { 'i am a very certain type': Y } +var y: Y = undefined; +function destructure( + something: a | Y, + haveValue: (value: a) => r, + haveY: (value: Y) => r +): r { + return something === y ? haveY(y) : haveValue(something); +} + +var value = Math.random() > 0.5 ? 'hey!' : undefined; + +var result = destructure(value, text => 'string', y => 'other one'); // text: string, y: Y + +// Repro from #4212 + +function isVoid(value: void | a): value is void { + return undefined; +} + +function isNonVoid(value: void | a) : value is a { + return undefined; +} + +function foo1(value: void|a): void { + if (isVoid(value)) { + value; // value is void + } else { + value; // value is a + } +} + +function baz1(value: void|a): void { + if (isNonVoid(value)) { + value; // value is a + } else { + value; // value is void + } +} + +// Repro from #5417 + +type Maybe = T | void; + +function get(x: U | void): U { + return null; // just an example +} + +let foo: Maybe; +get(foo).toUpperCase(); // Ok + +// Repro from #5456 + +interface Man { + walks: boolean; +} + +interface Bear { + roars: boolean; +} + +interface Pig { + oinks: boolean; +} + +declare function pigify(y: T & Bear): T & Pig; +declare var mbp: Man & Bear; + +pigify(mbp).oinks; // OK, mbp is treated as Pig +pigify(mbp).walks; // Ok, mbp is treated as Man + + +//// [unionAndIntersectionInference1.js] +// Repro from #2264 +var y = undefined; +function destructure(something, haveValue, haveY) { + return something === y ? haveY(y) : haveValue(something); +} +var value = Math.random() > 0.5 ? 'hey!' : undefined; +var result = destructure(value, function (text) { return 'string'; }, function (y) { return 'other one'; }); // text: string, y: Y +// Repro from #4212 +function isVoid(value) { + return undefined; +} +function isNonVoid(value) { + return undefined; +} +function foo1(value) { + if (isVoid(value)) { + value; // value is void + } + else { + value; // value is a + } +} +function baz1(value) { + if (isNonVoid(value)) { + value; // value is a + } + else { + value; // value is void + } +} +function get(x) { + return null; // just an example +} +var foo; +get(foo).toUpperCase(); // Ok +pigify(mbp).oinks; // OK, mbp is treated as Pig +pigify(mbp).walks; // Ok, mbp is treated as Man diff --git a/tests/baselines/reference/unionAndIntersectionInference1.symbols b/tests/baselines/reference/unionAndIntersectionInference1.symbols new file mode 100644 index 0000000000000..5e96790ea3470 --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference1.symbols @@ -0,0 +1,202 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts === +// Repro from #2264 + +interface Y { 'i am a very certain type': Y } +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) + +var y: Y = undefined; +>y : Symbol(y, Decl(unionAndIntersectionInference1.ts, 3, 3)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>undefined : Symbol(undefined) + +function destructure( +>destructure : Symbol(destructure, Decl(unionAndIntersectionInference1.ts, 3, 24)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 4, 21)) +>r : Symbol(r, Decl(unionAndIntersectionInference1.ts, 4, 23)) + + something: a | Y, +>something : Symbol(something, Decl(unionAndIntersectionInference1.ts, 4, 27)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 4, 21)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) + + haveValue: (value: a) => r, +>haveValue : Symbol(haveValue, Decl(unionAndIntersectionInference1.ts, 5, 21)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 6, 16)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 4, 21)) +>r : Symbol(r, Decl(unionAndIntersectionInference1.ts, 4, 23)) + + haveY: (value: Y) => r +>haveY : Symbol(haveY, Decl(unionAndIntersectionInference1.ts, 6, 31)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 7, 12)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>r : Symbol(r, Decl(unionAndIntersectionInference1.ts, 4, 23)) + +): r { +>r : Symbol(r, Decl(unionAndIntersectionInference1.ts, 4, 23)) + + return something === y ? haveY(y) : haveValue(something); +>something : Symbol(something, Decl(unionAndIntersectionInference1.ts, 4, 27)) +>y : Symbol(y, Decl(unionAndIntersectionInference1.ts, 3, 3)) +>haveY : Symbol(haveY, Decl(unionAndIntersectionInference1.ts, 6, 31)) +>y : Symbol(y, Decl(unionAndIntersectionInference1.ts, 3, 3)) +>haveValue : Symbol(haveValue, Decl(unionAndIntersectionInference1.ts, 5, 21)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 4, 21)) +>something : Symbol(something, Decl(unionAndIntersectionInference1.ts, 4, 27)) +} + +var value = Math.random() > 0.5 ? 'hey!' : undefined; +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 12, 3)) +>Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --)) +>Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>random : Symbol(Math.random, Decl(lib.d.ts, --, --)) +>Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>undefined : Symbol(undefined) + +var result = destructure(value, text => 'string', y => 'other one'); // text: string, y: Y +>result : Symbol(result, Decl(unionAndIntersectionInference1.ts, 14, 3)) +>destructure : Symbol(destructure, Decl(unionAndIntersectionInference1.ts, 3, 24)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 12, 3)) +>text : Symbol(text, Decl(unionAndIntersectionInference1.ts, 14, 31)) +>y : Symbol(y, Decl(unionAndIntersectionInference1.ts, 14, 49)) + +// Repro from #4212 + +function isVoid(value: void | a): value is void { +>isVoid : Symbol(isVoid, Decl(unionAndIntersectionInference1.ts, 14, 68)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 18, 16)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 18, 19)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 18, 16)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 18, 19)) + + return undefined; +>undefined : Symbol(undefined) +} + +function isNonVoid(value: void | a) : value is a { +>isNonVoid : Symbol(isNonVoid, Decl(unionAndIntersectionInference1.ts, 20, 1)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 22, 19)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 22, 22)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 22, 19)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 22, 22)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 22, 19)) + + return undefined; +>undefined : Symbol(undefined) +} + +function foo1(value: void|a): void { +>foo1 : Symbol(foo1, Decl(unionAndIntersectionInference1.ts, 24, 1)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 26, 14)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 26, 17)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 26, 14)) + + if (isVoid(value)) { +>isVoid : Symbol(isVoid, Decl(unionAndIntersectionInference1.ts, 14, 68)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 26, 17)) + + value; // value is void +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 26, 17)) + + } else { + value; // value is a +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 26, 17)) + } +} + +function baz1(value: void|a): void { +>baz1 : Symbol(baz1, Decl(unionAndIntersectionInference1.ts, 32, 1)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 34, 14)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 34, 17)) +>a : Symbol(a, Decl(unionAndIntersectionInference1.ts, 34, 14)) + + if (isNonVoid(value)) { +>isNonVoid : Symbol(isNonVoid, Decl(unionAndIntersectionInference1.ts, 20, 1)) +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 34, 17)) + + value; // value is a +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 34, 17)) + + } else { + value; // value is void +>value : Symbol(value, Decl(unionAndIntersectionInference1.ts, 34, 17)) + } +} + +// Repro from #5417 + +type Maybe = T | void; +>Maybe : Symbol(Maybe, Decl(unionAndIntersectionInference1.ts, 40, 1)) +>T : Symbol(T, Decl(unionAndIntersectionInference1.ts, 44, 11)) +>T : Symbol(T, Decl(unionAndIntersectionInference1.ts, 44, 11)) + +function get(x: U | void): U { +>get : Symbol(get, Decl(unionAndIntersectionInference1.ts, 44, 25)) +>U : Symbol(U, Decl(unionAndIntersectionInference1.ts, 46, 13)) +>x : Symbol(x, Decl(unionAndIntersectionInference1.ts, 46, 16)) +>U : Symbol(U, Decl(unionAndIntersectionInference1.ts, 46, 13)) +>U : Symbol(U, Decl(unionAndIntersectionInference1.ts, 46, 13)) + + return null; // just an example +} + +let foo: Maybe; +>foo : Symbol(foo, Decl(unionAndIntersectionInference1.ts, 50, 3)) +>Maybe : Symbol(Maybe, Decl(unionAndIntersectionInference1.ts, 40, 1)) + +get(foo).toUpperCase(); // Ok +>get(foo).toUpperCase : Symbol(String.toUpperCase, Decl(lib.d.ts, --, --)) +>get : Symbol(get, Decl(unionAndIntersectionInference1.ts, 44, 25)) +>foo : Symbol(foo, Decl(unionAndIntersectionInference1.ts, 50, 3)) +>toUpperCase : Symbol(String.toUpperCase, Decl(lib.d.ts, --, --)) + +// Repro from #5456 + +interface Man { +>Man : Symbol(Man, Decl(unionAndIntersectionInference1.ts, 51, 23)) + + walks: boolean; +>walks : Symbol(walks, Decl(unionAndIntersectionInference1.ts, 55, 15)) +} + +interface Bear { +>Bear : Symbol(Bear, Decl(unionAndIntersectionInference1.ts, 57, 1)) + + roars: boolean; +>roars : Symbol(roars, Decl(unionAndIntersectionInference1.ts, 59, 16)) +} + +interface Pig { +>Pig : Symbol(Pig, Decl(unionAndIntersectionInference1.ts, 61, 1)) + + oinks: boolean; +>oinks : Symbol(oinks, Decl(unionAndIntersectionInference1.ts, 63, 15)) +} + +declare function pigify(y: T & Bear): T & Pig; +>pigify : Symbol(pigify, Decl(unionAndIntersectionInference1.ts, 65, 1)) +>T : Symbol(T, Decl(unionAndIntersectionInference1.ts, 67, 24)) +>y : Symbol(y, Decl(unionAndIntersectionInference1.ts, 67, 27)) +>T : Symbol(T, Decl(unionAndIntersectionInference1.ts, 67, 24)) +>Bear : Symbol(Bear, Decl(unionAndIntersectionInference1.ts, 57, 1)) +>T : Symbol(T, Decl(unionAndIntersectionInference1.ts, 67, 24)) +>Pig : Symbol(Pig, Decl(unionAndIntersectionInference1.ts, 61, 1)) + +declare var mbp: Man & Bear; +>mbp : Symbol(mbp, Decl(unionAndIntersectionInference1.ts, 68, 11)) +>Man : Symbol(Man, Decl(unionAndIntersectionInference1.ts, 51, 23)) +>Bear : Symbol(Bear, Decl(unionAndIntersectionInference1.ts, 57, 1)) + +pigify(mbp).oinks; // OK, mbp is treated as Pig +>pigify(mbp).oinks : Symbol(Pig.oinks, Decl(unionAndIntersectionInference1.ts, 63, 15)) +>pigify : Symbol(pigify, Decl(unionAndIntersectionInference1.ts, 65, 1)) +>mbp : Symbol(mbp, Decl(unionAndIntersectionInference1.ts, 68, 11)) +>oinks : Symbol(Pig.oinks, Decl(unionAndIntersectionInference1.ts, 63, 15)) + +pigify(mbp).walks; // Ok, mbp is treated as Man +>pigify(mbp).walks : Symbol(Man.walks, Decl(unionAndIntersectionInference1.ts, 55, 15)) +>pigify : Symbol(pigify, Decl(unionAndIntersectionInference1.ts, 65, 1)) +>mbp : Symbol(mbp, Decl(unionAndIntersectionInference1.ts, 68, 11)) +>walks : Symbol(Man.walks, Decl(unionAndIntersectionInference1.ts, 55, 15)) + diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types new file mode 100644 index 0000000000000..5d23688f0b7c3 --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference1.types @@ -0,0 +1,226 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference1.ts === +// Repro from #2264 + +interface Y { 'i am a very certain type': Y } +>Y : Y +>Y : Y + +var y: Y = undefined; +>y : Y +>Y : Y +>undefined : Y +>Y : Y +>undefined : undefined + +function destructure( +>destructure : (something: a | Y, haveValue: (value: a) => r, haveY: (value: Y) => r) => r +>a : a +>r : r + + something: a | Y, +>something : a | Y +>a : a +>Y : Y + + haveValue: (value: a) => r, +>haveValue : (value: a) => r +>value : a +>a : a +>r : r + + haveY: (value: Y) => r +>haveY : (value: Y) => r +>value : Y +>Y : Y +>r : r + +): r { +>r : r + + return something === y ? haveY(y) : haveValue(something); +>something === y ? haveY(y) : haveValue(something) : r +>something === y : boolean +>something : a | Y +>y : Y +>haveY(y) : r +>haveY : (value: Y) => r +>y : Y +>haveValue(something) : r +>haveValue : (value: a) => r +>something : a +>a : a +>something : a | Y +} + +var value = Math.random() > 0.5 ? 'hey!' : undefined; +>value : string | Y +>Math.random() > 0.5 ? 'hey!' : undefined : string | Y +>Math.random() > 0.5 : boolean +>Math.random() : number +>Math.random : () => number +>Math : Math +>random : () => number +>0.5 : number +>'hey!' : string +>undefined : Y +>Y : Y +>undefined : undefined + +var result = destructure(value, text => 'string', y => 'other one'); // text: string, y: Y +>result : string +>destructure(value, text => 'string', y => 'other one') : string +>destructure : (something: a | Y, haveValue: (value: a) => r, haveY: (value: Y) => r) => r +>value : string | Y +>text => 'string' : (text: string) => string +>text : string +>'string' : string +>y => 'other one' : (y: Y) => string +>y : Y +>'other one' : string + +// Repro from #4212 + +function isVoid(value: void | a): value is void { +>isVoid : (value: void | a) => value is void +>a : a +>value : void | a +>a : a +>value : any + + return undefined; +>undefined : undefined +} + +function isNonVoid(value: void | a) : value is a { +>isNonVoid : (value: void | a) => value is a +>a : a +>value : void | a +>a : a +>value : any +>a : a + + return undefined; +>undefined : undefined +} + +function foo1(value: void|a): void { +>foo1 : (value: void | a) => void +>a : a +>value : void | a +>a : a + + if (isVoid(value)) { +>isVoid(value) : boolean +>isVoid : (value: void | a) => value is void +>value : void | a + + value; // value is void +>value : void + + } else { + value; // value is a +>value : a + } +} + +function baz1(value: void|a): void { +>baz1 : (value: void | a) => void +>a : a +>value : void | a +>a : a + + if (isNonVoid(value)) { +>isNonVoid(value) : boolean +>isNonVoid : (value: void | a) => value is a +>value : void | a + + value; // value is a +>value : a + + } else { + value; // value is void +>value : void + } +} + +// Repro from #5417 + +type Maybe = T | void; +>Maybe : T | void +>T : T +>T : T + +function get(x: U | void): U { +>get : (x: U | void) => U +>U : U +>x : U | void +>U : U +>U : U + + return null; // just an example +>null : null +} + +let foo: Maybe; +>foo : string | void +>Maybe : T | void + +get(foo).toUpperCase(); // Ok +>get(foo).toUpperCase() : string +>get(foo).toUpperCase : () => string +>get(foo) : string +>get : (x: U | void) => U +>foo : string | void +>toUpperCase : () => string + +// Repro from #5456 + +interface Man { +>Man : Man + + walks: boolean; +>walks : boolean +} + +interface Bear { +>Bear : Bear + + roars: boolean; +>roars : boolean +} + +interface Pig { +>Pig : Pig + + oinks: boolean; +>oinks : boolean +} + +declare function pigify(y: T & Bear): T & Pig; +>pigify : (y: T & Bear) => T & Pig +>T : T +>y : T & Bear +>T : T +>Bear : Bear +>T : T +>Pig : Pig + +declare var mbp: Man & Bear; +>mbp : Man & Bear +>Man : Man +>Bear : Bear + +pigify(mbp).oinks; // OK, mbp is treated as Pig +>pigify(mbp).oinks : boolean +>pigify(mbp) : Man & Pig +>pigify : (y: T & Bear) => T & Pig +>mbp : Man & Bear +>oinks : boolean + +pigify(mbp).walks; // Ok, mbp is treated as Man +>pigify(mbp).walks : boolean +>pigify(mbp) : Man & Pig +>pigify : (y: T & Bear) => T & Pig +>mbp : Man & Bear +>walks : boolean + diff --git a/tests/baselines/reference/unionAndIntersectionInference2.js b/tests/baselines/reference/unionAndIntersectionInference2.js new file mode 100644 index 0000000000000..18f08452a2ef5 --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference2.js @@ -0,0 +1,45 @@ +//// [unionAndIntersectionInference2.ts] +declare function f1(x: T | string): T; + +var a1: string; +var b1: string | string[]; +var c1: string[] | string; +var d1: string | { name: string }; +var e1: number | string | boolean; +f1(a1); // string +f1(b1); // string[] +f1(c1); // string[] +f1(d1); // { name: string } +f1(e1); // number | boolean + +declare function f2(x: T & { name: string }): T; + +var a2: string & { name: string }; +var b2: { name: string } & string[]; +var c2: string & { name: string } & number; +var d2: string & { name: string } & number & { name: string }; +f2(a2); // string +f2(b2); // string[] +f2(c2); // string & number +f2(d2); // string & number + + +//// [unionAndIntersectionInference2.js] +var a1; +var b1; +var c1; +var d1; +var e1; +f1(a1); // string +f1(b1); // string[] +f1(c1); // string[] +f1(d1); // { name: string } +f1(e1); // number | boolean +var a2; +var b2; +var c2; +var d2; +f2(a2); // string +f2(b2); // string[] +f2(c2); // string & number +f2(d2); // string & number diff --git a/tests/baselines/reference/unionAndIntersectionInference2.symbols b/tests/baselines/reference/unionAndIntersectionInference2.symbols new file mode 100644 index 0000000000000..24b1a36aa45e6 --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference2.symbols @@ -0,0 +1,85 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts === +declare function f1(x: T | string): T; +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 0, 20)) +>x : Symbol(x, Decl(unionAndIntersectionInference2.ts, 0, 23)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 0, 20)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 0, 20)) + +var a1: string; +>a1 : Symbol(a1, Decl(unionAndIntersectionInference2.ts, 2, 3)) + +var b1: string | string[]; +>b1 : Symbol(b1, Decl(unionAndIntersectionInference2.ts, 3, 3)) + +var c1: string[] | string; +>c1 : Symbol(c1, Decl(unionAndIntersectionInference2.ts, 4, 3)) + +var d1: string | { name: string }; +>d1 : Symbol(d1, Decl(unionAndIntersectionInference2.ts, 5, 3)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 5, 18)) + +var e1: number | string | boolean; +>e1 : Symbol(e1, Decl(unionAndIntersectionInference2.ts, 6, 3)) + +f1(a1); // string +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>a1 : Symbol(a1, Decl(unionAndIntersectionInference2.ts, 2, 3)) + +f1(b1); // string[] +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>b1 : Symbol(b1, Decl(unionAndIntersectionInference2.ts, 3, 3)) + +f1(c1); // string[] +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>c1 : Symbol(c1, Decl(unionAndIntersectionInference2.ts, 4, 3)) + +f1(d1); // { name: string } +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>d1 : Symbol(d1, Decl(unionAndIntersectionInference2.ts, 5, 3)) + +f1(e1); // number | boolean +>f1 : Symbol(f1, Decl(unionAndIntersectionInference2.ts, 0, 0)) +>e1 : Symbol(e1, Decl(unionAndIntersectionInference2.ts, 6, 3)) + +declare function f2(x: T & { name: string }): T; +>f2 : Symbol(f2, Decl(unionAndIntersectionInference2.ts, 11, 7)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 13, 20)) +>x : Symbol(x, Decl(unionAndIntersectionInference2.ts, 13, 23)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 13, 20)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 13, 31)) +>T : Symbol(T, Decl(unionAndIntersectionInference2.ts, 13, 20)) + +var a2: string & { name: string }; +>a2 : Symbol(a2, Decl(unionAndIntersectionInference2.ts, 15, 3)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 15, 18)) + +var b2: { name: string } & string[]; +>b2 : Symbol(b2, Decl(unionAndIntersectionInference2.ts, 16, 3)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 16, 9)) + +var c2: string & { name: string } & number; +>c2 : Symbol(c2, Decl(unionAndIntersectionInference2.ts, 17, 3)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 17, 18)) + +var d2: string & { name: string } & number & { name: string }; +>d2 : Symbol(d2, Decl(unionAndIntersectionInference2.ts, 18, 3)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 18, 18)) +>name : Symbol(name, Decl(unionAndIntersectionInference2.ts, 18, 46)) + +f2(a2); // string +>f2 : Symbol(f2, Decl(unionAndIntersectionInference2.ts, 11, 7)) +>a2 : Symbol(a2, Decl(unionAndIntersectionInference2.ts, 15, 3)) + +f2(b2); // string[] +>f2 : Symbol(f2, Decl(unionAndIntersectionInference2.ts, 11, 7)) +>b2 : Symbol(b2, Decl(unionAndIntersectionInference2.ts, 16, 3)) + +f2(c2); // string & number +>f2 : Symbol(f2, Decl(unionAndIntersectionInference2.ts, 11, 7)) +>c2 : Symbol(c2, Decl(unionAndIntersectionInference2.ts, 17, 3)) + +f2(d2); // string & number +>f2 : Symbol(f2, Decl(unionAndIntersectionInference2.ts, 11, 7)) +>d2 : Symbol(d2, Decl(unionAndIntersectionInference2.ts, 18, 3)) + diff --git a/tests/baselines/reference/unionAndIntersectionInference2.types b/tests/baselines/reference/unionAndIntersectionInference2.types new file mode 100644 index 0000000000000..beeb2a261f3ec --- /dev/null +++ b/tests/baselines/reference/unionAndIntersectionInference2.types @@ -0,0 +1,94 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts === +declare function f1(x: T | string): T; +>f1 : (x: T | string) => T +>T : T +>x : T | string +>T : T +>T : T + +var a1: string; +>a1 : string + +var b1: string | string[]; +>b1 : string | string[] + +var c1: string[] | string; +>c1 : string[] | string + +var d1: string | { name: string }; +>d1 : string | { name: string; } +>name : string + +var e1: number | string | boolean; +>e1 : number | string | boolean + +f1(a1); // string +>f1(a1) : string +>f1 : (x: T | string) => T +>a1 : string + +f1(b1); // string[] +>f1(b1) : string[] +>f1 : (x: T | string) => T +>b1 : string | string[] + +f1(c1); // string[] +>f1(c1) : string[] +>f1 : (x: T | string) => T +>c1 : string[] | string + +f1(d1); // { name: string } +>f1(d1) : { name: string; } +>f1 : (x: T | string) => T +>d1 : string | { name: string; } + +f1(e1); // number | boolean +>f1(e1) : number | boolean +>f1 : (x: T | string) => T +>e1 : number | string | boolean + +declare function f2(x: T & { name: string }): T; +>f2 : (x: T & { name: string; }) => T +>T : T +>x : T & { name: string; } +>T : T +>name : string +>T : T + +var a2: string & { name: string }; +>a2 : string & { name: string; } +>name : string + +var b2: { name: string } & string[]; +>b2 : { name: string; } & string[] +>name : string + +var c2: string & { name: string } & number; +>c2 : string & { name: string; } & number +>name : string + +var d2: string & { name: string } & number & { name: string }; +>d2 : string & { name: string; } & number & { name: string; } +>name : string +>name : string + +f2(a2); // string +>f2(a2) : string +>f2 : (x: T & { name: string; }) => T +>a2 : string & { name: string; } + +f2(b2); // string[] +>f2(b2) : string[] +>f2 : (x: T & { name: string; }) => T +>b2 : { name: string; } & string[] + +f2(c2); // string & number +>f2(c2) : string & number +>f2 : (x: T & { name: string; }) => T +>c2 : string & { name: string; } & number + +f2(d2); // string & number +>f2(d2) : string & number +>f2 : (x: T & { name: string; }) => T +>d2 : string & { name: string; } & number & { name: string; } + From 0ee4e0b10dd964ec97ebd8434195e436f4021dd7 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Fri, 20 Nov 2015 10:13:01 -0800 Subject: [PATCH 293/353] Modified cloneNode to ignore own properties of clone. --- src/compiler/utilities.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 040877394cc6a..28faf0c2fdabc 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1597,7 +1597,7 @@ namespace ts { : createSynthesizedNode(node.kind); for (const key in node) { - if (isExcludedPropertyForClone(key) || !node.hasOwnProperty(key)) { + if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) { continue; } @@ -1615,13 +1615,6 @@ namespace ts { return clone; } - function isExcludedPropertyForClone(property: string) { - return property === "pos" - || property === "end" - || property === "flags" - || property === "parent"; - } - /** * Creates a deep clone of an EntityName, with new parent pointers. * @param node The EntityName to clone. From 4edf330217375c90161b83fda8f2c53f350ff7fc Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Fri, 20 Nov 2015 10:30:47 -0800 Subject: [PATCH 294/353] Minor comment update --- src/compiler/utilities.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 28faf0c2fdabc..1884cee15161d 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1581,8 +1581,9 @@ namespace ts { } /** - * Creates a shallow, memberwise clone of a node. The "pos", "end", "flags", and "parent" properties - * are excluded by default, and can be provided via the "location", "flags", and "parent" parameters. + * Creates a shallow, memberwise clone of a node. The "kind", "pos", "end", "flags", and "parent" + * properties are excluded by default, and can be provided via the "location", "flags", and + * "parent" parameters. * @param node The node to clone. * @param location An optional TextRange to use to supply the new position. * @param flags The NodeFlags to use for the cloned node. From 71b98e0615b1b9c216235bc24f848e5410950418 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 20 Nov 2015 10:56:17 -0800 Subject: [PATCH 295/353] apply 'noImplicitReturns' check for functions that don't have type annotations --- src/compiler/checker.ts | 44 ++-- .../reference/reachabilityChecks6.errors.txt | 162 ++++++++++++ .../reference/reachabilityChecks6.js | 247 ++++++++++++++++++ tests/cases/compiler/reachabilityChecks6.ts | 131 ++++++++++ 4 files changed, 561 insertions(+), 23 deletions(-) create mode 100644 tests/baselines/reference/reachabilityChecks6.errors.txt create mode 100644 tests/baselines/reference/reachabilityChecks6.js create mode 100644 tests/cases/compiler/reachabilityChecks6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1b6b31f958697..53e9cc720ce40 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9815,13 +9815,19 @@ namespace ts { // An explicitly typed function whose return type isn't the Void or the Any type // must have at least one return statement somewhere in its body. // An exception to this rule is if the function implementation consists of a single 'throw' statement. + // @param returnType - return type of the function, can be undefined if return type is not explicitly specified function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func: FunctionLikeDeclaration, returnType: Type): void { if (!produceDiagnostics) { return; } - // Functions that return 'void' or 'any' don't need any return expressions. - if (returnType === voidType || isTypeAny(returnType)) { + // Functions with explicitly specified return type which is either 'void' or 'any' 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) { return; } @@ -9831,13 +9837,14 @@ namespace ts { return; } - if (func.flags & NodeFlags.HasExplicitReturn) { + if (!returnType || func.flags & NodeFlags.HasExplicitReturn) { if (compilerOptions.noImplicitReturns) { - error(func.type, Diagnostics.Not_all_code_paths_return_a_value); + error(func.type || func, Diagnostics.Not_all_code_paths_return_a_value); } } else { // 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); } } @@ -9912,14 +9919,10 @@ namespace ts { emitAwaiter = true; } - const returnType = node.type && getTypeFromTypeNode(node.type); - let promisedType: Type; - if (returnType && isAsync) { - promisedType = checkAsyncFunctionReturnType(node); - } - - if (returnType && !node.asteriskToken) { - checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType); + const returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type)); + if (!node.asteriskToken) { + // return is not necessary in the body of generators + checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType); } if (node.body) { @@ -9942,13 +9945,13 @@ namespace ts { // check assignability of the awaited type of the expression body against the promised type of // its return type annotation. const exprType = checkExpression(node.body); - if (returnType) { + if (returnOrPromisedType) { if (isAsync) { const awaitedType = checkAwaitedType(exprType, node.body, Diagnostics.Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member); - checkTypeAssignableTo(awaitedType, promisedType, node.body); + checkTypeAssignableTo(awaitedType, returnOrPromisedType, node.body); } else { - checkTypeAssignableTo(exprType, returnType, node.body); + checkTypeAssignableTo(exprType, returnOrPromisedType, node.body); } } @@ -12088,14 +12091,9 @@ namespace ts { } checkSourceElement(node.body); - if (node.type && !isAccessor(node.kind) && !node.asteriskToken) { - const returnType = getTypeFromTypeNode(node.type); - let promisedType: Type; - if (isAsync) { - promisedType = checkAsyncFunctionReturnType(node); - } - - checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, isAsync ? promisedType : returnType); + if (!isAccessor(node.kind) && !node.asteriskToken) { + const returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type)); + checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType); } if (produceDiagnostics && !node.type) { diff --git a/tests/baselines/reference/reachabilityChecks6.errors.txt b/tests/baselines/reference/reachabilityChecks6.errors.txt new file mode 100644 index 0000000000000..5b78891afb381 --- /dev/null +++ b/tests/baselines/reference/reachabilityChecks6.errors.txt @@ -0,0 +1,162 @@ +tests/cases/compiler/reachabilityChecks6.ts(6,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(19,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(31,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(41,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(52,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(80,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(86,13): error TS7027: Unreachable code detected. +tests/cases/compiler/reachabilityChecks6.ts(94,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(116,10): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks6.ts(123,13): error TS7027: Unreachable code detected. + + +==== tests/cases/compiler/reachabilityChecks6.ts (10 errors) ==== + + function f0(x) { + while (true); + } + + function f1(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + if (x) { + return 1 + } + } + + function f2(x) { + while (x) { + throw new Error(); + } + return 1; + } + + function f3(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + while (x) { + throw new Error(); + } + } + + function f3_1 (x) { + while (x) { + } + throw new Error(); + } + + function f4(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + try { + if (x) { + return 1; + } + } + catch (e) { + } + } + + function f5(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + try { + if (x) { + return 1; + } + } + catch (e) { + return 2; + } + } + + function f6(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + try { + if (x) { + return 1; + } + else + { + throw new Error(); + } + } + catch (e) { + } + } + + function f7(x) { + try { + if (x) { + return 1; + } + else { + throw new Error(); + } + } + catch (e) { + return 1; + } + } + + function f8(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + try { + if (true) { + x++; + } + else { + return 1; + ~~~~~~ +!!! error TS7027: Unreachable code detected. + } + } + catch (e) { + return 1; + } + } + + function f9(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + try { + while (false) { + return 1; + } + } + catch (e) { + return 1; + } + } + + function f10(x) { + try { + do { + x++; + } while (true); + } + catch (e) { + return 1; + } + } + + function f11(x) { + ~~~ +!!! error TS7030: Not all code paths return a value. + test: + try { + do { + do { + break test; + } while (true); + x++; + ~ +!!! error TS7027: Unreachable code detected. + } while (true); + } + catch (e) { + return 1; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/reachabilityChecks6.js b/tests/baselines/reference/reachabilityChecks6.js new file mode 100644 index 0000000000000..9be23d32048ec --- /dev/null +++ b/tests/baselines/reference/reachabilityChecks6.js @@ -0,0 +1,247 @@ +//// [reachabilityChecks6.ts] + +function f0(x) { + while (true); +} + +function f1(x) { + if (x) { + return 1 + } +} + +function f2(x) { + while (x) { + throw new Error(); + } + return 1; +} + +function f3(x) { + while (x) { + throw new Error(); + } +} + +function f3_1 (x) { + while (x) { + } + throw new Error(); +} + +function f4(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + } +} + +function f5(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + return 2; + } +} + +function f6(x) { + try { + if (x) { + return 1; + } + else + { + throw new Error(); + } + } + catch (e) { + } +} + +function f7(x) { + try { + if (x) { + return 1; + } + else { + throw new Error(); + } + } + catch (e) { + return 1; + } +} + +function f8(x) { + try { + if (true) { + x++; + } + else { + return 1; + } + } + catch (e) { + return 1; + } +} + +function f9(x) { + try { + while (false) { + return 1; + } + } + catch (e) { + return 1; + } +} + +function f10(x) { + try { + do { + x++; + } while (true); + } + catch (e) { + return 1; + } +} + +function f11(x) { + test: + try { + do { + do { + break test; + } while (true); + x++; + } while (true); + } + catch (e) { + return 1; + } +} + +//// [reachabilityChecks6.js] +function f0(x) { + while (true) + ; +} +function f1(x) { + if (x) { + return 1; + } +} +function f2(x) { + while (x) { + throw new Error(); + } + return 1; +} +function f3(x) { + while (x) { + throw new Error(); + } +} +function f3_1(x) { + while (x) { + } + throw new Error(); +} +function f4(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + } +} +function f5(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + return 2; + } +} +function f6(x) { + try { + if (x) { + return 1; + } + else { + throw new Error(); + } + } + catch (e) { + } +} +function f7(x) { + try { + if (x) { + return 1; + } + else { + throw new Error(); + } + } + catch (e) { + return 1; + } +} +function f8(x) { + try { + if (true) { + x++; + } + else { + return 1; + } + } + catch (e) { + return 1; + } +} +function f9(x) { + try { + while (false) { + return 1; + } + } + catch (e) { + return 1; + } +} +function f10(x) { + try { + do { + x++; + } while (true); + } + catch (e) { + return 1; + } +} +function f11(x) { + test: try { + do { + do { + break test; + } while (true); + x++; + } while (true); + } + catch (e) { + return 1; + } +} diff --git a/tests/cases/compiler/reachabilityChecks6.ts b/tests/cases/compiler/reachabilityChecks6.ts new file mode 100644 index 0000000000000..725563a44885a --- /dev/null +++ b/tests/cases/compiler/reachabilityChecks6.ts @@ -0,0 +1,131 @@ +// @allowUnreachableCode: false +// @noImplicitReturns: true + +function f0(x) { + while (true); +} + +function f1(x) { + if (x) { + return 1 + } +} + +function f2(x) { + while (x) { + throw new Error(); + } + return 1; +} + +function f3(x) { + while (x) { + throw new Error(); + } +} + +function f3_1 (x) { + while (x) { + } + throw new Error(); +} + +function f4(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + } +} + +function f5(x) { + try { + if (x) { + return 1; + } + } + catch (e) { + return 2; + } +} + +function f6(x) { + try { + if (x) { + return 1; + } + else + { + throw new Error(); + } + } + catch (e) { + } +} + +function f7(x) { + try { + if (x) { + return 1; + } + else { + throw new Error(); + } + } + catch (e) { + return 1; + } +} + +function f8(x) { + try { + if (true) { + x++; + } + else { + return 1; + } + } + catch (e) { + return 1; + } +} + +function f9(x) { + try { + while (false) { + return 1; + } + } + catch (e) { + return 1; + } +} + +function f10(x) { + try { + do { + x++; + } while (true); + } + catch (e) { + return 1; + } +} + +function f11(x) { + test: + try { + do { + do { + break test; + } while (true); + x++; + } while (true); + } + catch (e) { + return 1; + } +} \ No newline at end of file From fb83ee0a3036687115f505d621a8022eaca95e07 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 20 Nov 2015 10:59:13 -0800 Subject: [PATCH 296/353] WIP --- src/compiler/binder.ts | 20 ++++--- src/compiler/checker.ts | 5 +- src/compiler/utilities.ts | 58 ------------------- tests/cases/fourslash/javaScriptPrototype4.ts | 1 - 4 files changed, 16 insertions(+), 68 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 9bd51f0c7633b..f91cf10774946 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -635,7 +635,6 @@ namespace ts { function bindAnonymousDeclaration(node: Declaration, symbolFlags: SymbolFlags, name: string) { let symbol = createSymbol(symbolFlags, name); addDeclarationToSymbol(symbol, node, symbolFlags); - return symbol; } function bindBlockScopedDeclaration(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) { @@ -889,6 +888,11 @@ namespace ts { case SpecialPropertyAssignmentKind.ThisProperty: bindThisPropertyAssignment(node); break; + case SpecialPropertyAssignmentKind.None: + // Nothing to do + break; + default: + Debug.fail("Unknown special property assignment kind"); } } return checkStrictModeBinaryExpression(node); @@ -1080,19 +1084,19 @@ namespace ts { // The function is now a constructor rather than a normal function if (!funcSymbol.inferredConstructor) { + // Have the binder set up all the related class symbols for us declareSymbol(container.locals, funcSymbol, funcSymbol.valueDeclaration, SymbolFlags.Class, SymbolFlags.None); - // funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; - funcSymbol.members = funcSymbol.members || {}; + // funcSymbol.members = funcSymbol.members || {}; funcSymbol.members["__constructor"] = funcSymbol; funcSymbol.inferredConstructor = true; } - // Declare the 'prototype' member of the function - let prototypeSymbol = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + // Get the exports of the class so we can add the method to it + let funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); - // Declare the property on the prototype symbol - declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); - // and on the class type + // Declare the method + declareSymbol(funcExports.members, funcExports, node.left, SymbolFlags.Method, SymbolFlags.None); + // and on the members of the function so it appears in 'prototype' declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Method, SymbolFlags.PropertyExcludes); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fb7040a96ab16..18a878ae91be2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2577,9 +2577,11 @@ namespace ts { return links.type = checkExpression((declaration).right); } if (declaration.kind === SyntaxKind.PropertyAccessExpression) { + // Declarations only exist for property access expressions for certain + // special assignment kinds if (declaration.parent.kind === SyntaxKind.BinaryExpression) { // Handle exports.p = expr or this.p = expr or className.prototype.method = expr - return links.type = checkExpression((declaration.parent).right); + return links.type = checkExpressionCached((declaration.parent).right); } else { // Declaration for className.prototype in inferred JS class @@ -3860,6 +3862,7 @@ namespace ts { break; case SyntaxKind.PropertyAccessExpression: + // Inferred class method result = getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); break; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cb72e87bb9402..603f5a3d93c97 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1093,64 +1093,6 @@ namespace ts { return SpecialPropertyAssignmentKind.None; } - /** - * Returns true if the node is an assignment to a property on the identifier 'exports'. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isExportsPropertyAssignment(expression: Node): boolean { - // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary - return isInJavaScriptFile(expression) && - (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - ((expression).left.kind === SyntaxKind.PropertyAccessExpression) && - (((expression).left).expression.kind === SyntaxKind.Identifier) && - (((((expression).left).expression)).text === "exports"); - } - - /** - * Returns true if the node is an assignment to the property access expression 'module.exports'. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isModuleExportsAssignment(expression: Node): boolean { - // of the form 'module.exports = expr' where 'expr' is arbitrary - return isInJavaScriptFile(expression) && - (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - ((expression).left.kind === SyntaxKind.PropertyAccessExpression) && - (((expression).left).expression.kind === SyntaxKind.Identifier) && - (((((expression).left).expression)).text === "module") && - (((expression).left).name.text === "exports"); - } - - /** - * Returns true if this expression is an assignment to the given named property - */ - function isAssignmentToProperty(expression: Node, name?: string): expression is BinaryExpression { - return (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - isNamedPropertyAccess((expression).left, name); - } - - /** - * Returns true if this expression is a PropertyAccessExpression where the property name is the provided name - */ - function isNamedPropertyAccess(expression: Node, name?: string): expression is PropertyAccessExpression { - return expression.kind === SyntaxKind.PropertyAccessExpression && - (!name || (expression).name.text === name); - } - - /** - * Returns true if the node is an assignment in the form 'id1.prototype.id2 = expr' where id1 and id2 - * are any identifier. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isPrototypePropertyAssignment(expression: Node): expression is BinaryExpression { - return isAssignmentToProperty(expression) && - isNamedPropertyAccess(expression.left) && - isNamedPropertyAccess((expression.left).expression, "prototype") && - ((expression.left).expression).expression.kind === SyntaxKind.Identifier; - } - export function getExternalModuleName(node: Node): Expression { if (node.kind === SyntaxKind.ImportDeclaration) { return (node).moduleSpecifier; diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts index f78bf52438bdf..3ed723740b489 100644 --- a/tests/cases/fourslash/javaScriptPrototype4.ts +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -23,7 +23,6 @@ verify.completionListContains('qua', undefined, undefined, 'warning'); // Check members of function.prototype edit.insert('prototype.'); -debug.printMemberListMembers(); verify.completionListContains('foo', undefined, undefined, 'method'); verify.completionListContains('bar', undefined, undefined, 'method'); verify.completionListContains('qua', undefined, undefined, 'warning'); From 40a2a2584d9dd0638e02b560009ae0744c882192 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 20 Nov 2015 13:31:17 -0800 Subject: [PATCH 297/353] Fix object type literal regression --- src/compiler/diagnosticMessages.json | 2 +- src/compiler/parser.ts | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 03934153e4f3c..e5a5e832b4d6a 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -783,7 +783,7 @@ "category": "Error", "code": 1245 }, - "An interface property cannot have an initializer.": { + "An object type property cannot have an initializer.": { "category": "Error", "code": 1246 }, diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 3681906169666..0fb29f9d127f4 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2230,7 +2230,6 @@ namespace ts { const fullStart = scanner.getStartPos(); const name = parsePropertyName(); const questionToken = parseOptionalToken(SyntaxKind.QuestionToken); - const modifiers = parseModifiers(); if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { const method = createNode(SyntaxKind.MethodSignature, fullStart); @@ -2251,21 +2250,8 @@ namespace ts { // Although interfaces cannot not have initializers, we attempt to parse an initializer // so we can report that an interface cannot have an initializer. - // - // For instance properties specifically, since they are evaluated inside the constructor, - // we do *not * want to parse yield expressions, so we specifically turn the yield context - // off. The grammar would look something like this: - // - // MemberVariableDeclaration[Yield]: - // AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In]; - // AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield]; - // - // The checker may still error in the static case to explicitly disallow the yield expression. - const initializer = modifiers && modifiers.flags & NodeFlags.Static - ? allowInAnd(parseNonParameterInitializer) - : doOutsideOfContext(ParserContextFlags.Yield | ParserContextFlags.DisallowIn, parseNonParameterInitializer); - if (initializer !== undefined) { - parseErrorAtCurrentToken(Diagnostics.An_interface_property_cannot_have_an_initializer); + if (token === SyntaxKind.EqualsToken && lookAhead(() => parseNonParameterInitializer()) !== undefined) { + parseErrorAtCurrentToken(Diagnostics.An_object_type_property_cannot_have_an_initializer); } parseTypeMemberSemicolon(); From 5b3d299412a0f133269adeacbb5e84972c74e37d Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 20 Nov 2015 13:33:58 -0800 Subject: [PATCH 298/353] Clarify comment --- src/compiler/parser.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 0fb29f9d127f4..4a7ed6a7756c8 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2248,8 +2248,8 @@ namespace ts { property.questionToken = questionToken; property.type = parseTypeAnnotation(); - // Although interfaces cannot not have initializers, we attempt to parse an initializer - // so we can report that an interface cannot have an initializer. + // Although object type properties cannot not have initializers, we attempt to parse an initializer + // so we can report that an object type property cannot have an initializer. if (token === SyntaxKind.EqualsToken && lookAhead(() => parseNonParameterInitializer()) !== undefined) { parseErrorAtCurrentToken(Diagnostics.An_object_type_property_cannot_have_an_initializer); } From 02a9b11e0e1dbc5cf51e6c9d7fac9ebe42f1e249 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 20 Nov 2015 13:41:41 -0800 Subject: [PATCH 299/353] Accpet new baselines --- .../getEmitOutputSingleFile2.baseline | 2 +- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- ...ultifolderSpecifyOutputFile.dts.errors.txt | 41 ------------------- 10 files changed, 1 insertion(+), 370 deletions(-) delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.dts.errors.txt delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt diff --git a/tests/baselines/reference/getEmitOutputSingleFile2.baseline b/tests/baselines/reference/getEmitOutputSingleFile2.baseline index 3022dcf68d859..21e28eb7feb4a 100644 --- a/tests/baselines/reference/getEmitOutputSingleFile2.baseline +++ b/tests/baselines/reference/getEmitOutputSingleFile2.baseline @@ -23,7 +23,7 @@ declare class Foo { x: string; y: number; } -declare module "tests/cases/fourslash/inputFile3" { +declare module "inputFile3" { export var foo: number; export var bar: string; } diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt deleted file mode 100644 index d827a2492f8d0..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.dts.errors.txt +++ /dev/null @@ -1,41 +0,0 @@ -bin/test.d.ts(9,16): error TS2436: Ambient module declaration cannot specify relative module name. -bin/test.d.ts(19,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. -bin/test.d.ts(19,25): error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - - -==== bin/test.d.ts (3 errors) ==== - declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; - } - declare module "../outputdir_module_multifolder_ref/m2" { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2436: Ambient module declaration cannot specify relative module name. - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; - } - declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '../outputdir_module_multifolder_ref/m2'. - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; - } - \ No newline at end of file From add5146aea063fda49367c5d750709efe0c83d9e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Nov 2015 15:32:17 -0800 Subject: [PATCH 300/353] Fix linting errors --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0a79b148da60d..0954a7ce49e1b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6255,11 +6255,11 @@ namespace ts { } function typeIdenticalToSomeType(source: Type, target: UnionOrIntersectionType): boolean { - for (let t of target.types) { + for (const t of target.types) { if (isTypeIdenticalTo(source, t)) { return true; } - } + } return false; } @@ -6288,7 +6288,7 @@ namespace ts { } return source; } - + function getInferenceCandidates(context: InferenceContext, index: number): Type[] { const inferences = context.inferences[index]; return inferences.primary || inferences.secondary || emptyArray; From 8d3fca9de8d95371ed4a08c648960524c8c3d2f5 Mon Sep 17 00:00:00 2001 From: Yui T Date: Fri, 20 Nov 2015 16:26:13 -0800 Subject: [PATCH 301/353] apply tslint rule to scripts\tslint --- Jakefile.js | 14 ++++++++++++-- scripts/tslint/typeOperatorSpacingRule.ts | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 5dfbcc26d74cb..2c7442a491645 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -106,6 +106,16 @@ var serverCoreSources = [ return path.join(serverDirectory, f); }); +var scriptSources = [ + "tslint/booleanTriviaRule.ts", + "tslint/nextLineRule.ts", + "tslint/noNullRule.ts", + "tslint/preferConstRule.ts", + "tslint/typeOperatorSpacingRule.ts" +].map(function (f) { + return path.join(scriptsDirectory, f); +}); + var serverSources = serverCoreSources.concat(servicesSources); var languageServiceLibrarySources = [ @@ -365,7 +375,6 @@ file(builtGeneratedDiagnosticMessagesJSON,[generatedDiagnosticMessagesJSON], fun desc("Generates a diagnostic file in TypeScript based on an input JSON file"); task("generate-diagnostics", [diagnosticInfoMapTs]); - // Publish nightly var configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js"); var configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts"); @@ -909,7 +918,8 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) - .concat(serverCoreSources); + .concat(serverCoreSources) + .concat(scriptSources) desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts index 4196d0247685e..7ceef2372bf87 100644 --- a/scripts/tslint/typeOperatorSpacingRule.ts +++ b/scripts/tslint/typeOperatorSpacingRule.ts @@ -13,10 +13,10 @@ export class Rule extends Lint.Rules.AbstractRule { class TypeOperatorSpacingWalker extends Lint.RuleWalker { public visitNode(node: ts.Node) { if (node.kind === ts.SyntaxKind.UnionType || node.kind === ts.SyntaxKind.IntersectionType) { - let types = (node).types; + const types = (node).types; let expectedStart = types[0].end + 2; // space, | or & for (let i = 1; i < types.length; i++) { - let currentType = types[i]; + const currentType = types[i]; if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) { const failure = this.createFailure(currentType.pos, currentType.getWidth(), Rule.FAILURE_STRING); this.addFailure(failure); From 97f0bfcd72d0fe9602e55da409d39619b2bb0c28 Mon Sep 17 00:00:00 2001 From: Yui T Date: Fri, 20 Nov 2015 16:28:58 -0800 Subject: [PATCH 302/353] apply tslint rule to scripts\tslint --- Jakefile.js | 14 ++++++++++++-- scripts/tslint/typeOperatorSpacingRule.ts | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 5dfbcc26d74cb..7cd36aaa8bd01 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -106,6 +106,16 @@ var serverCoreSources = [ return path.join(serverDirectory, f); }); +var scriptSources = [ + "tslint/booleanTriviaRule.ts", + "tslint/nextLineRule.ts", + "tslint/noNullRule.ts", + "tslint/preferConstRule.ts", + "tslint/typeOperatorSpacingRule.ts" +].map(function (f) { + return path.join(scriptsDirectory, f); +}); + var serverSources = serverCoreSources.concat(servicesSources); var languageServiceLibrarySources = [ @@ -365,7 +375,6 @@ file(builtGeneratedDiagnosticMessagesJSON,[generatedDiagnosticMessagesJSON], fun desc("Generates a diagnostic file in TypeScript based on an input JSON file"); task("generate-diagnostics", [diagnosticInfoMapTs]); - // Publish nightly var configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js"); var configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts"); @@ -909,7 +918,8 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) - .concat(serverCoreSources); + .concat(serverCoreSources) + .concat(scriptSources); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts index 4196d0247685e..7ceef2372bf87 100644 --- a/scripts/tslint/typeOperatorSpacingRule.ts +++ b/scripts/tslint/typeOperatorSpacingRule.ts @@ -13,10 +13,10 @@ export class Rule extends Lint.Rules.AbstractRule { class TypeOperatorSpacingWalker extends Lint.RuleWalker { public visitNode(node: ts.Node) { if (node.kind === ts.SyntaxKind.UnionType || node.kind === ts.SyntaxKind.IntersectionType) { - let types = (node).types; + const types = (node).types; let expectedStart = types[0].end + 2; // space, | or & for (let i = 1; i < types.length; i++) { - let currentType = types[i]; + const currentType = types[i]; if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) { const failure = this.createFailure(currentType.pos, currentType.getWidth(), Rule.FAILURE_STRING); this.addFailure(failure); From 181c943febccac5f7432d5004c6c8f770691b0d7 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 21 Nov 2015 20:11:39 -0800 Subject: [PATCH 303/353] correctly capture 'this' when converting loops into functions --- src/compiler/emitter.ts | 29 ++++ .../reference/capturedLetConstInLoop10.js | 124 ++++++++++++++ .../capturedLetConstInLoop10.symbols | 119 ++++++++++++++ .../reference/capturedLetConstInLoop10.types | 151 ++++++++++++++++++ .../reference/capturedLetConstInLoop10_ES6.js | 90 +++++++++++ .../capturedLetConstInLoop10_ES6.symbols | 119 ++++++++++++++ .../capturedLetConstInLoop10_ES6.types | 151 ++++++++++++++++++ .../compiler/capturedLetConstInLoop10.ts | 45 ++++++ .../compiler/capturedLetConstInLoop10_ES6.ts | 46 ++++++ 9 files changed, 874 insertions(+) create mode 100644 tests/baselines/reference/capturedLetConstInLoop10.js create mode 100644 tests/baselines/reference/capturedLetConstInLoop10.symbols create mode 100644 tests/baselines/reference/capturedLetConstInLoop10.types create mode 100644 tests/baselines/reference/capturedLetConstInLoop10_ES6.js create mode 100644 tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols create mode 100644 tests/baselines/reference/capturedLetConstInLoop10_ES6.types create mode 100644 tests/cases/compiler/capturedLetConstInLoop10.ts create mode 100644 tests/cases/compiler/capturedLetConstInLoop10_ES6.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d2f9abc7354f5..abc570f971cc5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -402,6 +402,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi */ argumentsName?: string; + /* + * alias for 'this' from the calline code stack frame in case if this was used inside the converted loop + */ + thisName?: string; + /* * list of non-block scoped variable declarations that appear inside converted loop * such variable declarations should be moved outside the loop body @@ -1992,6 +1997,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LexicalThis) { write("_this"); } + else if (convertedLoopState) { + write(convertedLoopState.thisName || (convertedLoopState.thisName = makeUniqueName("this"))); + } else { write("this"); } @@ -3322,6 +3330,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName; } + if (convertedOuterLoopState.thisName) { + // outer loop has already used 'this' so we've already have some name to alias it + // use the same name in all nested loops + convertedLoopState.thisName = convertedOuterLoopState.thisName; + } + if (convertedOuterLoopState.hoistedLocalVariables) { // we've already collected some non-block scoped variable declarations in enclosing loop // use the same storage in nested loop @@ -3351,6 +3365,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); } } + if (convertedLoopState.thisName) { + // if alias for this is set + if (convertedOuterLoopState) { + // pass it to outer converted loop + convertedOuterLoopState.thisName = convertedLoopState.thisName; + } + else { + // this is top level converted loop so we need to create an alias for 'this' here + // NOTE: + // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set. + // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'. + write(`var ${convertedLoopState.thisName} = this;`); + writeLine(); + } + } if (convertedLoopState.hoistedLocalVariables) { // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later diff --git a/tests/baselines/reference/capturedLetConstInLoop10.js b/tests/baselines/reference/capturedLetConstInLoop10.js new file mode 100644 index 0000000000000..36b2ab9453fb9 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10.js @@ -0,0 +1,124 @@ +//// [capturedLetConstInLoop10.ts] +class A { + foo() { + for (let x of [0]) { + let f = function() { return x; }; + this.bar(f()); + } + } + bar(a: number) { + } + + baz() { + for (let x of [1]) { + let a = function() { return x; }; + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + this.bar(a()); + } + } + baz2() { + for (let x of [1]) { + let a = function() { return x; }; + this.bar(a()); + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + } + } +} + +class B { + foo() { + let a = + () => { + for (let x of [0]) { + let f = () => x; + this.bar(f()); + } + } + } + bar(a: number) { + } +} + +//// [capturedLetConstInLoop10.js] +var A = (function () { + function A() { + } + A.prototype.foo = function () { + var _loop_1 = function(x) { + var f = function () { return x; }; + this_1.bar(f()); + }; + var this_1 = this; + for (var _i = 0, _a = [0]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_1(x); + } + }; + A.prototype.bar = function (a) { + }; + A.prototype.baz = function () { + var _loop_2 = function(x) { + var a = function () { return x; }; + var _loop_3 = function(y) { + var b = function () { return y; }; + this_2.bar(b()); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var y = _a[_i]; + _loop_3(y); + } + this_2.bar(a()); + }; + var this_2 = this; + for (var _b = 0, _c = [1]; _b < _c.length; _b++) { + var x = _c[_b]; + _loop_2(x); + } + }; + A.prototype.baz2 = function () { + var _loop_4 = function(x) { + var a = function () { return x; }; + this_3.bar(a()); + var _loop_5 = function(y) { + var b = function () { return y; }; + this_3.bar(b()); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var y = _a[_i]; + _loop_5(y); + } + }; + var this_3 = this; + for (var _b = 0, _c = [1]; _b < _c.length; _b++) { + var x = _c[_b]; + _loop_4(x); + } + }; + return A; +})(); +var B = (function () { + function B() { + } + B.prototype.foo = function () { + var _this = this; + var a = function () { + var _loop_6 = function(x) { + var f = function () { return x; }; + _this.bar(f()); + }; + for (var _i = 0, _a = [0]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_6(x); + } + }; + }; + B.prototype.bar = function (a) { + }; + return B; +})(); diff --git a/tests/baselines/reference/capturedLetConstInLoop10.symbols b/tests/baselines/reference/capturedLetConstInLoop10.symbols new file mode 100644 index 0000000000000..124874088a849 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10.symbols @@ -0,0 +1,119 @@ +=== tests/cases/compiler/capturedLetConstInLoop10.ts === +class A { +>A : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) + + foo() { +>foo : Symbol(foo, Decl(capturedLetConstInLoop10.ts, 0, 9)) + + for (let x of [0]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 2, 16)) + + let f = function() { return x; }; +>f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 3, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 2, 16)) + + this.bar(f()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 3, 15)) + } + } + bar(a: number) { +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 7, 8)) + } + + baz() { +>baz : Symbol(baz, Decl(capturedLetConstInLoop10.ts, 8, 5)) + + for (let x of [1]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 11, 16)) + + let a = function() { return x; }; +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 12, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 11, 16)) + + for (let y of [1]) { +>y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 13, 20)) + + let b = function() { return y; }; +>b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 14, 19)) +>y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 13, 20)) + + this.bar(b()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 14, 19)) + } + this.bar(a()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 12, 15)) + } + } + baz2() { +>baz2 : Symbol(baz2, Decl(capturedLetConstInLoop10.ts, 19, 5)) + + for (let x of [1]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 21, 16)) + + let a = function() { return x; }; +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 22, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 21, 16)) + + this.bar(a()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 22, 15)) + + for (let y of [1]) { +>y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 24, 20)) + + let b = function() { return y; }; +>b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 25, 19)) +>y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 24, 20)) + + this.bar(b()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5)) +>b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 25, 19)) + } + } + } +} + +class B { +>B : Symbol(B, Decl(capturedLetConstInLoop10.ts, 30, 1)) + + foo() { +>foo : Symbol(foo, Decl(capturedLetConstInLoop10.ts, 32, 9)) + + let a = +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 34, 11)) + + () => { + for (let x of [0]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 36, 24)) + + let f = () => x; +>f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 37, 23)) +>x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 36, 24)) + + this.bar(f()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5)) +>this : Symbol(B, Decl(capturedLetConstInLoop10.ts, 30, 1)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5)) +>f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 37, 23)) + } + } + } + bar(a: number) { +>bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 42, 8)) + } +} diff --git a/tests/baselines/reference/capturedLetConstInLoop10.types b/tests/baselines/reference/capturedLetConstInLoop10.types new file mode 100644 index 0000000000000..e4bca4d906a17 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10.types @@ -0,0 +1,151 @@ +=== tests/cases/compiler/capturedLetConstInLoop10.ts === +class A { +>A : A + + foo() { +>foo : () => void + + for (let x of [0]) { +>x : number +>[0] : number[] +>0 : number + + let f = function() { return x; }; +>f : () => number +>function() { return x; } : () => number +>x : number + + this.bar(f()); +>this.bar(f()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>f() : number +>f : () => number + } + } + bar(a: number) { +>bar : (a: number) => void +>a : number + } + + baz() { +>baz : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + let a = function() { return x; }; +>a : () => number +>function() { return x; } : () => number +>x : number + + for (let y of [1]) { +>y : number +>[1] : number[] +>1 : number + + let b = function() { return y; }; +>b : () => number +>function() { return y; } : () => number +>y : number + + this.bar(b()); +>this.bar(b()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>b() : number +>b : () => number + } + this.bar(a()); +>this.bar(a()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>a() : number +>a : () => number + } + } + baz2() { +>baz2 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + let a = function() { return x; }; +>a : () => number +>function() { return x; } : () => number +>x : number + + this.bar(a()); +>this.bar(a()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>a() : number +>a : () => number + + for (let y of [1]) { +>y : number +>[1] : number[] +>1 : number + + let b = function() { return y; }; +>b : () => number +>function() { return y; } : () => number +>y : number + + this.bar(b()); +>this.bar(b()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>b() : number +>b : () => number + } + } + } +} + +class B { +>B : B + + foo() { +>foo : () => void + + let a = +>a : () => void + + () => { +>() => { for (let x of [0]) { let f = () => x; this.bar(f()); } } : () => void + + for (let x of [0]) { +>x : number +>[0] : number[] +>0 : number + + let f = () => x; +>f : () => number +>() => x : () => number +>x : number + + this.bar(f()); +>this.bar(f()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>f() : number +>f : () => number + } + } + } + bar(a: number) { +>bar : (a: number) => void +>a : number + } +} diff --git a/tests/baselines/reference/capturedLetConstInLoop10_ES6.js b/tests/baselines/reference/capturedLetConstInLoop10_ES6.js new file mode 100644 index 0000000000000..705a5e6ba9f63 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10_ES6.js @@ -0,0 +1,90 @@ +//// [capturedLetConstInLoop10_ES6.ts] +class A { + foo() { + for (let x of [0]) { + let f = function() { return x; }; + this.bar(f()); + } + } + bar(a: number) { + } + + baz() { + for (let x of [1]) { + let a = function() { return x; }; + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + this.bar(a()); + } + } + baz2() { + for (let x of [1]) { + let a = function() { return x; }; + this.bar(a()); + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + } + } +} + +class B { + foo() { + let a = + () => { + for (let x of [0]) { + let f = () => x; + this.bar(f()); + } + } + } + bar(a: number) { + } +} + +//// [capturedLetConstInLoop10_ES6.js] +class A { + foo() { + for (let x of [0]) { + let f = function () { return x; }; + this.bar(f()); + } + } + bar(a) { + } + baz() { + for (let x of [1]) { + let a = function () { return x; }; + for (let y of [1]) { + let b = function () { return y; }; + this.bar(b()); + } + this.bar(a()); + } + } + baz2() { + for (let x of [1]) { + let a = function () { return x; }; + this.bar(a()); + for (let y of [1]) { + let b = function () { return y; }; + this.bar(b()); + } + } + } +} +class B { + foo() { + let a = () => { + for (let x of [0]) { + let f = () => x; + this.bar(f()); + } + }; + } + bar(a) { + } +} diff --git a/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols new file mode 100644 index 0000000000000..f0cf92ff96b25 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols @@ -0,0 +1,119 @@ +=== tests/cases/compiler/capturedLetConstInLoop10_ES6.ts === +class A { +>A : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) + + foo() { +>foo : Symbol(foo, Decl(capturedLetConstInLoop10_ES6.ts, 0, 9)) + + for (let x of [0]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 2, 16)) + + let f = function() { return x; }; +>f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 3, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 2, 16)) + + this.bar(f()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 3, 15)) + } + } + bar(a: number) { +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 7, 8)) + } + + baz() { +>baz : Symbol(baz, Decl(capturedLetConstInLoop10_ES6.ts, 8, 5)) + + for (let x of [1]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 11, 16)) + + let a = function() { return x; }; +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 12, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 11, 16)) + + for (let y of [1]) { +>y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 13, 20)) + + let b = function() { return y; }; +>b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 14, 19)) +>y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 13, 20)) + + this.bar(b()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 14, 19)) + } + this.bar(a()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 12, 15)) + } + } + baz2() { +>baz2 : Symbol(baz2, Decl(capturedLetConstInLoop10_ES6.ts, 19, 5)) + + for (let x of [1]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 21, 16)) + + let a = function() { return x; }; +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 22, 15)) +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 21, 16)) + + this.bar(a()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 22, 15)) + + for (let y of [1]) { +>y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 24, 20)) + + let b = function() { return y; }; +>b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 25, 19)) +>y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 24, 20)) + + this.bar(b()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5)) +>b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 25, 19)) + } + } + } +} + +class B { +>B : Symbol(B, Decl(capturedLetConstInLoop10_ES6.ts, 30, 1)) + + foo() { +>foo : Symbol(foo, Decl(capturedLetConstInLoop10_ES6.ts, 32, 9)) + + let a = +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 34, 11)) + + () => { + for (let x of [0]) { +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 36, 24)) + + let f = () => x; +>f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 37, 23)) +>x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 36, 24)) + + this.bar(f()); +>this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5)) +>this : Symbol(B, Decl(capturedLetConstInLoop10_ES6.ts, 30, 1)) +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5)) +>f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 37, 23)) + } + } + } + bar(a: number) { +>bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 42, 8)) + } +} diff --git a/tests/baselines/reference/capturedLetConstInLoop10_ES6.types b/tests/baselines/reference/capturedLetConstInLoop10_ES6.types new file mode 100644 index 0000000000000..068c124582d54 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop10_ES6.types @@ -0,0 +1,151 @@ +=== tests/cases/compiler/capturedLetConstInLoop10_ES6.ts === +class A { +>A : A + + foo() { +>foo : () => void + + for (let x of [0]) { +>x : number +>[0] : number[] +>0 : number + + let f = function() { return x; }; +>f : () => number +>function() { return x; } : () => number +>x : number + + this.bar(f()); +>this.bar(f()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>f() : number +>f : () => number + } + } + bar(a: number) { +>bar : (a: number) => void +>a : number + } + + baz() { +>baz : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + let a = function() { return x; }; +>a : () => number +>function() { return x; } : () => number +>x : number + + for (let y of [1]) { +>y : number +>[1] : number[] +>1 : number + + let b = function() { return y; }; +>b : () => number +>function() { return y; } : () => number +>y : number + + this.bar(b()); +>this.bar(b()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>b() : number +>b : () => number + } + this.bar(a()); +>this.bar(a()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>a() : number +>a : () => number + } + } + baz2() { +>baz2 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + let a = function() { return x; }; +>a : () => number +>function() { return x; } : () => number +>x : number + + this.bar(a()); +>this.bar(a()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>a() : number +>a : () => number + + for (let y of [1]) { +>y : number +>[1] : number[] +>1 : number + + let b = function() { return y; }; +>b : () => number +>function() { return y; } : () => number +>y : number + + this.bar(b()); +>this.bar(b()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>b() : number +>b : () => number + } + } + } +} + +class B { +>B : B + + foo() { +>foo : () => void + + let a = +>a : () => void + + () => { +>() => { for (let x of [0]) { let f = () => x; this.bar(f()); } } : () => void + + for (let x of [0]) { +>x : number +>[0] : number[] +>0 : number + + let f = () => x; +>f : () => number +>() => x : () => number +>x : number + + this.bar(f()); +>this.bar(f()) : void +>this.bar : (a: number) => void +>this : this +>bar : (a: number) => void +>f() : number +>f : () => number + } + } + } + bar(a: number) { +>bar : (a: number) => void +>a : number + } +} diff --git a/tests/cases/compiler/capturedLetConstInLoop10.ts b/tests/cases/compiler/capturedLetConstInLoop10.ts new file mode 100644 index 0000000000000..47eee6d6a7d47 --- /dev/null +++ b/tests/cases/compiler/capturedLetConstInLoop10.ts @@ -0,0 +1,45 @@ +class A { + foo() { + for (let x of [0]) { + let f = function() { return x; }; + this.bar(f()); + } + } + bar(a: number) { + } + + baz() { + for (let x of [1]) { + let a = function() { return x; }; + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + this.bar(a()); + } + } + baz2() { + for (let x of [1]) { + let a = function() { return x; }; + this.bar(a()); + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + } + } +} + +class B { + foo() { + let a = + () => { + for (let x of [0]) { + let f = () => x; + this.bar(f()); + } + } + } + bar(a: number) { + } +} \ No newline at end of file diff --git a/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts b/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts new file mode 100644 index 0000000000000..21c58e3aa3d49 --- /dev/null +++ b/tests/cases/compiler/capturedLetConstInLoop10_ES6.ts @@ -0,0 +1,46 @@ +// @target: ES6 +class A { + foo() { + for (let x of [0]) { + let f = function() { return x; }; + this.bar(f()); + } + } + bar(a: number) { + } + + baz() { + for (let x of [1]) { + let a = function() { return x; }; + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + this.bar(a()); + } + } + baz2() { + for (let x of [1]) { + let a = function() { return x; }; + this.bar(a()); + for (let y of [1]) { + let b = function() { return y; }; + this.bar(b()); + } + } + } +} + +class B { + foo() { + let a = + () => { + for (let x of [0]) { + let f = () => x; + this.bar(f()); + } + } + } + bar(a: number) { + } +} \ No newline at end of file From 988a51237bd76a8ea5204acc4e3f551dfeee99f9 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 22 Nov 2015 21:28:07 -0800 Subject: [PATCH 304/353] address PR feedback - fixed typo in comment --- src/compiler/emitter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index abc570f971cc5..998c954092852 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -403,7 +403,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi argumentsName?: string; /* - * alias for 'this' from the calline code stack frame in case if this was used inside the converted loop + * alias for 'this' from the calling code stack frame in case if this was used inside the converted loop */ thisName?: string; From 5eb8f71ee1962cfeb5441d9029121cef182e8e2b Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 22 Nov 2015 22:06:05 -0800 Subject: [PATCH 305/353] addressed PR feedback --- src/compiler/checker.ts | 14 ++++--- .../reference/reachabilityChecks7.errors.txt | 21 ++++++++++ .../reference/reachabilityChecks7.js | 42 +++++++++++++++++++ tests/cases/compiler/reachabilityChecks7.ts | 14 +++++++ 4 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/reference/reachabilityChecks7.errors.txt create mode 100644 tests/baselines/reference/reachabilityChecks7.js create mode 100644 tests/cases/compiler/reachabilityChecks7.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 53e9cc720ce40..1a0440be2c770 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9811,17 +9811,19 @@ namespace ts { return aggregatedTypes; } - // TypeScript Specification 1.0 (6.3) - July 2014 - // An explicitly typed function whose return type isn't the Void or the Any type - // must have at least one return statement somewhere in its body. - // An exception to this rule is if the function implementation consists of a single 'throw' statement. - // @param returnType - return type of the function, can be undefined if return type is not explicitly specified + /* + *TypeScript Specification 1.0 (6.3) - July 2014 + * An explicitly typed function whose return type isn't the Void or the Any type + * must have at least one return statement somewhere in its body. + * An exception to this rule is if the function implementation consists of a single 'throw' statement. + * @param returnType - return type of the function, can be undefined if return type is not explicitly specified + */ function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func: FunctionLikeDeclaration, returnType: Type): void { if (!produceDiagnostics) { return; } - // Functions with explicitly specified return type which is either 'void' or 'any' don't need any return expressions. + // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions. if (returnType && (returnType === voidType || isTypeAny(returnType))) { return; } diff --git a/tests/baselines/reference/reachabilityChecks7.errors.txt b/tests/baselines/reference/reachabilityChecks7.errors.txt new file mode 100644 index 0000000000000..9e8f803f957eb --- /dev/null +++ b/tests/baselines/reference/reachabilityChecks7.errors.txt @@ -0,0 +1,21 @@ +tests/cases/compiler/reachabilityChecks7.ts(3,16): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks7.ts(6,9): error TS7030: Not all code paths return a value. + + +==== tests/cases/compiler/reachabilityChecks7.ts (2 errors) ==== + + // async function without return type annotation - error + async function f1() { + ~~ +!!! error TS7030: Not all code paths return a value. + } + + let x = async function() { + ~~~~~ +!!! error TS7030: Not all code paths return a value. + } + + // async function with which promised type is void - return can be omitted + async function f2(): Promise { + + } \ No newline at end of file diff --git a/tests/baselines/reference/reachabilityChecks7.js b/tests/baselines/reference/reachabilityChecks7.js new file mode 100644 index 0000000000000..f9579d5828d93 --- /dev/null +++ b/tests/baselines/reference/reachabilityChecks7.js @@ -0,0 +1,42 @@ +//// [reachabilityChecks7.ts] + +// async function without return type annotation - error +async function f1() { +} + +let x = async function() { +} + +// async function with which promised type is void - return can be omitted +async function f2(): Promise { + +} + +//// [reachabilityChecks7.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); + }); +}; +// async function without return type annotation - error +function f1() { + return __awaiter(this, void 0, Promise, function* () { + }); +} +let x = function () { + return __awaiter(this, void 0, Promise, function* () { + }); +}; +// async function with which promised type is void - return can be omitted +function f2() { + return __awaiter(this, void 0, Promise, function* () { + }); +} diff --git a/tests/cases/compiler/reachabilityChecks7.ts b/tests/cases/compiler/reachabilityChecks7.ts new file mode 100644 index 0000000000000..11febb320d639 --- /dev/null +++ b/tests/cases/compiler/reachabilityChecks7.ts @@ -0,0 +1,14 @@ +// @target: ES6 +// @noImplicitReturns: true + +// async function without return type annotation - error +async function f1() { +} + +let x = async function() { +} + +// async function with which promised type is void - return can be omitted +async function f2(): Promise { + +} \ No newline at end of file From 2836c17791806d7be0db65dca7bdff8385bb0db0 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 23 Nov 2015 13:08:44 -0800 Subject: [PATCH 306/353] do not treat modules with '!' in names any specially --- src/compiler/checker.ts | 4 ---- tests/baselines/reference/bangInModuleName.js | 23 +++++++++++++++++++ .../reference/bangInModuleName.symbols | 21 +++++++++++++++++ .../reference/bangInModuleName.types | 21 +++++++++++++++++ tests/cases/compiler/bangInModuleName.ts | 17 ++++++++++++++ 5 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/bangInModuleName.js create mode 100644 tests/baselines/reference/bangInModuleName.symbols create mode 100644 tests/baselines/reference/bangInModuleName.types create mode 100644 tests/cases/compiler/bangInModuleName.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1b6b31f958697..c8e3b8381c3ec 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1034,10 +1034,6 @@ namespace ts { return; } - if (moduleName.indexOf("!") >= 0) { - moduleName = moduleName.substr(0, moduleName.indexOf("!")); - } - const isRelative = isExternalModuleNameRelative(moduleName); if (!isRelative) { const symbol = getSymbol(globals, "\"" + moduleName + "\"", SymbolFlags.ValueModule); diff --git a/tests/baselines/reference/bangInModuleName.js b/tests/baselines/reference/bangInModuleName.js new file mode 100644 index 0000000000000..769ccbf1d42b0 --- /dev/null +++ b/tests/baselines/reference/bangInModuleName.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/bangInModuleName.ts] //// + +//// [a.d.ts] + + +declare module "http" { +} + +declare module 'intern/dojo/node!http' { + import http = require('http'); + export = http; +} + +//// [a.ts] + +/// + +import * as http from 'intern/dojo/node!http'; + +//// [a.js] +/// +define(["require", "exports"], function (require, exports) { +}); diff --git a/tests/baselines/reference/bangInModuleName.symbols b/tests/baselines/reference/bangInModuleName.symbols new file mode 100644 index 0000000000000..63ba5d106d800 --- /dev/null +++ b/tests/baselines/reference/bangInModuleName.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/a.ts === + +/// + +import * as http from 'intern/dojo/node!http'; +>http : Symbol(http, Decl(a.ts, 3, 6)) + +=== tests/cases/compiler/a.d.ts === + + +declare module "http" { +} + +declare module 'intern/dojo/node!http' { + import http = require('http'); +>http : Symbol(http, Decl(a.d.ts, 5, 40)) + + export = http; +>http : Symbol(http, Decl(a.d.ts, 5, 40)) +} + diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types new file mode 100644 index 0000000000000..06a602e2ff831 --- /dev/null +++ b/tests/baselines/reference/bangInModuleName.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/a.ts === + +/// + +import * as http from 'intern/dojo/node!http'; +>http : typeof http + +=== tests/cases/compiler/a.d.ts === + + +declare module "http" { +} + +declare module 'intern/dojo/node!http' { + import http = require('http'); +>http : typeof http + + export = http; +>http : typeof http +} + diff --git a/tests/cases/compiler/bangInModuleName.ts b/tests/cases/compiler/bangInModuleName.ts new file mode 100644 index 0000000000000..6e8f7163109fa --- /dev/null +++ b/tests/cases/compiler/bangInModuleName.ts @@ -0,0 +1,17 @@ +// @module: amd + +// @filename: a.d.ts + +declare module "http" { +} + +declare module 'intern/dojo/node!http' { + import http = require('http'); + export = http; +} + +// @filename: a.ts + +/// + +import * as http from 'intern/dojo/node!http'; \ No newline at end of file From 4beedcf4c7f47c54b91195f5529cdcadeb192b83 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 23 Nov 2015 13:09:50 -0800 Subject: [PATCH 307/353] Update relation cache after we decide to elaborate an error --- src/compiler/checker.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1b6b31f958697..bd7b02e5c1d24 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5228,9 +5228,12 @@ namespace ts { const id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id; const related = relation[id]; if (related !== undefined) { - // If we computed this relation already and it was failed and reported, or if we're not being asked to elaborate - // errors, we can use the cached value. Otherwise, recompute the relation - if (!elaborateErrors || (related === RelationComparisonResult.FailedAndReported)) { + if (elaborateErrors && related === RelationComparisonResult.Failed) { + // We are elaborating errors and the cached result is an unreported failure. Record the result as a reported + // failure and continue computing the relation such that errors get reported. + relation[id] = RelationComparisonResult.FailedAndReported; + } + else { return related === RelationComparisonResult.Succeeded ? Ternary.True : Ternary.False; } } From 6a144506f49c5973498853d731362e8f5f10bb2e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 23 Nov 2015 13:21:51 -0800 Subject: [PATCH 308/353] Adding regression test --- tests/cases/compiler/errorElaboration.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tests/cases/compiler/errorElaboration.ts diff --git a/tests/cases/compiler/errorElaboration.ts b/tests/cases/compiler/errorElaboration.ts new file mode 100644 index 0000000000000..97ec0dde61cd5 --- /dev/null +++ b/tests/cases/compiler/errorElaboration.ts @@ -0,0 +1,12 @@ +// Repro for #5712 + +interface Ref { + prop: T; +} +interface Container { + m1: Container>; + m2: T; +} +declare function foo(x: () => Container>): void; +let a: () => Container>; +foo(a); From c5dd2976833f5ab58d53d660fc791d0d318755e8 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 23 Nov 2015 13:22:23 -0800 Subject: [PATCH 309/353] Accepting new baselines --- ...tructuringParameterDeclaration2.errors.txt | 2 ++ .../reference/errorElaboration.errors.txt | 25 +++++++++++++++++++ tests/baselines/reference/errorElaboration.js | 19 ++++++++++++++ .../reference/promisePermutations3.errors.txt | 8 ++++-- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/errorElaboration.errors.txt create mode 100644 tests/baselines/reference/errorElaboration.js diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt index 95524d4bf4dc5..c8037255a3293 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt +++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt @@ -8,6 +8,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts( Type 'number | string[][] | string' is not assignable to type 'number | string[][]'. Type 'string' is not assignable to type 'number | string[][]'. Type 'string' is not assignable to type 'string[][]'. + Property 'push' is missing in type 'String'. tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,8): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,16): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(23,14): error TS2345: Argument of type '{ x: string; y: boolean; }' is not assignable to parameter of type '{ x: number; y: any; }'. @@ -77,6 +78,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts( !!! error TS2345: Type 'number | string[][] | string' is not assignable to type 'number | string[][]'. !!! error TS2345: Type 'string' is not assignable to type 'number | string[][]'. !!! error TS2345: Type 'string' is not assignable to type 'string[][]'. +!!! error TS2345: Property 'push' is missing in type 'String'. // If the declaration includes an initializer expression (which is permitted only diff --git a/tests/baselines/reference/errorElaboration.errors.txt b/tests/baselines/reference/errorElaboration.errors.txt new file mode 100644 index 0000000000000..94742d7d98bc4 --- /dev/null +++ b/tests/baselines/reference/errorElaboration.errors.txt @@ -0,0 +1,25 @@ +tests/cases/compiler/errorElaboration.ts(12,5): error TS2345: Argument of type '() => Container>' is not assignable to parameter of type '() => Container>'. + Type 'Container>' is not assignable to type 'Container>'. + Type 'Ref' is not assignable to type 'Ref'. + Type 'string' is not assignable to type 'number'. + + +==== tests/cases/compiler/errorElaboration.ts (1 errors) ==== + // Repro for #5712 + + interface Ref { + prop: T; + } + interface Container { + m1: Container>; + m2: T; + } + declare function foo(x: () => Container>): void; + let a: () => Container>; + foo(a); + ~ +!!! error TS2345: Argument of type '() => Container>' is not assignable to parameter of type '() => Container>'. +!!! error TS2345: Type 'Container>' is not assignable to type 'Container>'. +!!! error TS2345: Type 'Ref' is not assignable to type 'Ref'. +!!! error TS2345: Type 'string' is not assignable to type 'number'. + \ No newline at end of file diff --git a/tests/baselines/reference/errorElaboration.js b/tests/baselines/reference/errorElaboration.js new file mode 100644 index 0000000000000..eed8bbd7c6b89 --- /dev/null +++ b/tests/baselines/reference/errorElaboration.js @@ -0,0 +1,19 @@ +//// [errorElaboration.ts] +// Repro for #5712 + +interface Ref { + prop: T; +} +interface Container { + m1: Container>; + m2: T; +} +declare function foo(x: () => Container>): void; +let a: () => Container>; +foo(a); + + +//// [errorElaboration.js] +// Repro for #5712 +var a; +foo(a); diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt index 72276745c41e2..b17021a02b919 100644 --- a/tests/baselines/reference/promisePermutations3.errors.txt +++ b/tests/baselines/reference/promisePermutations3.errors.txt @@ -81,7 +81,9 @@ tests/cases/compiler/promisePermutations3.ts(159,21): error TS2345: Argument of Type 'number' is not assignable to type 'string'. tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of type '{ (x: T): IPromise; (x: T, y: T): Promise; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise'. Type 'IPromise' is not assignable to type 'Promise'. - Property 'done' is optional in type 'IPromise' but required in type 'Promise'. + Types of property 'then' are incompatible. + Type '(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (success?: (value: any) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: any) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: any) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. + Type 'IPromise' is not assignable to type 'Promise'. ==== tests/cases/compiler/promisePermutations3.ts (35 errors) ==== @@ -368,5 +370,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of ~~~~~~~~~~~~~~~ !!! error TS2345: Argument of type '{ (x: T): IPromise; (x: T, y: T): Promise; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise'. !!! error TS2345: Type 'IPromise' is not assignable to type 'Promise'. -!!! error TS2345: Property 'done' is optional in type 'IPromise' but required in type 'Promise'. +!!! error TS2345: Types of property 'then' are incompatible. +!!! error TS2345: Type '(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (success?: (value: any) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: any) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: any) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. +!!! error TS2345: Type 'IPromise' is not assignable to type 'Promise'. var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok \ No newline at end of file From 566c0db54313f864103054c536372a8908162a66 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 23 Nov 2015 13:24:46 -0800 Subject: [PATCH 310/353] fix lint errors --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c8e3b8381c3ec..d06b58cbecaec 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1028,7 +1028,7 @@ namespace ts { // Module names are escaped in our symbol table. However, string literal values aren't. // Escape the name in the "require(...)" clause to ensure we find the right symbol. - let moduleName = escapeIdentifier(moduleReferenceLiteral.text); + const moduleName = escapeIdentifier(moduleReferenceLiteral.text); if (moduleName === undefined) { return; From a03f06f76662eeba619b46dd0080e566aff527d6 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 14:39:41 -0800 Subject: [PATCH 311/353] add strict mdoe directive to all nones6 module emits --- src/compiler/emitter.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 998c954092852..e4d685597e76f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -7383,6 +7383,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(`], function(${exportFunctionForFile}) {`); writeLine(); increaseIndent(); + emitUseStrictPrologueDirective(); const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); emitEmitHelpers(node); emitCaptureThisForNodeIfNecessary(node); @@ -7493,6 +7494,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeModuleName(node, emitRelativePathAsModuleName); emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName); increaseIndent(); + emitUseStrictPrologueDirective(); const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); emitExportStarHelper(); emitCaptureThisForNodeIfNecessary(node); @@ -7505,6 +7507,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitCommonJSModule(node: SourceFile) { + emitUseStrictPrologueDirective(); const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false); emitEmitHelpers(node); collectExternalModuleInfo(node); @@ -7515,6 +7518,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitExportEquals(/*emitAsReturn*/ false); } + function emitUseStrictPrologueDirective() { + writeLine(); + write("\"use strict\";"); + } + function emitUMDModule(node: SourceFile) { emitEmitHelpers(node); collectExternalModuleInfo(node); @@ -7534,6 +7542,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi })(`); emitAMDFactoryHeader(dependencyNames); increaseIndent(); + emitUseStrictPrologueDirective(); const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); emitExportStarHelper(); emitCaptureThisForNodeIfNecessary(node); From 79c4dc62f1ff4f137c67bad6c4ca7a4d2f5cbc9d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 14:57:47 -0800 Subject: [PATCH 312/353] Accept so many baselines --- .../baselines/reference/APISample_compile.js | 1 + tests/baselines/reference/APISample_linter.js | 1 + .../reference/APISample_transform.js | 1 + .../baselines/reference/APISample_watcher.js | 1 + .../baselines/reference/ExportAssignment7.js | 1 + .../baselines/reference/ExportAssignment8.js | 1 + ...eEachWithExportedLocalVarsOfTheSameName.js | 2 + tests/baselines/reference/aliasAssignments.js | 2 + .../reference/aliasOnMergedModuleInterface.js | 1 + .../reference/aliasUsageInAccessorsOfClass.js | 3 + .../baselines/reference/aliasUsageInArray.js | 3 + .../aliasUsageInFunctionExpression.js | 3 + .../reference/aliasUsageInGenericFunction.js | 3 + .../reference/aliasUsageInIndexerOfClass.js | 3 + .../reference/aliasUsageInObjectLiteral.js | 3 + .../reference/aliasUsageInOrExpression.js | 3 + ...aliasUsageInTypeArgumentOfExtendsClause.js | 3 + .../reference/aliasUsageInVarAssignment.js | 3 + .../reference/aliasUsedAsNameValue.js | 3 + ...aceExportAssignmentUsedInVarInitializer.js | 2 + .../reference/aliasesInSystemModule1.js | 1 + .../reference/aliasesInSystemModule2.js | 1 + .../reference/ambientDeclarationsExternal.js | 1 + ...ntExternalModuleInAnotherExternalModule.js | 1 + ...nalModuleInsideNonAmbientExternalModule.js | 1 + .../reference/ambientExternalModuleMerging.js | 1 + ...rnalModuleWithInternalImportDeclaration.js | 1 + ...lModuleWithoutInternalImportDeclaration.js | 1 + .../ambientInsideNonAmbientExternalModule.js | 1 + .../reference/amdDependencyComment1.js | 1 + .../reference/amdDependencyComment2.js | 1 + .../reference/amdDependencyCommentName1.js | 1 + .../reference/amdDependencyCommentName2.js | 1 + .../reference/amdDependencyCommentName3.js | 1 + .../reference/amdDependencyCommentName4.js | 1 + .../reference/amdImportAsPrimaryExpression.js | 2 + .../amdImportNotAsPrimaryExpression.js | 2 + tests/baselines/reference/amdModuleName1.js | 1 + tests/baselines/reference/amdModuleName2.js | 1 + .../reference/arrayOfExportedClass.js | 2 + tests/baselines/reference/asOperator4.js | 2 + .../augmentedTypesExternalModule1.js | 1 + .../reference/badExternalModuleReference.js | 1 + .../reference/capturedLetConstInLoop4.js | 1 + .../baselines/reference/chainedImportAlias.js | 2 + .../baselines/reference/circularReference.js | 2 + .../reference/classAbstractManyKeywords.js | 1 + ...classMemberInitializerWithLamdaScoping3.js | 1 + ...classMemberInitializerWithLamdaScoping4.js | 2 + tests/baselines/reference/clinterfaces.js | 1 + .../collisionExportsRequireAndAlias.js | 3 + .../collisionExportsRequireAndAmbientClass.js | 1 + .../collisionExportsRequireAndAmbientEnum.js | 1 + ...llisionExportsRequireAndAmbientFunction.js | 1 + ...collisionExportsRequireAndAmbientModule.js | 1 + .../collisionExportsRequireAndAmbientVar.js | 1 + .../collisionExportsRequireAndClass.js | 1 + .../collisionExportsRequireAndEnum.js | 1 + .../collisionExportsRequireAndFunction.js | 1 + ...ionExportsRequireAndInternalModuleAlias.js | 1 + .../collisionExportsRequireAndModule.js | 1 + ...onExportsRequireAndUninstantiatedModule.js | 1 + .../collisionExportsRequireAndVar.js | 1 + .../reference/commentOnImportStatement1.js | 1 + .../reference/commentOnImportStatement2.js | 1 + .../reference/commentOnImportStatement3.js | 1 + .../commentsBeforeVariableStatement1.js | 1 + .../reference/commentsDottedModuleName.js | 1 + .../reference/commentsExternalModules.js | 2 + .../reference/commentsExternalModules2.js | 2 + .../reference/commentsExternalModules3.js | 2 + .../reference/commentsMultiModuleMultiFile.js | 2 + .../commonJSImportAsPrimaryExpression.js | 2 + .../commonJSImportNotAsPrimaryExpression.js | 2 + .../baselines/reference/commonjsSafeImport.js | 2 + .../reference/constDeclarations-access5.js | 2 + .../reference/constEnumExternalModule.js | 2 + .../reference/constEnumMergingWithValues1.js | 1 + .../reference/constEnumMergingWithValues2.js | 1 + .../reference/constEnumMergingWithValues3.js | 1 + .../reference/constEnumMergingWithValues4.js | 1 + .../reference/constEnumMergingWithValues5.js | 1 + .../reference/copyrightWithNewLine1.js | 1 + .../reference/copyrightWithoutNewLine1.js | 1 + .../crashIntypeCheckInvocationExpression.js | 1 + ...rashIntypeCheckObjectCreationExpression.js | 1 + .../baselines/reference/declFileAccessors.js | 1 + .../declFileAliasUseBeforeDeclaration.js | 2 + ...tExternalModuleWithSingleExportedModule.js | 1 + .../reference/declFileCallSignatures.js | 1 + ...assWithStaticMethodReturningConstructor.js | 1 + .../reference/declFileConstructSignatures.js | 1 + .../reference/declFileConstructors.js | 1 + ...ileExportAssignmentImportInternalModule.js | 1 + ...lFileExportAssignmentOfGenericInterface.js | 2 + .../reference/declFileExportImportChain.js | 5 + .../reference/declFileExportImportChain2.js | 4 + .../reference/declFileForExportedImport.js | 2 + .../baselines/reference/declFileFunctions.js | 1 + .../reference/declFileGenericType.js | 1 + .../declFileImportChainInExportAssignment.js | 1 + ...eclFileImportModuleWithExportAssignment.js | 2 + .../reference/declFileIndexSignatures.js | 1 + tests/baselines/reference/declFileMethods.js | 1 + ...ationEmitImportInExportAssignmentModule.js | 1 + .../declarationEmit_exportAssignment.js | 2 + .../declarationEmit_exportDeclaration.js | 2 + .../declarationEmit_nameConflicts.js | 2 + .../declarationEmit_nameConflictsWithAlias.js | 1 + .../reference/declareFileExportAssignment.js | 1 + ...tAssignmentWithVarFromVariableStatement.js | 1 + ...ratorInstantiateModulesInFunctionBodies.js | 2 + .../baselines/reference/decoratorMetadata.js | 2 + .../decoratorMetadataOnInferredType.js | 1 + .../decoratorMetadataWithConstructorType.js | 1 + ...adataWithImportDeclarationNameCollision.js | 2 + ...dataWithImportDeclarationNameCollision2.js | 2 + ...dataWithImportDeclarationNameCollision3.js | 2 + ...dataWithImportDeclarationNameCollision4.js | 2 + ...dataWithImportDeclarationNameCollision5.js | 2 + ...dataWithImportDeclarationNameCollision6.js | 2 + ...dataWithImportDeclarationNameCollision7.js | 2 + ...dataWithImportDeclarationNameCollision8.js | 2 + .../baselines/reference/decoratorOnClass2.js | 1 + .../reference/decoratorOnImportEquals2.js | 2 + .../reference/defaultExportWithOverloads01.js | 1 + .../reference/defaultExportsCannotMerge01.js | 2 + .../reference/defaultExportsCannotMerge02.js | 2 + .../reference/defaultExportsCannotMerge03.js | 2 + .../reference/defaultExportsCannotMerge04.js | 1 + .../reference/dependencyViaImportAlias.js | 2 + .../reference/downlevelLetConst13.js | 2 +- .../reference/duplicateExportAssignments.js | 5 + .../reference/duplicateLocalVariable1.js | 1 + .../reference/duplicateLocalVariable2.js | 1 + .../duplicateStringNamedProperty1.js | 1 + .../duplicateSymbolsExportMatching.js | 1 + .../reference/dynamicModuleTypecheckError.js | 1 + .../baselines/reference/elidingImportNames.js | 3 + tests/baselines/reference/emptyModuleName.js | 1 + .../reference/enumFromExternalModule.js | 2 + .../reference/errorsOnImportedSymbol.js | 2 + .../reference/es3defaultAliasIsQuoted.js | 2 + tests/baselines/reference/es5-commonjs.js | 1 + tests/baselines/reference/es5-commonjs2.js | 1 + tests/baselines/reference/es5-commonjs3.js | 1 + tests/baselines/reference/es5-commonjs4.js | 1 + tests/baselines/reference/es5-commonjs5.js | 1 + tests/baselines/reference/es5-commonjs6.js | 1 + tests/baselines/reference/es5-system.js | 1 + tests/baselines/reference/es5-umd2.js | 1 + tests/baselines/reference/es5-umd3.js | 1 + tests/baselines/reference/es5-umd4.js | 1 + .../es5ExportDefaultClassDeclaration.js | 1 + .../es5ExportDefaultClassDeclaration2.js | 1 + .../es5ExportDefaultClassDeclaration3.js | 1 + .../reference/es5ExportDefaultExpression.js | 1 + .../es5ExportDefaultFunctionDeclaration.js | 1 + .../es5ExportDefaultFunctionDeclaration2.js | 1 + .../es5ExportDefaultFunctionDeclaration3.js | 1 + .../reference/es5ExportDefaultIdentifier.js | 1 + tests/baselines/reference/es5ExportEquals.js | 1 + .../baselines/reference/es5ExportEqualsDts.js | 1 + .../es5ModuleInternalNamedImports.js | 1 + .../reference/es5ModuleWithModuleGenAmd.js | 1 + .../es5ModuleWithModuleGenCommonjs.js | 1 + .../es5ModuleWithoutModuleGenTarget.js | 1 + tests/baselines/reference/es6-umd2.js | 1 + .../baselines/reference/es6ExportAllInEs5.js | 2 + .../reference/es6ExportClauseInEs5.js | 1 + ...ExportClauseWithoutModuleSpecifierInEs5.js | 2 + .../reference/es6ExportEqualsInterop.js | 1 + .../reference/es6ImportDefaultBindingAmd.js | 2 + .../reference/es6ImportDefaultBindingDts.js | 2 + ...rtDefaultBindingFollowedWithNamedImport.js | 2 + ...ultBindingFollowedWithNamedImport1InEs5.js | 2 + ...ndingFollowedWithNamedImport1WithExport.js | 2 + ...efaultBindingFollowedWithNamedImportDts.js | 2 + ...faultBindingFollowedWithNamedImportDts1.js | 2 + ...aultBindingFollowedWithNamedImportInEs5.js | 2 + ...indingFollowedWithNamedImportWithExport.js | 2 + ...ndingFollowedWithNamespaceBinding1InEs5.js | 2 + ...FollowedWithNamespaceBinding1WithExport.js | 2 + ...tBindingFollowedWithNamespaceBindingDts.js | 2 + ...BindingFollowedWithNamespaceBindingDts1.js | 2 + ...indingFollowedWithNamespaceBindingInEs5.js | 2 + ...gFollowedWithNamespaceBindingWithExport.js | 2 + .../reference/es6ImportDefaultBindingInEs5.js | 2 + .../es6ImportDefaultBindingMergeErrors.js | 2 + ...s6ImportDefaultBindingNoDefaultProperty.js | 2 + .../es6ImportDefaultBindingWithExport.js | 2 + .../reference/es6ImportNameSpaceImport.js | 2 + .../reference/es6ImportNameSpaceImportAmd.js | 2 + .../reference/es6ImportNameSpaceImportDts.js | 2 + .../es6ImportNameSpaceImportInEs5.js | 2 + .../es6ImportNameSpaceImportMergeErrors.js | 2 + .../es6ImportNameSpaceImportNoNamedExports.js | 2 + .../es6ImportNameSpaceImportWithExport.js | 2 + .../reference/es6ImportNamedImport.js | 2 + .../reference/es6ImportNamedImportAmd.js | 2 + .../reference/es6ImportNamedImportDts.js | 2 + .../reference/es6ImportNamedImportInEs5.js | 2 + .../es6ImportNamedImportInExportAssignment.js | 2 + ...rtNamedImportInIndirectExportAssignment.js | 2 + .../es6ImportNamedImportMergeErrors.js | 2 + .../es6ImportNamedImportNoExportMember.js | 2 + .../es6ImportNamedImportNoNamedExports.js | 2 + .../es6ImportNamedImportWithExport.js | 2 + .../es6ImportNamedImportWithTypesAndValues.js | 2 + .../es6ImportWithoutFromClauseAmd.js | 3 + .../es6ImportWithoutFromClauseInEs5.js | 2 + .../es6ImportWithoutFromClauseWithExport.js | 2 + .../es6ModuleWithModuleGenTargetAmd.js | 1 + .../es6ModuleWithModuleGenTargetCommonjs.js | 1 + .../reference/exportAndImport-es3-amd.js | 2 + .../reference/exportAndImport-es3.js | 2 + .../reference/exportAndImport-es5-amd.js | 2 + .../reference/exportAndImport-es5.js | 2 + .../reference/exportAssignClassAndModule.js | 2 + .../reference/exportAssignDottedName.js | 2 + .../exportAssignImportedIdentifier.js | 3 + .../reference/exportAssignNonIdentifier.js | 8 + .../baselines/reference/exportAssignTypes.js | 8 + .../reference/exportAssignValueAndType.js | 1 + .../exportAssignedTypeAsTypeAnnotation.js | 2 + .../exportAssignmentAndDeclaration.js | 1 + .../exportAssignmentCircularModules.js | 3 + .../reference/exportAssignmentClass.js | 2 + .../exportAssignmentConstrainedGenericType.js | 2 + .../reference/exportAssignmentEnum.js | 2 + .../reference/exportAssignmentError.js | 1 + .../reference/exportAssignmentFunction.js | 2 + .../reference/exportAssignmentGenericType.js | 2 + .../reference/exportAssignmentInterface.js | 2 + .../exportAssignmentInternalModule.js | 2 + .../exportAssignmentMergedInterface.js | 2 + .../reference/exportAssignmentMergedModule.js | 2 + ...xportAssignmentOfDeclaredExternalModule.js | 2 + .../exportAssignmentOfGenericType1.js | 2 + .../exportAssignmentTopLevelClodule.js | 2 + .../exportAssignmentTopLevelEnumdule.js | 2 + .../exportAssignmentTopLevelFundule.js | 2 + .../exportAssignmentTopLevelIdentifier.js | 2 + .../reference/exportAssignmentVariable.js | 2 + ...AssignmentWithDeclareAndExportModifiers.js | 1 + .../exportAssignmentWithDeclareModifier.js | 1 + .../exportAssignmentWithExportModifier.js | 1 + .../reference/exportAssignmentWithExports.js | 1 + ...signmentWithImportStatementPrivacyError.js | 1 + .../exportAssignmentWithPrivacyError.js | 1 + .../exportAssignmentWithoutIdentifier1.js | 1 + ...ationWithModuleSpecifierNameOnNextLine1.js | 5 + .../reference/exportDeclareClass1.js | 1 + .../reference/exportDeclaredModule.js | 2 + .../reference/exportEqualCallable.js | 2 + .../reference/exportEqualErrorType.js | 2 + .../reference/exportEqualMemberMissing.js | 2 + .../reference/exportEqualNamespaces.js | 1 + tests/baselines/reference/exportImport.js | 3 + .../reference/exportImportMultipleFiles.js | 3 + .../exportImportNonInstantiatedModule2.js | 3 + .../exportNonInitializedVariablesAMD.js | 1 + .../exportNonInitializedVariablesCommonJS.js | 1 + .../exportNonInitializedVariablesSystem.js | 1 + .../exportNonInitializedVariablesUMD.js | 1 + .../reference/exportNonVisibleType.js | 3 + .../reference/exportSameNameFuncVar.js | 1 + .../reference/exportSpecifierForAGlobal.js | 1 + ...rtSpecifierReferencingOuterDeclaration2.js | 1 + ...rtSpecifierReferencingOuterDeclaration4.js | 1 + tests/baselines/reference/exportStar-amd.js | 5 + tests/baselines/reference/exportStar.js | 5 + .../reference/exportStarFromEmptyModule.js | 3 + tests/baselines/reference/exportVisibility.js | 1 + .../exportedBlockScopedDeclarations.js | 1 + ...InterfaceInaccessibleInCallbackInModule.js | 1 + .../baselines/reference/exportedVariable1.js | 1 + .../exportingContainingVisibleType.js | 1 + .../reference/exportsAndImports1-amd.js | 3 + .../reference/exportsAndImports1-es6.js | 3 + .../baselines/reference/exportsAndImports1.js | 3 + .../reference/exportsAndImports2-amd.js | 3 + .../reference/exportsAndImports2-es6.js | 3 + .../baselines/reference/exportsAndImports2.js | 3 + .../reference/exportsAndImports3-amd.js | 3 + .../reference/exportsAndImports3-es6.js | 3 + .../baselines/reference/exportsAndImports3.js | 3 + .../reference/exportsAndImports4-amd.js | 2 + .../reference/exportsAndImports4-es6.js | 2 + .../baselines/reference/exportsAndImports4.js | 2 + ...sAndImportsWithContextualKeywordNames01.js | 4 + ...sAndImportsWithContextualKeywordNames02.js | 4 + .../extendClassExpressionFromModule.js | 2 + ...xtendingClassFromAliasAndUsageInIndexer.js | 4 + .../reference/externalModuleAssignToVar.js | 4 + .../externalModuleExportingGenericClass.js | 2 + .../externalModuleImmutableBindings.js | 2 + .../reference/externalModuleQualification.js | 1 + ...ceOfImportDeclarationWithExportModifier.js | 2 + ...ernceResolutionOrderInImportDeclaration.js | 2 + .../reference/externalModuleResolution.js | 2 + .../reference/externalModuleResolution2.js | 2 + .../externalModuleWithoutCompilerFlag1.js | 1 + .../reference/fieldAndGetterWithSameName.js | 1 + ...ilesEmittingIntoSameOutputWithOutOption.js | 1 + .../reference/genericArrayExtenstions.js | 1 + .../reference/genericClassesInModule2.js | 1 + .../genericInterfaceFunctionTypeParameter.js | 1 + .../reference/genericMemberFunction.js | 1 + ...ericRecursiveImplicitConstructorErrors1.js | 1 + .../reference/genericReturnTypeFromGetter1.js | 1 + .../genericTypeWithMultipleBases1.js | 1 + .../genericTypeWithMultipleBases2.js | 1 + .../genericWithIndexerOfTypeParameterType2.js | 1 + ...getEmitOutputWithDeclarationFile2.baseline | 1 + .../getEmitOutputWithEmitterErrors2.baseline | 1 + tests/baselines/reference/giant.js | 1 + ...sAnExternalModuleInsideAnInternalModule.js | 2 + .../baselines/reference/importAsBaseClass.js | 2 + tests/baselines/reference/importDecl.js | 6 + ...eclRefereingExternalModuleWithNoResolve.js | 1 + .../reference/importDeclWithClassModifiers.js | 1 + .../importDeclWithDeclareModifier.js | 1 + .../reference/importDeclWithExportModifier.js | 1 + ...clWithExportModifierAndExportAssignment.js | 1 + .../importDeclarationUsedAsTypeQuery.js | 2 + .../reference/importImportOnlyModule.js | 3 + .../baselines/reference/importInsideModule.js | 1 + .../reference/importNonExternalModule.js | 1 + .../reference/importNonStringLiteral.js | 1 + .../reference/importShadowsGlobalName.js | 2 + .../baselines/reference/importTsBeforeDTs.js | 2 + .../reference/importUsedInExtendsList1.js | 2 + .../import_reference-exported-alias.js | 2 + .../import_reference-to-type-alias.js | 2 + ...-referenecing-aliased-type-throug-array.js | 1 + ...ar-referencing-an-imported-module-alias.js | 2 + .../importedAliasesInTypePositions.js | 2 + .../reference/importedModuleClassNameClash.js | 1 + .../reference/instanceOfInExternalModules.js | 2 + .../reference/interfaceContextualType.js | 1 + .../reference/interfaceDeclaration3.js | 1 + .../reference/interfaceDeclaration5.js | 1 + .../reference/interfaceImplementation6.js | 1 + ...alAliasClassInsideLocalModuleWithExport.js | 1 + ...liasClassInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...liasClassInsideTopLevelModuleWithExport.js | 1 + ...sClassInsideTopLevelModuleWithoutExport.js | 1 + ...nalAliasEnumInsideLocalModuleWithExport.js | 1 + ...AliasEnumInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...AliasEnumInsideTopLevelModuleWithExport.js | 1 + ...asEnumInsideTopLevelModuleWithoutExport.js | 1 + ...liasFunctionInsideLocalModuleWithExport.js | 1 + ...sFunctionInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...sFunctionInsideTopLevelModuleWithExport.js | 1 + ...nctionInsideTopLevelModuleWithoutExport.js | 1 + ...alizedModuleInsideLocalModuleWithExport.js | 1 + ...zedModuleInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...zedModuleInsideTopLevelModuleWithExport.js | 1 + ...ModuleInsideTopLevelModuleWithoutExport.js | 1 + ...iasInterfaceInsideLocalModuleWithExport.js | 1 + ...InterfaceInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...InterfaceInsideTopLevelModuleWithExport.js | 1 + ...erfaceInsideTopLevelModuleWithoutExport.js | 1 + ...alizedModuleInsideLocalModuleWithExport.js | 1 + ...zedModuleInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...zedModuleInsideTopLevelModuleWithExport.js | 1 + ...ModuleInsideTopLevelModuleWithoutExport.js | 1 + ...rnalAliasVarInsideLocalModuleWithExport.js | 1 + ...lAliasVarInsideLocalModuleWithoutExport.js | 1 + ...sideLocalModuleWithoutExportAccessError.js | 1 + ...lAliasVarInsideTopLevelModuleWithExport.js | 1 + ...iasVarInsideTopLevelModuleWithoutExport.js | 1 + .../isolatedModulesImportExportElision.js | 1 + .../reference/isolatedModulesPlainFile-AMD.js | 1 + .../isolatedModulesPlainFile-CommonJS.js | 1 + .../isolatedModulesPlainFile-System.js | 1 + .../reference/isolatedModulesPlainFile-UMD.js | 1 + .../isolatedModulesSpecifiedModule.js | 1 + .../isolatedModulesUnspecifiedModule.js | 1 + .../reference/jsxImportInAttribute.js | 1 + tests/baselines/reference/jsxViaImport.js | 1 + .../reference/localAliasExportAssignment.js | 2 + .../memberAccessMustUseModuleInstances.js | 2 + .../mergedModuleDeclarationCodeGen.js | 1 + .../missingImportAfterModuleImport.js | 1 + .../moduleAliasAsFunctionArgument.js | 2 + .../baselines/reference/moduleCodeGenTest5.js | 1 + .../baselines/reference/moduleCodegenTest4.js | 1 + tests/baselines/reference/moduleExports1.js | 1 + .../moduleImportedForTypeArgumentPosition.js | 2 + .../reference/moduleInTypePosition1.js | 2 + .../reference/moduleMergeConstructor.js | 1 + .../baselines/reference/modulePrologueAMD.js | 1 + .../reference/modulePrologueCommonjs.js | 2 +- .../reference/modulePrologueSystem.js | 1 + .../baselines/reference/modulePrologueUmd.js | 1 + .../reference/moduleResolutionNoResolve.js | 2 + tests/baselines/reference/moduleScoping.js | 2 + .../baselines/reference/multiImportExport.js | 4 + .../reference/multipleDefaultExports01.js | 2 + .../reference/multipleDefaultExports02.js | 2 + .../reference/multipleDefaultExports03.js | 1 + .../reference/multipleDefaultExports04.js | 1 + .../reference/multipleExportAssignments.js | 1 + tests/baselines/reference/multipleExports.js | 1 + .../reference/nameDelimitedBySlashes.js | 2 + .../reference/nameWithFileExtension.js | 1 + .../reference/nameWithRelativePaths.js | 4 + tests/baselines/reference/nodeResolution1.js | 2 + tests/baselines/reference/nodeResolution2.js | 1 + tests/baselines/reference/nodeResolution3.js | 1 + tests/baselines/reference/nodeResolution4.js | 2 + tests/baselines/reference/nodeResolution5.js | 1 + tests/baselines/reference/nodeResolution6.js | 1 + tests/baselines/reference/nodeResolution7.js | 1 + tests/baselines/reference/nodeResolution8.js | 1 + .../baselines/reference/nonMergedOverloads.js | 1 + tests/baselines/reference/objectIndexer.js | 1 + .../baselines/reference/outModuleConcatAmd.js | 2 + .../reference/outModuleConcatAmd.js.map | 2 +- .../outModuleConcatAmd.sourcemap.txt | 70 +- .../reference/outModuleConcatSystem.js | 2 + .../reference/outModuleConcatSystem.js.map | 2 +- .../outModuleConcatSystem.sourcemap.txt | 66 +- .../reference/outModuleTripleSlashRefs.js | 2 + .../reference/outModuleTripleSlashRefs.js.map | 2 +- .../outModuleTripleSlashRefs.sourcemap.txt | 74 +- .../reference/overloadModifiersMustAgree.js | 1 + tests/baselines/reference/parser0_004152.js | 1 + tests/baselines/reference/parser509546.js | 1 + tests/baselines/reference/parser509546_1.js | 1 + tests/baselines/reference/parser509546_2.js | 2 +- tests/baselines/reference/parser618973.js | 1 + .../reference/parserArgumentList1.js | 1 + tests/baselines/reference/parserClass1.js | 1 + tests/baselines/reference/parserClass2.js | 1 + tests/baselines/reference/parserEnum1.js | 1 + tests/baselines/reference/parserEnum2.js | 1 + tests/baselines/reference/parserEnum3.js | 1 + tests/baselines/reference/parserEnum4.js | 1 + .../reference/parserExportAssignment1.js | 1 + .../reference/parserExportAssignment2.js | 1 + .../reference/parserExportAssignment3.js | 1 + .../reference/parserExportAssignment4.js | 1 + .../reference/parserExportAssignment7.js | 1 + .../reference/parserExportAssignment8.js | 1 + .../reference/parserInterfaceDeclaration6.js | 1 + .../reference/parserInterfaceDeclaration7.js | 1 + .../parserModifierOnStatementInBlock1.js | 1 + .../parserModifierOnStatementInBlock3.js | 1 + tests/baselines/reference/parserModule1.js | 1 + .../prespecializedGenericMembers1.js | 1 + .../reference/privacyAccessorDeclFile.js | 1 + .../privacyCannotNameAccessorDeclFile.js | 3 + .../privacyCannotNameVarTypeDeclFile.js | 3 + .../privacyCheckAnonymousFunctionParameter.js | 1 + ...privacyCheckAnonymousFunctionParameter2.js | 1 + ...lbackOfInterfaceMethodWithTypeParameter.js | 1 + ...rtAssignmentOnExportedGenericInterface1.js | 1 + ...rtAssignmentOnExportedGenericInterface2.js | 1 + ...nalModuleExportAssignmentOfGenericClass.js | 2 + ...arameterReferenceInConstructorParameter.js | 1 + .../reference/privacyCheckTypeOfFunction.js | 1 + tests/baselines/reference/privacyClass.js | 1 + .../privacyClassExtendsClauseDeclFile.js | 1 + .../privacyClassImplementsClauseDeclFile.js | 1 + ...FunctionCannotNameParameterTypeDeclFile.js | 3 + ...acyFunctionCannotNameReturnTypeDeclFile.js | 3 + .../privacyFunctionParameterDeclFile.js | 1 + .../privacyFunctionReturnTypeDeclFile.js | 1 + tests/baselines/reference/privacyGetter.js | 1 + tests/baselines/reference/privacyGloFunc.js | 1 + tests/baselines/reference/privacyImport.js | 1 + .../reference/privacyImportParseErrors.js | 1 + tests/baselines/reference/privacyInterface.js | 1 + .../privacyInterfaceExtendsClauseDeclFile.js | 1 + ...yLocalInternalReferenceImportWithExport.js | 1 + ...calInternalReferenceImportWithoutExport.js | 1 + ...elAmbientExternalModuleImportWithExport.js | 3 + ...mbientExternalModuleImportWithoutExport.js | 3 + ...pLevelInternalReferenceImportWithExport.js | 1 + ...velInternalReferenceImportWithoutExport.js | 1 + .../privacyTypeParameterOfFunction.js | 1 + .../privacyTypeParameterOfFunctionDeclFile.js | 1 + .../reference/privacyTypeParametersOfClass.js | 1 + .../privacyTypeParametersOfClassDeclFile.js | 1 + .../privacyTypeParametersOfInterface.js | 1 + ...rivacyTypeParametersOfInterfaceDeclFile.js | 1 + tests/baselines/reference/privacyVar.js | 1 + .../baselines/reference/privacyVarDeclFile.js | 1 + .../privatePropertyUsingObjectType.js | 1 + .../reference/project/baseline/amd/decl.js | 1 + .../reference/project/baseline/amd/emit.js | 3 - .../reference/project/baseline/node/decl.js | 1 + .../reference/project/baseline/node/emit.js | 2 - .../reference/project/baseline2/amd/decl.js | 1 + .../project/baseline2/amd/dont_emit.js | 3 - .../reference/project/baseline2/node/decl.js | 1 + .../project/baseline2/node/dont_emit.js | 1 - .../project/baseline3/amd/nestedModule.js | 1 + .../project/baseline3/node/nestedModule.js | 1 + .../declarationsCascadingImports/amd/m4.d.ts | 4 - .../declarationsCascadingImports/amd/m4.js | 1 + .../amd/useModule.d.ts | 10 - .../amd/useModule.js | 0 .../declarationsCascadingImports/node/m4.d.ts | 4 - .../declarationsCascadingImports/node/m4.js | 1 + .../node/useModule.d.ts | 10 - .../node/useModule.js | 0 .../declarationsGlobalImport/amd/glo_m4.d.ts | 4 - .../declarationsGlobalImport/amd/glo_m4.js | 1 + .../amd/useModule.d.ts | 4 - .../declarationsGlobalImport/amd/useModule.js | 5 - .../declarationsGlobalImport/node/glo_m4.d.ts | 4 - .../declarationsGlobalImport/node/glo_m4.js | 1 + .../node/useModule.d.ts | 4 - .../node/useModule.js | 4 - .../amd/private_m4.d.ts | 4 - .../amd/private_m4.js | 1 + .../amd/useModule.d.ts | 3 - .../amd/useModule.js | 8 - .../node/private_m4.d.ts | 4 - .../node/private_m4.js | 1 + .../node/useModule.d.ts | 3 - .../node/useModule.js | 8 - .../amd/fncOnly_m4.d.ts | 4 - .../amd/fncOnly_m4.js | 1 + .../amd/useModule.d.ts | 2 - .../amd/useModule.js | 3 - .../node/fncOnly_m4.d.ts | 4 - .../node/fncOnly_m4.js | 1 + .../node/useModule.d.ts | 2 - .../node/useModule.js | 2 - .../amd/m4.js | 1 + .../amd/m5.js | 6 - .../amd/useModule.js | 8 - .../node/m4.js | 1 + .../node/m5.js | 5 - .../node/useModule.js | 8 - .../amd/m4.d.ts | 4 - .../declarationsMultipleTimesImport/amd/m4.js | 1 + .../amd/useModule.d.ts | 12 - .../amd/useModule.js | 17 - .../node/m4.d.ts | 4 - .../node/m4.js | 1 + .../node/useModule.d.ts | 12 - .../node/useModule.js | 18 - .../amd/m4.d.ts | 4 - .../amd/m4.js | 1 + .../amd/m5.d.ts | 2 - .../amd/m5.js | 6 - .../amd/useModule.d.ts | 10 - .../amd/useModule.js | 15 - .../node/m4.d.ts | 4 - .../node/m4.js | 1 + .../node/m5.d.ts | 2 - .../node/m5.js | 5 - .../node/useModule.d.ts | 10 - .../node/useModule.js | 16 - .../declarationsSimpleImport/amd/m4.d.ts | 4 - .../declarationsSimpleImport/amd/m4.js | 1 + .../amd/useModule.d.ts | 9 - .../declarationsSimpleImport/amd/useModule.js | 14 - .../declarationsSimpleImport/node/m4.d.ts | 4 - .../declarationsSimpleImport/node/m4.js | 1 + .../node/useModule.d.ts | 9 - .../node/useModule.js | 13 - ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - ...athModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - ...athModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - ...athModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - ...athModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../maprootUrlModuleSimpleNoOutdir/amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../maprootUrlModuleSimpleNoOutdir/node/m1.js | 13 - .../node/m1.js.map | 2 +- ...prootUrlModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- .../project/nonRelative/amd/consume.js | 8 - .../reference/project/nonRelative/amd/decl.js | 1 + .../project/nonRelative/amd/lib/bar/a.js | 4 - .../project/nonRelative/amd/lib/foo/a.js | 4 - .../project/nonRelative/amd/lib/foo/b.js | 4 - .../project/nonRelative/node/consume.js | 9 - .../project/nonRelative/node/decl.js | 1 + .../project/nonRelative/node/lib/bar/a.js | 2 - .../project/nonRelative/node/lib/foo/a.js | 2 - .../project/nonRelative/node/lib/foo/b.js | 2 - .../outMixedSubfolderNoOutdir/amd/ref/m2.d.ts | 6 - .../outMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../outMixedSubfolderNoOutdir/amd/test.d.ts | 8 - .../outMixedSubfolderNoOutdir/amd/test.js | 12 - .../node/ref/m2.d.ts | 6 - .../outMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../outMixedSubfolderNoOutdir/node/test.d.ts | 8 - .../outMixedSubfolderNoOutdir/node/test.js | 12 - .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 1 + .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 12 - .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 12 - .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 1 + .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 1 + .../amd/diskFile0.js | 14 - .../amd/diskFile1.d.ts | 6 - .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 1 + .../amd/test.d.ts | 10 - .../outModuleMultifolderNoOutdir/amd/test.js | 16 - .../node/diskFile0.js | 12 - .../node/diskFile1.d.ts | 6 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 1 + .../node/test.d.ts | 10 - .../outModuleMultifolderNoOutdir/node/test.js | 16 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 1 + .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 16 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 14 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 1 + .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 16 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 12 - .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 3 + .../outModuleSimpleNoOutdir/amd/m1.d.ts | 6 - .../project/outModuleSimpleNoOutdir/amd/m1.js | 1 + .../outModuleSimpleNoOutdir/amd/test.d.ts | 8 - .../outModuleSimpleNoOutdir/amd/test.js | 15 - .../outModuleSimpleNoOutdir/node/m1.d.ts | 6 - .../outModuleSimpleNoOutdir/node/m1.js | 1 + .../outModuleSimpleNoOutdir/node/test.d.ts | 8 - .../outModuleSimpleNoOutdir/node/test.js | 14 - .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 15 - .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 14 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 2 + .../amd/ref/m1.d.ts | 6 - .../outModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../outModuleSubfolderNoOutdir/amd/test.d.ts | 8 - .../outModuleSubfolderNoOutdir/amd/test.js | 15 - .../node/ref/m1.d.ts | 6 - .../outModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../outModuleSubfolderNoOutdir/node/test.d.ts | 8 - .../outModuleSubfolderNoOutdir/node/test.js | 14 - .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 15 - .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 14 - .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 2 + .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- ...tePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...lutePathModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- ...vePathMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...athModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...tivePathModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...ePathModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- ...rcemapMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...mapModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../sourcemapModuleSimpleNoOutdir/amd/m1.d.ts | 6 - .../sourcemapModuleSimpleNoOutdir/amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../sourcemapModuleSimpleNoOutdir/amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../sourcemapModuleSimpleNoOutdir/node/m1.js | 13 - .../node/m1.js.map | 2 +- ...ourcemapModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...cemapModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m2.d.ts | 6 - .../amd/ref/m2.js | 15 - .../amd/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../amd/test.d.ts | 8 - .../amd/test.js | 13 - .../amd/test.js.map | 1 - .../node/ref/m2.d.ts | 6 - .../node/ref/m2.js | 13 - .../node/ref/m2.js.map | 2 +- ...ootUrlMixedSubfolderNoOutdir.sourcemap.txt | 77 +- .../node/test.d.ts | 8 - .../node/test.js | 13 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m2.d.ts | 6 - .../amd/outdir/simple/ref/m2.js | 15 - .../amd/outdir/simple/ref/m2.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 13 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../node/outdir/simple/ref/m2.d.ts | 6 - .../node/outdir/simple/ref/m2.js | 13 - .../node/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 13 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 77 +- .../amd/bin/test.d.ts | 20 - .../amd/bin/test.js | 37 - .../amd/bin/test.js.map | 2 +- ...edSubfolderSpecifyOutputFile.sourcemap.txt | 149 +- .../amd/bin/outAndOutDirFile.d.ts | 20 - .../amd/bin/outAndOutDirFile.js | 37 - .../amd/bin/outAndOutDirFile.js.map | 2 +- ...OutputFileAndOutputDirectory.sourcemap.txt | 149 +- .../amd/diskFile0.js.map | 1 - .../amd/diskFile1.js | 15 - .../amd/diskFile2.d.ts | 6 - .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 259 ++-- .../amd/test.d.ts | 10 - .../amd/test.js | 17 - .../amd/test.js.map | 1 - .../node/diskFile0.js.map | 1 - .../node/diskFile1.js | 13 - .../node/diskFile2.d.ts | 6 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 287 ++-- .../node/test.d.ts | 10 - .../node/test.js | 17 - .../node/test.js.map | 1 - .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 15 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 15 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 259 ++-- .../outputdir_module_multifolder/ref/m1.d.ts | 6 - .../outputdir_module_multifolder/ref/m1.js | 13 - .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.d.ts | 10 - .../outputdir_module_multifolder/test.js | 17 - .../outputdir_module_multifolder/test.js.map | 1 - .../outputdir_module_multifolder_ref/m2.d.ts | 6 - .../outputdir_module_multifolder_ref/m2.js | 13 - .../m2.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 287 ++-- .../amd/bin/test.d.ts | 28 - .../amd/bin/test.js | 45 - .../amd/bin/test.js.map | 2 +- ...MultifolderSpecifyOutputFile.sourcemap.txt | 259 ++-- .../amd/m1.d.ts | 6 - .../amd/m1.js | 15 - .../amd/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/m1.d.ts | 6 - .../node/m1.js | 13 - .../node/m1.js.map | 2 +- ...erootUrlModuleSimpleNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/m1.d.ts | 6 - .../amd/outdir/simple/m1.js | 15 - .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/m1.d.ts | 6 - .../node/outdir/simple/m1.js | 13 - .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...SimpleSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...oduleSimpleSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/ref/m1.d.ts | 6 - .../amd/ref/m1.js | 15 - .../amd/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 168 +-- .../amd/test.d.ts | 8 - .../amd/test.js | 16 - .../amd/test.js.map | 1 - .../node/ref/m1.d.ts | 6 - .../node/ref/m1.js | 13 - .../node/ref/m1.js.map | 2 +- ...otUrlModuleSubfolderNoOutdir.sourcemap.txt | 182 +-- .../node/test.d.ts | 8 - .../node/test.js | 15 - .../node/test.js.map | 1 - .../amd/outdir/simple/ref/m1.d.ts | 6 - .../amd/outdir/simple/ref/m1.js | 15 - .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.d.ts | 8 - .../amd/outdir/simple/test.js | 16 - .../amd/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 168 +-- .../node/outdir/simple/ref/m1.d.ts | 6 - .../node/outdir/simple/ref/m1.js | 13 - .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.d.ts | 8 - .../node/outdir/simple/test.js | 15 - .../node/outdir/simple/test.js.map | 1 - ...folderSpecifyOutputDirectory.sourcemap.txt | 182 +-- .../amd/bin/test.d.ts | 18 - .../amd/bin/test.js | 30 - .../amd/bin/test.js.map | 2 +- ...leSubfolderSpecifyOutputFile.sourcemap.txt | 168 +-- .../amd/commands.js | 2 - .../amd/fs.js | 1 + .../amd/server.js | 2 - .../node/commands.js | 0 .../node/fs.js | 1 + .../node/server.js | 0 .../propertyIdentityWithPrivacyMismatch.js | 1 + .../protoAsIndexInIndexExpression.js | 1 + .../reference/reExportDefaultExport.js | 2 + ...siveExportAssignmentAndFindAliasedType1.js | 2 + ...siveExportAssignmentAndFindAliasedType2.js | 2 + ...siveExportAssignmentAndFindAliasedType3.js | 2 + ...siveExportAssignmentAndFindAliasedType4.js | 3 + ...siveExportAssignmentAndFindAliasedType5.js | 4 + ...siveExportAssignmentAndFindAliasedType6.js | 5 + ...siveExportAssignmentAndFindAliasedType7.js | 5 + tests/baselines/reference/recursiveMods.js | 1 + .../reference/reexportClassDefinition.js | 3 + .../reference/relativePathMustResolve.js | 1 + .../relativePathToDeclarationFile.js | 1 + .../reference/requireEmitSemicolon.js | 2 + .../reference/requireOfAnEmptyFile1.js | 1 + tests/baselines/reference/reservedWords2.js | 1 + .../reference/reuseInnerModuleMember.js | 2 + tests/baselines/reference/scannerClass2.js | 1 + tests/baselines/reference/scannerEnum1.js | 1 + .../shorthandPropertyAssignmentInES6Module.js | 2 + .../sourceMapValidationExportAssignment.js | 1 + ...sourceMapValidationExportAssignment.js.map | 2 +- ...apValidationExportAssignment.sourcemap.txt | 29 +- ...ceMapValidationExportAssignmentCommonjs.js | 1 + ...pValidationExportAssignmentCommonjs.js.map | 2 +- ...tionExportAssignmentCommonjs.sourcemap.txt | 29 +- .../reference/sourceMapValidationImport.js | 1 + .../sourceMapValidationImport.js.map | 2 +- .../sourceMapValidationImport.sourcemap.txt | 127 +- .../reference/staticInstanceResolution3.js | 2 + .../reference/staticInstanceResolution5.js | 1 + ...dWithTypeParameterExtendsClauseDeclFile.js | 1 + ...odeReservedWordInImportEqualDeclaration.js | 2 +- .../reference/systemExportAssignment.js | 1 + .../reference/systemExportAssignment2.js | 2 + .../reference/systemExportAssignment3.js | 1 + tests/baselines/reference/systemModule1.js | 1 + tests/baselines/reference/systemModule10.js | 1 + .../baselines/reference/systemModule10_ES5.js | 1 + tests/baselines/reference/systemModule11.js | 5 + tests/baselines/reference/systemModule12.js | 1 + tests/baselines/reference/systemModule13.js | 1 + tests/baselines/reference/systemModule14.js | 1 + tests/baselines/reference/systemModule15.js | 4 + tests/baselines/reference/systemModule16.js | 1 + tests/baselines/reference/systemModule17.js | 2 + tests/baselines/reference/systemModule2.js | 1 + tests/baselines/reference/systemModule3.js | 4 + tests/baselines/reference/systemModule4.js | 1 + tests/baselines/reference/systemModule5.js | 1 + tests/baselines/reference/systemModule6.js | 1 + tests/baselines/reference/systemModule7.js | 1 + tests/baselines/reference/systemModule8.js | 1 + tests/baselines/reference/systemModule9.js | 1 + .../systemModuleAmbientDeclarations.js | 6 + .../reference/systemModuleConstEnums.js | 1 + ...stemModuleConstEnumsSeparateCompilation.js | 1 + .../systemModuleDeclarationMerging.js | 1 + .../reference/systemModuleExportDefault.js | 4 + .../systemModuleNonTopLevelModuleMembers.js | 1 + .../reference/systemModuleWithSuperClass.js | 2 + .../thisInInvalidContextsExternalModule.js | 1 + .../reference/topLevelAmbientModule.js | 1 + tests/baselines/reference/topLevelExports.js | 1 + .../baselines/reference/topLevelFileModule.js | 2 + .../reference/topLevelFileModuleMissing.js | 1 + tests/baselines/reference/topLevelLambda4.js | 1 + .../topLevelModuleDeclarationAndFile.js | 1 + .../reference/tsxAttributeResolution10.js | 1 + .../reference/tsxAttributeResolution9.js | 1 + .../reference/tsxElementResolution17.js | 1 + .../reference/tsxElementResolution19.js | 2 + .../reference/tsxExternalModuleEmit1.js | 2 + .../reference/tsxExternalModuleEmit2.js | 1 + tests/baselines/reference/tsxPreserveEmit1.js | 1 + tests/baselines/reference/tsxReactEmit5.js | 1 + .../reference/typeAliasDeclarationEmit.js | 1 + .../reference/typeAliasDeclarationEmit2.js | 1 + ...pressionWithUndefinedCallResolutionData.js | 2 + .../reference/typeGuardsInExternalModule.js | 1 + ...rameterCompatibilityAccrossDeclarations.js | 1 + tests/baselines/reference/typeResolution.js | 1 + .../baselines/reference/typeResolution.js.map | 2 +- .../reference/typeResolution.sourcemap.txt | 1211 +++++++++-------- .../reference/typeofANonExportedType.js | 1 + .../reference/typeofAmbientExternalModules.js | 3 + .../reference/typeofAnExportedType.js | 1 + .../reference/typeofExternalModules.js | 3 + ...typesOnlyExternalModuleStillHasInstance.js | 2 + .../reference/umdDependencyComment2.js | 1 + .../reference/umdDependencyCommentName1.js | 1 + .../reference/umdDependencyCommentName2.js | 1 + .../reference/unclosedExportClause01.js | 5 + .../reference/unclosedExportClause02.js | 5 + .../reference/undeclaredModuleError.js | 1 + .../reference/unusedImportDeclaration.js | 2 + .../reference/varArgsOnConstructorTypes.js | 1 + .../visibilityOfCrossModuleTypeUsage.js | 3 + .../reference/visibilityOfTypeParameters.js | 1 + .../reference/voidAsNonAmbiguousReturnType.js | 2 + tests/baselines/reference/withExportDecl.js | 1 + tests/baselines/reference/withImportDecl.js | 2 + 1927 files changed, 16904 insertions(+), 25258 deletions(-) delete mode 100644 tests/baselines/reference/project/baseline/amd/emit.js delete mode 100644 tests/baselines/reference/project/baseline/node/emit.js delete mode 100644 tests/baselines/reference/project/baseline2/amd/dont_emit.js delete mode 100644 tests/baselines/reference/project/baseline2/node/dont_emit.js delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/nonRelative/amd/consume.js delete mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js delete mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js delete mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js delete mode 100644 tests/baselines/reference/project/nonRelative/node/consume.js delete mode 100644 tests/baselines/reference/project/nonRelative/node/lib/bar/a.js delete mode 100644 tests/baselines/reference/project/nonRelative/node/lib/foo/a.js delete mode 100644 tests/baselines/reference/project/nonRelative/node/lib/foo/b.js delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 694730e61c4b3..3830e53697c72 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -40,6 +40,7 @@ compile(process.argv.slice(2), { at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-minimal-compiler * Please log a "breaking change" issue for any API breaking change affecting this issue */ +"use strict"; var ts = require("typescript"); function compile(fileNames, options) { var program = ts.createProgram(fileNames, options); diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b7b2a93ba87b0..62b201976cd22 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -70,6 +70,7 @@ fileNames.forEach(fileName => { at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#traversing-the-ast-with-a-little-linter * Please log a "breaking change" issue for any API breaking change affecting this issue */ +"use strict"; var ts = require("typescript"); function delint(sourceFile) { delintNode(sourceFile); diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 0f22b8486dc4b..b0783d42a0615 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -22,6 +22,7 @@ console.log(JSON.stringify(result)); at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-simple-transform-function * Please log a "breaking change" issue for any API breaking change affecting this issue */ +"use strict"; var ts = require("typescript"); var source = "let x: string = 'string'"; var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 0b31ca3c7bfe8..1b6d52255fbef 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -109,6 +109,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#incremental-build-support-using-the-language-services * Please log a "breaking change" issue for any API breaking change affecting this issue */ +"use strict"; var ts = require("typescript"); function watch(rootFileNames, options) { var files = {}; diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js index ce4f5d7bf09c0..ae534c9255b6e 100644 --- a/tests/baselines/reference/ExportAssignment7.js +++ b/tests/baselines/reference/ExportAssignment7.js @@ -5,6 +5,7 @@ export class C { export = B; //// [ExportAssignment7.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js index 2f7ac9ee69f7d..be95e66948379 100644 --- a/tests/baselines/reference/ExportAssignment8.js +++ b/tests/baselines/reference/ExportAssignment8.js @@ -5,6 +5,7 @@ export class C { } //// [ExportAssignment8.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index c7f55d0a2df4b..d6bcc74154245 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -30,6 +30,7 @@ export module A { //// [part1.js] +"use strict"; var A; (function (A) { var Utils; @@ -42,6 +43,7 @@ var A; A.Origin = { x: 0, y: 0 }; })(A = exports.A || (exports.A = {})); //// [part2.js] +"use strict"; var A; (function (A) { // collision with 'Origin' var in other part of merged module diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 5283fe1bd9982..0c6ac09a382e0 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -14,6 +14,7 @@ y = moduleA; // should be error //// [aliasAssignments_moduleA.js] +"use strict"; var someClass = (function () { function someClass() { } @@ -21,6 +22,7 @@ var someClass = (function () { })(); exports.someClass = someClass; //// [aliasAssignments_1.js] +"use strict"; var moduleA = require("./aliasAssignments_moduleA"); var x = moduleA; x = 1; // Should be error diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js index 2bd80be86342f..ee9562e7b7751 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.js +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js @@ -23,6 +23,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err //// [aliasOnMergedModuleInterface_0.js] //// [aliasOnMergedModuleInterface_1.js] +"use strict"; var z; z.bar("hello"); // This should be ok var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index bf7a7280f35a8..d067ca1c00aeb 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -28,6 +28,7 @@ class C2 { } //// [aliasUsage1_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -35,6 +36,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsage1_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -50,6 +52,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsage1_main.js] +"use strict"; var moduleA = require("./aliasUsage1_moduleA"); var C2 = (function () { function C2() { diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 108407345b72b..183a885b3c640 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -22,6 +22,7 @@ var xs: IHasVisualizationModel[] = [moduleA]; var xs2: typeof moduleA[] = [moduleA]; //// [aliasUsageInArray_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -29,6 +30,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInArray_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -44,6 +46,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInArray_main.js] +"use strict"; var moduleA = require("./aliasUsageInArray_moduleA"); var xs = [moduleA]; var xs2 = [moduleA]; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index 4229491c4c529..584c894cbad5d 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -21,6 +21,7 @@ var f = (x: IHasVisualizationModel) => x; f = (x) => moduleA; //// [aliasUsageInFunctionExpression_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -28,6 +29,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInFunctionExpression_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -43,6 +45,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInFunctionExpression_main.js] +"use strict"; var moduleA = require("./aliasUsageInFunctionExpression_moduleA"); var f = function (x) { return x; }; f = function (x) { return moduleA; }; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index 7091c6d27c6f7..fe52d71bf3fca 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -25,6 +25,7 @@ var r2 = foo({ a: null }); //// [aliasUsageInGenericFunction_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -32,6 +33,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInGenericFunction_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -47,6 +49,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInGenericFunction_main.js] +"use strict"; var moduleA = require("./aliasUsageInGenericFunction_moduleA"); function foo(x) { return x; diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index 82490739687dc..e4448ef220faf 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -27,6 +27,7 @@ class N2 { } //// [aliasUsageInIndexerOfClass_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -34,6 +35,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInIndexerOfClass_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -49,6 +51,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInIndexerOfClass_main.js] +"use strict"; var moduleA = require("./aliasUsageInIndexerOfClass_moduleA"); var N = (function () { function N() { diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index f1bb99018df64..b0abd11b189e4 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -22,6 +22,7 @@ var b: { x: IHasVisualizationModel } = { x: moduleA }; var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } }; //// [aliasUsageInObjectLiteral_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -29,6 +30,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInObjectLiteral_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -44,6 +46,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInObjectLiteral_main.js] +"use strict"; var moduleA = require("./aliasUsageInObjectLiteral_moduleA"); var a = { x: moduleA }; var b = { x: moduleA }; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index 817ad95aaea50..ff8543bca7682 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -25,6 +25,7 @@ var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null; //// [aliasUsageInOrExpression_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -32,6 +33,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInOrExpression_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -47,6 +49,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInOrExpression_main.js] +"use strict"; var moduleA = require("./aliasUsageInOrExpression_moduleA"); var i; var d1 = i || moduleA; diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index 270a2807319b6..cf256e010eeab 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -25,6 +25,7 @@ class D extends C { } //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -32,6 +33,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -47,6 +49,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInTypeArgumentOfExtendsClause_main.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index f7949348cdd9f..8117aca8c355b 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -21,6 +21,7 @@ var i: IHasVisualizationModel; var m: typeof moduleA = i; //// [aliasUsageInVarAssignment_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -28,6 +29,7 @@ var Model = (function () { })(); exports.Model = Model; //// [aliasUsageInVarAssignment_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -43,5 +45,6 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInVarAssignment_main.js] +"use strict"; var i; var m = i; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index 9893eae6e1c01..9495f8890b66b 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -19,10 +19,13 @@ export var a = function () { //// [aliasUsedAsNameValue_0.js] +"use strict"; //// [aliasUsedAsNameValue_1.js] +"use strict"; function b(a) { return null; } exports.b = b; //// [aliasUsedAsNameValue_2.js] +"use strict"; /// /// var mod = require("./aliasUsedAsNameValue_0"); diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js index 19534b279c020..8304be3a036d3 100644 --- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js +++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js @@ -11,5 +11,7 @@ import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializ var d = b.q3; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js] +"use strict"; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js] +"use strict"; var d = b.q3; diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js index 05f74aef85266..43037c7634ca4 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.js +++ b/tests/baselines/reference/aliasesInSystemModule1.js @@ -18,6 +18,7 @@ module M { //// [aliasesInSystemModule1.js] System.register(['foo'], function(exports_1) { + "use strict"; var alias; var cls, cls2, x, y, z, M; return { diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js index 32d663a11e145..7effb2721be29 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.js +++ b/tests/baselines/reference/aliasesInSystemModule2.js @@ -17,6 +17,7 @@ module M { //// [aliasesInSystemModule2.js] System.register(["foo"], function(exports_1) { + "use strict"; var foo_1; var cls, cls2, x, y, z, M; return { diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js index 7d8491e00629f..42375bc1d09d9 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.js +++ b/tests/baselines/reference/ambientDeclarationsExternal.js @@ -27,6 +27,7 @@ var n: number; //// [decls.js] // Ambient external import declaration referencing ambient external module using top level module name //// [consumer.js] +"use strict"; // Ambient external module members are always exported with or without export keyword when module lacks export assignment var imp3 = require('equ2'); var n = imp3.x; diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js index ea97c54213459..a089cea155b11 100644 --- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js +++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js @@ -13,6 +13,7 @@ var x = ext; //// [ambientExternalModuleInAnotherExternalModule.js] define(["require", "exports", "ext"], function (require, exports, ext) { + "use strict"; var D = (function () { function D() { } diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js index 8a3e15e7c7f46..bb0d3a907ae7c 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js @@ -3,4 +3,5 @@ export declare module "M" { } //// [ambientExternalModuleInsideNonAmbientExternalModule.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js index 1549b725d670f..217d7cb90c1a0 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.js +++ b/tests/baselines/reference/ambientExternalModuleMerging.js @@ -18,6 +18,7 @@ declare module "M" { //// [ambientExternalModuleMerging_use.js] define(["require", "exports", "M"], function (require, exports, M) { + "use strict"; // Should be strings var x = M.x; var y = M.y; diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js index bfcde56cfed35..77d8e2d830dd9 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js @@ -21,5 +21,6 @@ var c = new A(); //// [ambientExternalModuleWithInternalImportDeclaration_0.js] //// [ambientExternalModuleWithInternalImportDeclaration_1.js] define(["require", "exports", 'M'], function (require, exports, A) { + "use strict"; var c = new A(); }); diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js index db6be7be8fc76..158992234a2ee 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js @@ -20,5 +20,6 @@ var c = new A(); //// [ambientExternalModuleWithoutInternalImportDeclaration_0.js] //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js] define(["require", "exports", 'M'], function (require, exports, A) { + "use strict"; var c = new A(); }); diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js index 5db44bb1ce127..0e2d08ae07b17 100644 --- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js +++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js @@ -7,4 +7,5 @@ export declare module M { } //// [ambientInsideNonAmbientExternalModule.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js index ee4ed88ff74f0..2c0bdd551fa0a 100644 --- a/tests/baselines/reference/amdDependencyComment1.js +++ b/tests/baselines/reference/amdDependencyComment1.js @@ -6,5 +6,6 @@ m1.f(); //// [amdDependencyComment1.js] /// +"use strict"; var m1 = require("m2"); m1.f(); diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js index 137e183017a69..6867b03f60651 100644 --- a/tests/baselines/reference/amdDependencyComment2.js +++ b/tests/baselines/reference/amdDependencyComment2.js @@ -7,5 +7,6 @@ m1.f(); //// [amdDependencyComment2.js] /// define(["require", "exports", "m2", "bar"], function (require, exports, m1) { + "use strict"; m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js index b74e58b8538de..19024a09f3cd6 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.js +++ b/tests/baselines/reference/amdDependencyCommentName1.js @@ -6,5 +6,6 @@ m1.f(); //// [amdDependencyCommentName1.js] /// +"use strict"; var m1 = require("m2"); m1.f(); diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js index 6f9f1f268e80e..d60207e2becad 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.js +++ b/tests/baselines/reference/amdDependencyCommentName2.js @@ -7,5 +7,6 @@ m1.f(); //// [amdDependencyCommentName2.js] /// define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) { + "use strict"; m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js index 2b74dc23aed57..1792c0c2aa002 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.js +++ b/tests/baselines/reference/amdDependencyCommentName3.js @@ -11,5 +11,6 @@ m1.f(); /// /// define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) { + "use strict"; m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js index 636d28042576d..52b1010036566 100644 --- a/tests/baselines/reference/amdDependencyCommentName4.js +++ b/tests/baselines/reference/amdDependencyCommentName4.js @@ -26,6 +26,7 @@ import "unaliasedModule2"; /// /// define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) { + "use strict"; r1; aliasedModule2_1.p1; aliasedModule3_1["default"]; diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index fc8d0420842e7..1281b7f7f4757 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -14,6 +14,7 @@ if(foo.E1.A === 0){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; @@ -23,6 +24,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; if (foo.E1.A === 0) { } }); diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index c80da50da143a..3f6bcebab533b 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -33,6 +33,7 @@ var e: number = 0; //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C1 = (function () { function C1() { this.m1 = 42; @@ -50,6 +51,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var i; var x = {}; var y = false; diff --git a/tests/baselines/reference/amdModuleName1.js b/tests/baselines/reference/amdModuleName1.js index e3505a007e361..ccfa8958575eb 100644 --- a/tests/baselines/reference/amdModuleName1.js +++ b/tests/baselines/reference/amdModuleName1.js @@ -11,6 +11,7 @@ export = Foo; //// [amdModuleName1.js] define("NamedModule", ["require", "exports"], function (require, exports) { + "use strict"; /// var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/amdModuleName2.js b/tests/baselines/reference/amdModuleName2.js index 90e50ce1e4814..ff547dd6c3bf5 100644 --- a/tests/baselines/reference/amdModuleName2.js +++ b/tests/baselines/reference/amdModuleName2.js @@ -12,6 +12,7 @@ export = Foo; //// [amdModuleName2.js] define("SecondModuleName", ["require", "exports"], function (require, exports) { + "use strict"; /// /// var Foo = (function () { diff --git a/tests/baselines/reference/arrayOfExportedClass.js b/tests/baselines/reference/arrayOfExportedClass.js index c3f81aca7b003..e86a83ee95dd7 100644 --- a/tests/baselines/reference/arrayOfExportedClass.js +++ b/tests/baselines/reference/arrayOfExportedClass.js @@ -25,6 +25,7 @@ export = Road; //// [arrayOfExportedClass_0.js] +"use strict"; var Car = (function () { function Car() { } @@ -32,6 +33,7 @@ var Car = (function () { })(); module.exports = Car; //// [arrayOfExportedClass_1.js] +"use strict"; var Road = (function () { function Road() { } diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js index 906b807fe73f8..14978ce285c34 100644 --- a/tests/baselines/reference/asOperator4.js +++ b/tests/baselines/reference/asOperator4.js @@ -13,9 +13,11 @@ import { foo } from './foo'; //// [foo.js] +"use strict"; function foo() { } exports.foo = foo; //// [bar.js] +"use strict"; var foo_1 = require('./foo'); // These should emit identically foo_1.foo; diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 104559396cca2..7965aa671ae1d 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -5,6 +5,7 @@ module c5 { } // should be ok everywhere //// [augmentedTypesExternalModule1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 1; var c5 = (function () { function c5() { diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js index 3e748aee23974..4f9e1aae5078a 100644 --- a/tests/baselines/reference/badExternalModuleReference.js +++ b/tests/baselines/reference/badExternalModuleReference.js @@ -8,4 +8,5 @@ export declare var a: { //// [badExternalModuleReference.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/capturedLetConstInLoop4.js b/tests/baselines/reference/capturedLetConstInLoop4.js index 6257d1c697e60..724c84fe04f04 100644 --- a/tests/baselines/reference/capturedLetConstInLoop4.js +++ b/tests/baselines/reference/capturedLetConstInLoop4.js @@ -145,6 +145,7 @@ for (const y = 0; y < 1;) { //// [capturedLetConstInLoop4.js] System.register([], function(exports_1) { + "use strict"; var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c; //======let function exportedFoo() { diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index ec751b0329a91..2b1111f3096bf 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -12,12 +12,14 @@ y.m.foo(); //// [chainedImportAlias_file0.js] +"use strict"; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); //// [chainedImportAlias_file1.js] +"use strict"; var x = require('./chainedImportAlias_file0'); var y = x; y.m.foo(); diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index 02eef63db0602..ca072952b535d 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -34,6 +34,7 @@ export module M1 { //// [foo1.js] +"use strict"; var foo2 = require('./foo2'); var M1; (function (M1) { @@ -48,6 +49,7 @@ var M1; M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); //// [foo2.js] +"use strict"; var foo1 = require('./foo1'); var M1; (function (M1) { diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js index 79191c029e1b9..1be5a06195c63 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.js +++ b/tests/baselines/reference/classAbstractManyKeywords.js @@ -5,6 +5,7 @@ default abstract class C {} import abstract class D {} //// [classAbstractManyKeywords.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index bcf4cd60d7d9d..ae6bd9fe73040 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -20,6 +20,7 @@ export class Test1 { //// [classMemberInitializerWithLamdaScoping3_0.js] var field1; //// [classMemberInitializerWithLamdaScoping3_1.js] +"use strict"; var Test1 = (function () { function Test1(field1) { this.field1 = field1; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index e6fbc48cadd11..a88e2e98a43f6 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -16,7 +16,9 @@ export class Test1 { } //// [classMemberInitializerWithLamdaScoping3_0.js] +"use strict"; //// [classMemberInitializerWithLamdaScoping3_1.js] +"use strict"; var Test1 = (function () { function Test1(field1) { this.field1 = field1; diff --git a/tests/baselines/reference/clinterfaces.js b/tests/baselines/reference/clinterfaces.js index a55924227c9ef..26f4efde61c97 100644 --- a/tests/baselines/reference/clinterfaces.js +++ b/tests/baselines/reference/clinterfaces.js @@ -26,6 +26,7 @@ export = Foo; //// [clinterfaces.js] +"use strict"; var M; (function (M) { var C = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js index 2e4210f49104d..cbf9633b31461 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js @@ -19,18 +19,21 @@ export function foo2() { //// [collisionExportsRequireAndAlias_file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; function bar() { } exports.bar = bar; }); //// [collisionExportsRequireAndAlias_file3333.js] define(["require", "exports"], function (require, exports) { + "use strict"; function bar2() { } exports.bar2 = bar2; }); //// [collisionExportsRequireAndAlias_file2.js] define(["require", "exports", 'collisionExportsRequireAndAlias_file1', 'collisionExportsRequireAndAlias_file3333'], function (require, exports, require, exports) { + "use strict"; function foo() { require.bar(); } diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index 9f4106616a84b..3083e9c586ba0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -39,6 +39,7 @@ module m4 { //// [collisionExportsRequireAndAmbientClass_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m2; (function (m2) { })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index 829f93e4fa775..7f0f76381a308 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -62,6 +62,7 @@ module m4 { //// [collisionExportsRequireAndAmbientEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m2; (function (m2) { })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index c1fb0ce163ac1..37b1a724c2850 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -15,6 +15,7 @@ module m2 { //// [collisionExportsRequireAndAmbientFunction.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m2; (function (m2) { var a = 10; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 4979e9e50ca3d..7f0a5c82d9a7b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -96,6 +96,7 @@ module m4 { //// [collisionExportsRequireAndAmbientModule_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { return null; } diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index 7a552251b158b..1e63364a3967c 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -28,6 +28,7 @@ module m4 { //// [collisionExportsRequireAndAmbientVar_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m2; (function (m2) { var a = 10; diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index f337d9a0a35a0..b993f9a23c58e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -38,6 +38,7 @@ module m4 { //// [collisionExportsRequireAndClass_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; var require = (function () { function require() { } diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index be63fa3285165..3935ee312fb73 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -62,6 +62,7 @@ module m4 { //// [collisionExportsRequireAndEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index e768609f3c683..0fe5405cfb34b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -24,6 +24,7 @@ module m2 { //// [collisionExportsRequireAndFunction.js] define(["require", "exports"], function (require, exports) { + "use strict"; function exports() { return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index 07d23016fe677..71432241b00bc 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -24,6 +24,7 @@ module m2 { //// [collisionExportsRequireAndInternalModuleAlias.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m; (function (m) { var c = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index 112a84bc3e8f6..3c31c94437025 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -93,6 +93,7 @@ module m4 { //// [collisionExportsRequireAndModule_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; var require; (function (require) { var C = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js index 7961015b30b54..6270cf65c027c 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js @@ -16,6 +16,7 @@ export function foo2(): exports.I { //// [collisionExportsRequireAndUninstantiatedModule.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { return null; } diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index 07c8827603ed7..0686b9329211d 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -28,6 +28,7 @@ module m4 { //// [collisionExportsRequireAndVar_externalmodule.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { } exports.foo = foo; diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js index 4c13b0ed72c2b..d9506e0072439 100644 --- a/tests/baselines/reference/commentOnImportStatement1.js +++ b/tests/baselines/reference/commentOnImportStatement1.js @@ -7,4 +7,5 @@ import foo = require('./foo'); //// [commentOnImportStatement1.js] /* Copyright */ define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/commentOnImportStatement2.js b/tests/baselines/reference/commentOnImportStatement2.js index 63cedfcab1850..e7550582dfe11 100644 --- a/tests/baselines/reference/commentOnImportStatement2.js +++ b/tests/baselines/reference/commentOnImportStatement2.js @@ -3,3 +3,4 @@ import foo = require('./foo'); //// [commentOnImportStatement2.js] +"use strict"; diff --git a/tests/baselines/reference/commentOnImportStatement3.js b/tests/baselines/reference/commentOnImportStatement3.js index a230470dcb274..f716fa32baaa7 100644 --- a/tests/baselines/reference/commentOnImportStatement3.js +++ b/tests/baselines/reference/commentOnImportStatement3.js @@ -6,3 +6,4 @@ import foo = require('./foo'); //// [commentOnImportStatement3.js] /* copyright */ +"use strict"; diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js index c82909f8cd414..f172c40cc0df8 100644 --- a/tests/baselines/reference/commentsBeforeVariableStatement1.js +++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js @@ -5,4 +5,5 @@ export var b: number; //// [commentsBeforeVariableStatement1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index b727d8afa721f..ef3e591b55e8e 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -9,6 +9,7 @@ export module outerModule.InnerModule { //// [commentsDottedModuleName.js] define(["require", "exports"], function (require, exports) { + "use strict"; /** this is multi declare module*/ var outerModule; (function (outerModule) { diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index c982e66bf72fb..f1a5781d67b55 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -63,6 +63,7 @@ var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; /** Module comment*/ var m1; (function (m1) { @@ -126,6 +127,7 @@ define(["require", "exports"], function (require, exports) { }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) { + "use strict"; extMod.m1.fooExport(); var newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 2c8b811d7543f..ce367a136e3e0 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; /** Module comment*/ var m1; (function (m1) { @@ -126,6 +127,7 @@ define(["require", "exports"], function (require, exports) { }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) { + "use strict"; extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 2acf93296de81..76ff906155ae1 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -62,6 +62,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] +"use strict"; /** Module comment*/ var m1; (function (m1) { @@ -123,6 +124,7 @@ var m4; m4.fooExport(); var myvar2 = new m4.m2.c(); //// [commentsExternalModules_1.js] +"use strict"; /**This is on import declaration*/ var extMod = require("./commentsExternalModules2_0"); // trailing comment 1 extMod.m1.fooExport(); diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index 3201c25625683..cf85a1b1c02d6 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -38,6 +38,7 @@ new multiM.d(); //// [commentsMultiModuleMultiFile_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; /** this is multi declare module*/ var multiM; (function (multiM) { @@ -72,6 +73,7 @@ define(["require", "exports"], function (require, exports) { }); //// [commentsMultiModuleMultiFile_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; /** this is multi module 3 comment*/ var multiM; (function (multiM) { diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index 9ae5a21c86295..e43b321893af3 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -14,6 +14,7 @@ if(foo.C1.s1){ //// [foo_0.js] +"use strict"; var C1 = (function () { function C1() { this.m1 = 42; @@ -23,6 +24,7 @@ var C1 = (function () { })(); exports.C1 = C1; //// [foo_1.js] +"use strict"; var foo = require("./foo_0"); if (foo.C1.s1) { } diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 266ffe4698afe..8ecda412106aa 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -32,6 +32,7 @@ var z: foo.M1.I2; var e: number = 0; //// [foo_0.js] +"use strict"; var C1 = (function () { function C1() { this.m1 = 42; @@ -47,6 +48,7 @@ exports.C1 = C1; })(exports.E1 || (exports.E1 = {})); var E1 = exports.E1; //// [foo_1.js] +"use strict"; var i; var x = {}; var y = false; diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js index a0ef81cc27782..dd5acba597cee 100644 --- a/tests/baselines/reference/commonjsSafeImport.js +++ b/tests/baselines/reference/commonjsSafeImport.js @@ -11,9 +11,11 @@ Foo(); //// [10_lib.js] +"use strict"; function Foo() { } exports.Foo = Foo; //// [main.js] +"use strict"; var _10_lib_1 = require('./10_lib'); _10_lib_1.Foo(); diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 71b8c99ae58f0..8ebd171600553 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -50,10 +50,12 @@ m.x.toString(); //// [constDeclarations_access_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 0; }); //// [constDeclarations_access_2.js] define(["require", "exports", 'constDeclarations_access_1'], function (require, exports, m) { + "use strict"; // Errors m.x = 1; m.x += 2; diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js index 4054ba788cb63..e0a3f46ee89bd 100644 --- a/tests/baselines/reference/constEnumExternalModule.js +++ b/tests/baselines/reference/constEnumExternalModule.js @@ -12,8 +12,10 @@ var v = A.V; //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [m2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var v = 100 /* V */; }); diff --git a/tests/baselines/reference/constEnumMergingWithValues1.js b/tests/baselines/reference/constEnumMergingWithValues1.js index b35c41da4aceb..1fdfb3fb1dd8d 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.js +++ b/tests/baselines/reference/constEnumMergingWithValues1.js @@ -9,6 +9,7 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { } return foo; }); diff --git a/tests/baselines/reference/constEnumMergingWithValues2.js b/tests/baselines/reference/constEnumMergingWithValues2.js index 9641bdf363ad5..fea628fa540a5 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.js +++ b/tests/baselines/reference/constEnumMergingWithValues2.js @@ -9,6 +9,7 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo = (function () { function foo() { } diff --git a/tests/baselines/reference/constEnumMergingWithValues3.js b/tests/baselines/reference/constEnumMergingWithValues3.js index e191dc2d11030..c2cafb2a5f1ea 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.js +++ b/tests/baselines/reference/constEnumMergingWithValues3.js @@ -9,6 +9,7 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo; (function (foo) { foo[foo["A"] = 0] = "A"; diff --git a/tests/baselines/reference/constEnumMergingWithValues4.js b/tests/baselines/reference/constEnumMergingWithValues4.js index 3f4ee67cb4809..c297b83465418 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.js +++ b/tests/baselines/reference/constEnumMergingWithValues4.js @@ -13,6 +13,7 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo; (function (foo) { var x = 1; diff --git a/tests/baselines/reference/constEnumMergingWithValues5.js b/tests/baselines/reference/constEnumMergingWithValues5.js index 610826b52cefb..45aeff7bba35f 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.js +++ b/tests/baselines/reference/constEnumMergingWithValues5.js @@ -8,6 +8,7 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo; (function (foo) { var E; diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js index 79f158cf7d92b..006c29597b973 100644 --- a/tests/baselines/reference/copyrightWithNewLine1.js +++ b/tests/baselines/reference/copyrightWithNewLine1.js @@ -14,6 +14,7 @@ greeter.start(); * (c) Copyright - Important ****************************/ define(["require", "exports", "./greeter"], function (require, exports, model) { + "use strict"; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js index 507c66fa3af52..15e3c9f79bece 100644 --- a/tests/baselines/reference/copyrightWithoutNewLine1.js +++ b/tests/baselines/reference/copyrightWithoutNewLine1.js @@ -10,6 +10,7 @@ greeter.start(); //// [copyrightWithoutNewLine1.js] define(["require", "exports", "./greeter"], function (require, exports, model) { + "use strict"; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js index e373afe9b2072..549d7948fcbdf 100644 --- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js @@ -14,6 +14,7 @@ export var compileServer = task(() => { //// [crashIntypeCheckInvocationExpression.js] define(["require", "exports"], function (require, exports) { + "use strict"; var nake; function doCompile(fileset, moduleType) { return undefined; diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js index 87deabbdf6b8e..8ae7ccc135487 100644 --- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js @@ -10,6 +10,7 @@ export class BuildWorkspaceService { //// [crashIntypeCheckObjectCreationExpression.js] define(["require", "exports"], function (require, exports) { + "use strict"; var BuildWorkspaceService = (function () { function BuildWorkspaceService() { } diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index f39cd13fdd0a4..6c92f5b18d5a4 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -102,6 +102,7 @@ class c2 { } //// [declFileAccessors_0.js] +"use strict"; /** This is comment for c1*/ var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index 2355d7bbc7aee..9c0ffc6123bba 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -9,6 +9,7 @@ export function bar(a: foo.Foo) { } import foo = require("./declFileAliasUseBeforeDeclaration_foo"); //// [declFileAliasUseBeforeDeclaration_foo.js] +"use strict"; var Foo = (function () { function Foo() { } @@ -16,6 +17,7 @@ var Foo = (function () { })(); exports.Foo = Foo; //// [declFileAliasUseBeforeDeclaration_test.js] +"use strict"; function bar(a) { } exports.bar = bar; diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index a30f0f334c281..f98e2f6aafb7d 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -20,6 +20,7 @@ export var x: SubModule.m.m3.c; //// [declFileAmbientExternalModuleWithSingleExportedModule_0.js] //// [declFileAmbientExternalModuleWithSingleExportedModule_1.js] +"use strict"; //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts] diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js index 2d4519b209037..10b87d4e7770b 100644 --- a/tests/baselines/reference/declFileCallSignatures.js +++ b/tests/baselines/reference/declFileCallSignatures.js @@ -66,6 +66,7 @@ interface IGlobalCallSignatureWithOwnTypeParametes { } //// [declFileCallSignatures_0.js] +"use strict"; //// [declFileCallSignatures_1.js] diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js index c2d1bab986182..1a54642fbd4b2 100644 --- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js +++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js @@ -7,6 +7,7 @@ export class Enhancement { } //// [declFileClassWithStaticMethodReturningConstructor.js] +"use strict"; var Enhancement = (function () { function Enhancement() { } diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js index ae756e32eeda7..993c8ea46371c 100644 --- a/tests/baselines/reference/declFileConstructSignatures.js +++ b/tests/baselines/reference/declFileConstructSignatures.js @@ -66,6 +66,7 @@ interface IGlobalConstructSignatureWithOwnTypeParametes { } //// [declFileConstructSignatures_0.js] +"use strict"; //// [declFileConstructSignatures_1.js] diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js index 327221debf805..e1786dfdd5e10 100644 --- a/tests/baselines/reference/declFileConstructors.js +++ b/tests/baselines/reference/declFileConstructors.js @@ -98,6 +98,7 @@ class GlobalConstructorWithParameterInitializer { } //// [declFileConstructors_0.js] +"use strict"; var SimpleConstructor = (function () { /** This comment should appear for foo*/ function SimpleConstructor() { diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js index 6bd4320426c7d..8a57cef6b255d 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js @@ -22,6 +22,7 @@ import m = m3 export = m; //// [declFileExportAssignmentImportInternalModule.js] +"use strict"; var m3; (function (m3) { })(m3 || (m3 = {})); diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index 4d203705c4a1f..c54c3c7e73111 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -14,9 +14,11 @@ x.a; //// [declFileExportAssignmentOfGenericInterface_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [declFileExportAssignmentOfGenericInterface_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x.a; }); diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 127e8010b4923..88aa985ef7b25 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -26,6 +26,7 @@ export var x: c.b1.a.m2.c1; //// [declFileExportImportChain_a.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m1; (function (m1) { var m2; @@ -42,18 +43,22 @@ define(["require", "exports"], function (require, exports) { }); //// [declFileExportImportChain_b.js] define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) { + "use strict"; exports.a = a; }); //// [declFileExportImportChain_b1.js] define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) { + "use strict"; return b; }); //// [declFileExportImportChain_c.js] define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) { + "use strict"; exports.b1 = b1; }); //// [declFileExportImportChain_d.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 3a644428b8a00..6b633b0fb9776 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -23,6 +23,7 @@ export var x: c.b.m2.c1; //// [declFileExportImportChain2_a.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m1; (function (m1) { var m2; @@ -39,14 +40,17 @@ define(["require", "exports"], function (require, exports) { }); //// [declFileExportImportChain2_b.js] define(["require", "exports", "declFileExportImportChain2_a"], function (require, exports, a) { + "use strict"; return a; }); //// [declFileExportImportChain2_c.js] define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) { + "use strict"; exports.b = b; }); //// [declFileExportImportChain2_d.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js index 88967c4c2a406..266e030128eaf 100644 --- a/tests/baselines/reference/declFileForExportedImport.js +++ b/tests/baselines/reference/declFileForExportedImport.js @@ -12,7 +12,9 @@ export import b = a; var z = b.x; //// [declFileForExportedImport_0.js] +"use strict"; //// [declFileForExportedImport_1.js] +"use strict"; /// exports.a = require('./declFileForExportedImport_0'); var y = exports.a.x; diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js index 163fa1905c8e7..e4f674d43c0f4 100644 --- a/tests/baselines/reference/declFileFunctions.js +++ b/tests/baselines/reference/declFileFunctions.js @@ -78,6 +78,7 @@ function globalfooWithOverloads(a: any): any { } //// [declFileFunctions_0.js] +"use strict"; /** This comment should appear for foo*/ function foo() { } diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index b67bacebb1a68..ccc022f26d52d 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -40,6 +40,7 @@ export var j = C.F6; //// [declFileGenericType.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js index 4ec3893d02fa8..41157907e8b1b 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.js +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -10,6 +10,7 @@ import b = a; export = b; //// [declFileImportChainInExportAssignment.js] +"use strict"; var m; (function (m) { var c; diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index b070b67ad18fc..a733e1332a769 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -27,9 +27,11 @@ a.test1(null, null, null); //// [declFileImportModuleWithExportAssignment_0.js] +"use strict"; var m2; module.exports = m2; //// [declFileImportModuleWithExportAssignment_1.js] +"use strict"; /**This is on import declaration*/ var a1 = require("./declFileImportModuleWithExportAssignment_0"); exports.a = a1; diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js index 547c3f47060cf..4d3f3847ca18a 100644 --- a/tests/baselines/reference/declFileIndexSignatures.js +++ b/tests/baselines/reference/declFileIndexSignatures.js @@ -36,6 +36,7 @@ interface IGlobalIndexSignatureWithTypeParameter { } //// [declFileIndexSignatures_0.js] +"use strict"; //// [declFileIndexSignatures_1.js] diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js index 2b82a4b71b525..c31fd6950ce56 100644 --- a/tests/baselines/reference/declFileMethods.js +++ b/tests/baselines/reference/declFileMethods.js @@ -191,6 +191,7 @@ interface I2 { //// [declFileMethods_0.js] +"use strict"; var c1 = (function () { function c1() { } diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js index b82766e2834cb..f39b35fe1f11e 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js @@ -11,6 +11,7 @@ module m { export = m; //// [declarationEmitImportInExportAssignmentModule.js] +"use strict"; var m; (function (m) { var c; diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.js b/tests/baselines/reference/declarationEmit_exportAssignment.js index d761e2c45ebc6..36f698ec6c797 100644 --- a/tests/baselines/reference/declarationEmit_exportAssignment.js +++ b/tests/baselines/reference/declarationEmit_exportAssignment.js @@ -11,11 +11,13 @@ import {foo} from "./utils"; export = foo; //// [utils.js] +"use strict"; function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; //// [index.js] +"use strict"; var utils_1 = require("./utils"); module.exports = utils_1.foo; diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.js b/tests/baselines/reference/declarationEmit_exportDeclaration.js index e2cb15b408ca0..6c6c37bbcfdec 100644 --- a/tests/baselines/reference/declarationEmit_exportDeclaration.js +++ b/tests/baselines/reference/declarationEmit_exportDeclaration.js @@ -14,11 +14,13 @@ let obj: Buzz; export {bar}; //// [utils.js] +"use strict"; function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; //// [index.js] +"use strict"; var utils_1 = require("./utils"); exports.bar = utils_1.bar; utils_1.foo(); diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js index 857fbee764d91..f0db81e0ac822 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts.js @@ -50,6 +50,7 @@ export module M.Q { } //// [declarationEmit_nameConflicts_1.js] +"use strict"; var f; (function (f) { var c = (function () { @@ -61,6 +62,7 @@ var f; })(f || (f = {})); module.exports = f; //// [declarationEmit_nameConflicts_0.js] +"use strict"; var im = require('./declarationEmit_nameConflicts_1'); var M; (function (M) { diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js index e553229194680..0b99d3e1efe9a 100644 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js @@ -7,6 +7,7 @@ export module M { } //// [declarationEmit_nameConflictsWithAlias.js] +"use strict"; var M; (function (M) { })(M = exports.M || (exports.M = {})); diff --git a/tests/baselines/reference/declareFileExportAssignment.js b/tests/baselines/reference/declareFileExportAssignment.js index ff16eee27fcef..891fb851818b8 100644 --- a/tests/baselines/reference/declareFileExportAssignment.js +++ b/tests/baselines/reference/declareFileExportAssignment.js @@ -19,6 +19,7 @@ var m2: { export = m2; //// [declareFileExportAssignment.js] +"use strict"; var m2; module.exports = m2; diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js index c4acd79545382..ef7afd9dda6b6 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js @@ -19,6 +19,7 @@ var x = 10, m2: { export = m2; //// [declareFileExportAssignmentWithVarFromVariableStatement.js] +"use strict"; var x = 10, m2; module.exports = m2; diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index ee39c1746a28d..51f32d67b4e82 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -22,9 +22,11 @@ class Wat { } //// [a.js] +"use strict"; // from #3108 exports.test = 'abc'; //// [b.js] +"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 35d19ae6fe97f..32ecf919593e4 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -19,6 +19,7 @@ class MyComponent { } //// [service.js] +"use strict"; var Service = (function () { function Service() { } @@ -27,6 +28,7 @@ var Service = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Service; //// [component.js] +"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js index 32aeca93c1be8..46d853a7dcd74 100644 --- a/tests/baselines/reference/decoratorMetadataOnInferredType.js +++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js @@ -18,6 +18,7 @@ export class B { //// [decoratorMetadataOnInferredType.js] +"use strict"; var A = (function () { function A() { console.log('new A'); diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js index 717ae5c4ce25d..28df2186097c1 100644 --- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js +++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js @@ -18,6 +18,7 @@ export class B { //// [decoratorMetadataWithConstructorType.js] +"use strict"; var A = (function () { function A() { console.log('new A'); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js index 392506e53683f..4b37415c4b7d0 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -33,6 +34,7 @@ var db = (function () { })(); exports.db = db; //// [service.js] +"use strict"; var db_1 = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js index da011acf1105c..015ed6eb122ce 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -33,6 +34,7 @@ var db = (function () { })(); exports.db = db; //// [service.js] +"use strict"; var db_1 = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js index b219bba4102f0..0aff28542c095 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -33,6 +34,7 @@ var db = (function () { })(); exports.db = db; //// [service.js] +"use strict"; var db = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js index d0d201e62b5f2..c9f51ae3eed8c 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -33,6 +34,7 @@ var db = (function () { })(); exports.db = db; //// [service.js] +"use strict"; var db_1 = require('./db'); // error no default export function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js index a25995153382b..b5b1dd02ecdf8 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -34,6 +35,7 @@ var db = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] +"use strict"; var db_1 = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js index 917cdc7036f0e..5cb989e750a8c 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -34,6 +35,7 @@ var db = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] +"use strict"; var db_1 = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js index 1dd93b12915f5..7962eae638fee 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -34,6 +35,7 @@ var db = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] +"use strict"; var db_1 = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js index 0aee9e471dd43..d4b24d075e9f7 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js @@ -24,6 +24,7 @@ export {MyClass}; //// [db.js] +"use strict"; var db = (function () { function db() { } @@ -33,6 +34,7 @@ var db = (function () { })(); exports.db = db; //// [service.js] +"use strict"; var database = require('./db'); function someDecorator(target) { return target; diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index 5e5f4e4b07d45..d2258f2e0f357 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -6,6 +6,7 @@ export class C { } //// [decoratorOnClass2.js] +"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js index 5f54f0b4ee6ed..5e6b6b4a62322 100644 --- a/tests/baselines/reference/decoratorOnImportEquals2.js +++ b/tests/baselines/reference/decoratorOnImportEquals2.js @@ -10,4 +10,6 @@ import lib = require('./decoratorOnImportEquals2_0'); declare function dec(target: T): T; //// [decoratorOnImportEquals2_0.js] +"use strict"; //// [decoratorOnImportEquals2_1.js] +"use strict"; diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js index 9ec8cccf5bfca..f88d60182db13 100644 --- a/tests/baselines/reference/defaultExportWithOverloads01.js +++ b/tests/baselines/reference/defaultExportWithOverloads01.js @@ -6,6 +6,7 @@ export default function f(...args: any[]) { } //// [defaultExportWithOverloads01.js] +"use strict"; function f() { var args = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index 99b8ecab1d325..24a37cad2c371 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -31,6 +31,7 @@ Entity.x; Entity.y; //// [m1.js] +"use strict"; function Decl() { return 0; } @@ -42,6 +43,7 @@ var Decl; Decl.y = 20; })(Decl = exports.Decl || (exports.Decl = {})); //// [m2.js] +"use strict"; var m1_1 = require("m1"); m1_1.default(); var x; diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index e3897395c74fd..57b175266c1fc 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -26,6 +26,7 @@ var z = new Entity(); var sum = z.p1 + z.p2 //// [m1.js] +"use strict"; var Decl = (function () { function Decl() { } @@ -34,6 +35,7 @@ var Decl = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; //// [m2.js] +"use strict"; var m1_1 = require("m1"); m1_1.default(); var x; diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index 05e7de9412087..0b4f77bfb10dc 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -26,6 +26,7 @@ var z = new Entity(); var sum = z.p1 + z.p2 //// [m1.js] +"use strict"; var Decl = (function () { function Decl() { } @@ -34,6 +35,7 @@ var Decl = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; //// [m2.js] +"use strict"; var m1_1 = require("m1"); m1_1.default(); var x; diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js index eb1122a819743..7c9bd88bc16df 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge04.js +++ b/tests/baselines/reference/defaultExportsCannotMerge04.js @@ -14,6 +14,7 @@ export interface Foo { } //// [defaultExportsCannotMerge04.js] +"use strict"; function Foo() { } Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js index e94be4a0affe8..4ce37904a222d 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.js +++ b/tests/baselines/reference/dependencyViaImportAlias.js @@ -12,6 +12,7 @@ export = A; //// [A.js] define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A() { } @@ -21,6 +22,7 @@ define(["require", "exports"], function (require, exports) { }); //// [B.js] define(["require", "exports", 'A'], function (require, exports, a) { + "use strict"; var A = a.A; return A; }); diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index b6baf85080027..08e83e7d05654 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -20,7 +20,7 @@ export module M { } //// [downlevelLetConst13.js] -'use strict'; +"use strict";'use strict'; // exported let\const bindings should not be renamed exports.foo = 10; exports.bar = "123"; diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js index 3742a5f1fe54f..934ba3ae567e6 100644 --- a/tests/baselines/reference/duplicateExportAssignments.js +++ b/tests/baselines/reference/duplicateExportAssignments.js @@ -42,10 +42,12 @@ export = z; //// [foo1.js] +"use strict"; var x = 10; var y = 20; module.exports = x; //// [foo2.js] +"use strict"; var x = 10; var y = (function () { function y() { @@ -55,6 +57,7 @@ var y = (function () { ; module.exports = x; //// [foo3.js] +"use strict"; var x; (function (x_1) { x_1.x = 10; @@ -66,6 +69,7 @@ var y = (function () { })(); module.exports = x; //// [foo4.js] +"use strict"; function x() { return 42; } @@ -74,6 +78,7 @@ function y() { } module.exports = x; //// [foo5.js] +"use strict"; var x = 5; var y = "test"; var z = {}; diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index ecde1ff24077e..e155a2e50c9d1 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -346,6 +346,7 @@ export var tests: TestRunner = (function () { })(); //// [duplicateLocalVariable1.js] +"use strict"; / /; commonjs; var TestFileDir = ".\\TempTestFiles"; diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index a8370f317091e..b507e33725073 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -37,6 +37,7 @@ export var tests: TestRunner = (function () { //// [duplicateLocalVariable2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var TestCase = (function () { function TestCase(name, test, errorMessageRegEx) { this.name = name; diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.js b/tests/baselines/reference/duplicateStringNamedProperty1.js index f5e5f90c78d7b..102fba9c3d6ea 100644 --- a/tests/baselines/reference/duplicateStringNamedProperty1.js +++ b/tests/baselines/reference/duplicateStringNamedProperty1.js @@ -5,3 +5,4 @@ export interface Album { } //// [duplicateStringNamedProperty1.js] +"use strict"; diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 45aee387cda86..8a8374a8dd4a6 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -67,6 +67,7 @@ export interface D { } //// [duplicateSymbolsExportMatching.js] define(["require", "exports"], function (require, exports) { + "use strict"; // Should report error only once for instantiated module var M; (function (M) { diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js index 1a9e058971ed2..ef39270c9d1c9 100644 --- a/tests/baselines/reference/dynamicModuleTypecheckError.js +++ b/tests/baselines/reference/dynamicModuleTypecheckError.js @@ -9,6 +9,7 @@ for(var i = 0; i < 30; i++) { //// [dynamicModuleTypecheckError.js] +"use strict"; exports.x = 1; for (var i = 0; i < 30; i++) { exports.x = i * 1000; // should not be an error here diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js index e07ee6fa54a79..573c86425dc9b 100644 --- a/tests/baselines/reference/elidingImportNames.js +++ b/tests/baselines/reference/elidingImportNames.js @@ -16,10 +16,13 @@ export var main = 10; export var main = 10; //// [elidingImportNames_main.js] +"use strict"; exports.main = 10; //// [elidingImportNames_main1.js] +"use strict"; exports.main = 10; //// [elidingImportNames_test.js] +"use strict"; var a = require('./elidingImportNames_main'); // alias used in typeof var b = a; var x; diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js index bb870f717c1cd..892ce5f59b13c 100644 --- a/tests/baselines/reference/emptyModuleName.js +++ b/tests/baselines/reference/emptyModuleName.js @@ -4,6 +4,7 @@ class B extends A { } //// [emptyModuleName.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js index af04d9522b018..5561517341d5b 100644 --- a/tests/baselines/reference/enumFromExternalModule.js +++ b/tests/baselines/reference/enumFromExternalModule.js @@ -11,11 +11,13 @@ var x = f.Mode.Open; //// [enumFromExternalModule_0.js] +"use strict"; (function (Mode) { Mode[Mode["Open"] = 0] = "Open"; })(exports.Mode || (exports.Mode = {})); var Mode = exports.Mode; //// [enumFromExternalModule_1.js] +"use strict"; /// var f = require('./enumFromExternalModule_0'); var x = f.Mode.Open; diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js index 2c991ecd821eb..4c7dca8274e92 100644 --- a/tests/baselines/reference/errorsOnImportedSymbol.js +++ b/tests/baselines/reference/errorsOnImportedSymbol.js @@ -16,6 +16,8 @@ var y = Sammy.Sammy(); //// [errorsOnImportedSymbol_0.js] +"use strict"; //// [errorsOnImportedSymbol_1.js] +"use strict"; var x = new Sammy.Sammy(); var y = Sammy.Sammy(); diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 3ca828c1b4cd1..393302df51826 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -15,6 +15,7 @@ import {Foo, default as assert} from "./es3defaultAliasQuoted_file0"; assert(Foo.CONSTANT === "Foo"); //// [es3defaultAliasQuoted_file0.js] +"use strict"; var Foo = (function () { function Foo() { } @@ -29,5 +30,6 @@ function assert(value) { exports.__esModule = true; exports["default"] = assert; //// [es3defaultAliasQuoted_file1.js] +"use strict"; var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0"); es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo"); diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js index 2a0c6d924ca49..da5bff3aea73c 100644 --- a/tests/baselines/reference/es5-commonjs.js +++ b/tests/baselines/reference/es5-commonjs.js @@ -15,6 +15,7 @@ export default class A //// [es5-commonjs.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js index 174665b41255a..2c38edef6ae44 100644 --- a/tests/baselines/reference/es5-commonjs2.js +++ b/tests/baselines/reference/es5-commonjs2.js @@ -4,5 +4,6 @@ export default 1; //// [es5-commonjs2.js] +"use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = 1; diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js index cc3d0b1527a2a..b2c1c5d68907b 100644 --- a/tests/baselines/reference/es5-commonjs3.js +++ b/tests/baselines/reference/es5-commonjs3.js @@ -5,5 +5,6 @@ export var __esModule = 1; //// [es5-commonjs3.js] +"use strict"; exports.default = "test"; exports.__esModule = 1; diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js index 50a4c49e464f3..56bb5ba5f798d 100644 --- a/tests/baselines/reference/es5-commonjs4.js +++ b/tests/baselines/reference/es5-commonjs4.js @@ -16,6 +16,7 @@ export var __esModule = 1; //// [es5-commonjs4.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js index ead6079eff13e..73c859bb7780f 100644 --- a/tests/baselines/reference/es5-commonjs5.js +++ b/tests/baselines/reference/es5-commonjs5.js @@ -6,6 +6,7 @@ export default function () { //// [es5-commonjs5.js] +"use strict"; function default_1() { return "test"; } diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js index 7c2c8b21779d9..87d2f7d62a6fd 100644 --- a/tests/baselines/reference/es5-commonjs6.js +++ b/tests/baselines/reference/es5-commonjs6.js @@ -5,6 +5,7 @@ var __esModule = 1; //// [es5-commonjs6.js] +"use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; var __esModule = 1; diff --git a/tests/baselines/reference/es5-system.js b/tests/baselines/reference/es5-system.js index 2674527722a9e..1fde76a762cc8 100644 --- a/tests/baselines/reference/es5-system.js +++ b/tests/baselines/reference/es5-system.js @@ -16,6 +16,7 @@ export default class A //// [es5-system.js] System.register([], function(exports_1) { + "use strict"; var A; return { setters:[], diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js index 9b79f5f17b7e2..7a6dd8f10632e 100644 --- a/tests/baselines/reference/es5-umd2.js +++ b/tests/baselines/reference/es5-umd2.js @@ -23,6 +23,7 @@ export class A define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js index 042316b710ee1..0665c52696e9c 100644 --- a/tests/baselines/reference/es5-umd3.js +++ b/tests/baselines/reference/es5-umd3.js @@ -23,6 +23,7 @@ export default class A define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5-umd4.js b/tests/baselines/reference/es5-umd4.js index 81dcf440cb862..546b882cac823 100644 --- a/tests/baselines/reference/es5-umd4.js +++ b/tests/baselines/reference/es5-umd4.js @@ -25,6 +25,7 @@ export = A; define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js index 0d4076e39a183..ee513ea6e5fc6 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js @@ -6,6 +6,7 @@ export default class C { //// [es5ExportDefaultClassDeclaration.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js index 5e5eeae1f0f93..bd348d978936b 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js @@ -6,6 +6,7 @@ export default class { //// [es5ExportDefaultClassDeclaration2.js] +"use strict"; var default_1 = (function () { function default_1() { } diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js index a977447f9ad6d..bd03861330824 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js @@ -15,6 +15,7 @@ var t: typeof C = C; //// [es5ExportDefaultClassDeclaration3.js] +"use strict"; var before = new C(); var C = (function () { function C() { diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js index a825e45971bb6..0821543134c8f 100644 --- a/tests/baselines/reference/es5ExportDefaultExpression.js +++ b/tests/baselines/reference/es5ExportDefaultExpression.js @@ -4,6 +4,7 @@ export default (1 + 2); //// [es5ExportDefaultExpression.js] +"use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = (1 + 2); diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js index afc44ac53f506..55de6b62b8366 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js @@ -4,6 +4,7 @@ export default function f() { } //// [es5ExportDefaultFunctionDeclaration.js] +"use strict"; function f() { } Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js index 10f1db6a0eb1d..e6007cc914751 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js @@ -4,6 +4,7 @@ export default function () { } //// [es5ExportDefaultFunctionDeclaration2.js] +"use strict"; function default_1() { } Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js index af437c087662e..54a2658470ecf 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js @@ -9,6 +9,7 @@ export default function func(): typeof func { var after: typeof func = func(); //// [es5ExportDefaultFunctionDeclaration3.js] +"use strict"; var before = func(); function func() { return func; diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js index c8fb6b3be2785..b3840caf14589 100644 --- a/tests/baselines/reference/es5ExportDefaultIdentifier.js +++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js @@ -6,6 +6,7 @@ export default f; //// [es5ExportDefaultIdentifier.js] +"use strict"; function f() { } exports.f = f; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5ExportEquals.js b/tests/baselines/reference/es5ExportEquals.js index 88d1da4201d34..4697c61976b88 100644 --- a/tests/baselines/reference/es5ExportEquals.js +++ b/tests/baselines/reference/es5ExportEquals.js @@ -6,6 +6,7 @@ export = f; //// [es5ExportEquals.js] +"use strict"; function f() { } exports.f = f; module.exports = f; diff --git a/tests/baselines/reference/es5ExportEqualsDts.js b/tests/baselines/reference/es5ExportEqualsDts.js index 922d012be0ef4..3d2e493a5ac25 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.js +++ b/tests/baselines/reference/es5ExportEqualsDts.js @@ -14,6 +14,7 @@ module A { export = A //// [es5ExportEqualsDts.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index d7d120e8af9c0..506f6bbed33e8 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -34,6 +34,7 @@ export module M { //// [es5ModuleInternalNamedImports.js] define(["require", "exports"], function (require, exports) { + "use strict"; var M; (function (M) { // variable diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js index f4757b539eb49..22c34aa6fffbb 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js @@ -13,6 +13,7 @@ export class A //// [es5ModuleWithModuleGenAmd.js] define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js index b4ca020f56677..ec0c7fafc8559 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js @@ -12,6 +12,7 @@ export class A } //// [es5ModuleWithModuleGenCommonjs.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js index 4f663875adee9..ae6bd73c1ccd0 100644 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js @@ -12,6 +12,7 @@ export class A } //// [es5ModuleWithoutModuleGenTarget.js] +"use strict"; var A = (function () { function A() { } diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js index b87027b21b190..1270ee1df536b 100644 --- a/tests/baselines/reference/es6-umd2.js +++ b/tests/baselines/reference/es6-umd2.js @@ -22,6 +22,7 @@ export class A define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; class A { constructor() { } diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 73689019ed48f..fcd858bf457f7 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -17,6 +17,7 @@ export module uninstantiated { export * from "./server"; //// [server.js] +"use strict"; var c = (function () { function c() { } @@ -29,6 +30,7 @@ var m; })(m = exports.m || (exports.m = {})); exports.x = 10; //// [client.js] +"use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index 8bd908880f6cf..9d30e585fdeb2 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -17,6 +17,7 @@ export { uninstantiated }; export { x }; //// [server.js] +"use strict"; var c = (function () { function c() { } diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 63ac2c04b3e69..83fb99134deea 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -21,6 +21,7 @@ export { uninstantiated } from "./server"; export { x } from "./server"; //// [server.js] +"use strict"; var c = (function () { function c() { } @@ -33,6 +34,7 @@ var m; })(m = exports.m || (exports.m = {})); exports.x = 10; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.c = server_1.c; var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index 747b0b2beb808..3d9c1c95fcd17 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -209,6 +209,7 @@ export * from "class-module"; //// [main.js] /// +"use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js index 9c8cbec9db5cc..9de16453c6e1c 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js +++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js @@ -13,12 +13,14 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import //// [es6ImportDefaultBindingAmd_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; }); //// [es6ImportDefaultBindingAmd_1.js] define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) { + "use strict"; var x = es6ImportDefaultBindingAmd_0_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js index 5593d762f8522..7adac1fab327a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js @@ -12,6 +12,7 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin //// [server.js] +"use strict"; var c = (function () { function c() { } @@ -20,6 +21,7 @@ var c = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = c; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.x = new server_1.default(); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index d6be494a8d1ad..51fc7bf68970b 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -23,11 +23,13 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; exports.default = {}; //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js] +"use strict"; var es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a; var es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 7eda76622defc..fde7556edea25 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -21,10 +21,12 @@ var x: number = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js] +"use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] +"use strict"; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index b83571066f051..6131ff4062453 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -21,10 +21,12 @@ export var x1: number = defaultBinding6; //// [server.js] +"use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.x1 = server_1.default; var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 9314190e786e2..6618fcb9db701 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -25,6 +25,7 @@ export var x6 = new m(); //// [server.js] +"use strict"; var a = (function () { function a() { } @@ -62,6 +63,7 @@ var x11 = (function () { })(); exports.x11 = x11; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.x1 = new server_1.a(); var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index 71d35fd85a176..f2a50fb494b8d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -20,6 +20,7 @@ import defaultBinding6, { m, } from "./server"; export var x6 = new defaultBinding6(); //// [server.js] +"use strict"; var a = (function () { function a() { } @@ -28,6 +29,7 @@ var a = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.x1 = new server_1.default(); var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index 9674f8c12f432..c075c5c934fe6 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -22,10 +22,12 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js] +"use strict"; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index b7da05d7dbbb9..aa89c8d438080 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -24,6 +24,7 @@ export var x1: number = m; //// [server.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -32,6 +33,7 @@ define(["require", "exports"], function (require, exports) { }); //// [client.js] define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) { + "use strict"; exports.x1 = server_1.a; exports.x1 = server_2.a; exports.x1 = server_3.x; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index ada6e423e7350..d62cfbc2872da 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -10,10 +10,12 @@ import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFol var x: number = defaultBinding; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] +"use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] +"use strict"; var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1; var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index a032325fbb446..c19f68463fac3 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -11,12 +11,14 @@ export var x: number = defaultBinding; //// [server.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { + "use strict"; var nameSpaceBinding = server_1; exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 93918f6171a64..c4d43e40daf7f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -9,6 +9,7 @@ import defaultBinding, * as nameSpaceBinding from "./server"; export var x = new nameSpaceBinding.a(); //// [server.js] +"use strict"; var a = (function () { function a() { } @@ -16,6 +17,7 @@ var a = (function () { })(); exports.a = a; //// [client.js] +"use strict"; var server_1 = require("./server"), nameSpaceBinding = server_1; exports.x = new nameSpaceBinding.a(); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js index 639ffce59fd0b..94b3296f36318 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js @@ -11,6 +11,7 @@ export var x = new defaultBinding(); //// [server.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = (function () { function a() { } @@ -21,6 +22,7 @@ define(["require", "exports"], function (require, exports) { }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { + "use strict"; var nameSpaceBinding = server_1; exports.x = new server_1.default(); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 49717c588b707..2639291d854e4 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -9,8 +9,10 @@ import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFol var x: number = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] +"use strict"; exports.a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] +"use strict"; var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1; var x = nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index dec9b8cfebe0e..f417a086df790 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -9,8 +9,10 @@ export import defaultBinding, * as nameSpaceBinding from "./server"; export var x: number = nameSpaceBinding.a; //// [server.js] +"use strict"; exports.a = 10; //// [client.js] +"use strict"; var server_1 = require("./server"), nameSpaceBinding = server_1; exports.x = nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js index 34323b2752bc3..257e76bfe028d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js @@ -9,9 +9,11 @@ export = a; import defaultBinding from "./es6ImportDefaultBindingInEs5_0"; //// [es6ImportDefaultBindingInEs5_0.js] +"use strict"; var a = 10; module.exports = a; //// [es6ImportDefaultBindingInEs5_1.js] +"use strict"; //// [es6ImportDefaultBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js index fb80fdd3e4f5b..e686c3f33c9c6 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js +++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js @@ -17,10 +17,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould //// [es6ImportDefaultBindingMergeErrors_0.js] +"use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [es6ImportDefaultBindingMergeErrors_1.js] +"use strict"; var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js index 1c9ec4eeae529..5513ae565f222 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js +++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js @@ -9,5 +9,7 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0"; //// [es6ImportDefaultBindingNoDefaultProperty_0.js] +"use strict"; exports.a = 10; //// [es6ImportDefaultBindingNoDefaultProperty_1.js] +"use strict"; diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index 2fb7f0644b9ca..cc90d28091478 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -12,12 +12,14 @@ export import defaultBinding2 from "server"; // non referenced //// [server.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { + "use strict"; exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 32bdd78b32995..685e1cf643c24 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -11,8 +11,10 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this //// [es6ImportNameSpaceImport_0.js] +"use strict"; exports.a = 10; //// [es6ImportNameSpaceImport_1.js] +"use strict"; var nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); var x = nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js index e7d0eae9ca96b..093e8385baed2 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js @@ -12,10 +12,12 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi //// [es6ImportNameSpaceImportAmd_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; }); //// [es6ImportNameSpaceImportAmd_1.js] define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) { + "use strict"; var x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js index dfdfe2602a30b..0e6252a76a5ef 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js @@ -10,6 +10,7 @@ export var x = new nameSpaceBinding.c(); import * as nameSpaceBinding2 from "./server"; // unreferenced //// [server.js] +"use strict"; var c = (function () { function c() { } @@ -18,6 +19,7 @@ var c = (function () { exports.c = c; ; //// [client.js] +"use strict"; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.c(); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js index dfc90c3e9af04..252d131f82447 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js @@ -11,8 +11,10 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide //// [es6ImportNameSpaceImportInEs5_0.js] +"use strict"; exports.a = 10; //// [es6ImportNameSpaceImportInEs5_1.js] +"use strict"; var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); var x = nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js index b94640349c0ca..9bdd0318310c2 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js @@ -16,6 +16,8 @@ var nameSpaceBinding3 = 10; //// [es6ImportNameSpaceImportMergeErrors_0.js] +"use strict"; exports.a = 10; //// [es6ImportNameSpaceImportMergeErrors_1.js] +"use strict"; var nameSpaceBinding3 = 10; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js index efa3a04bc9a30..8ece816fd3b6c 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js @@ -9,6 +9,8 @@ export = a; import * as nameSpaceBinding from "./es6ImportNameSpaceImportNoNamedExports_0"; // error //// [es6ImportNameSpaceImportNoNamedExports_0.js] +"use strict"; var a = 10; module.exports = a; //// [es6ImportNameSpaceImportNoNamedExports_1.js] +"use strict"; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index 84f6936d4b0f1..e21ab603f82de 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -12,10 +12,12 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports //// [server.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) { + "use strict"; exports.x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index 3ed7a6adeb03d..73fe8f4ec1b4f 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -42,6 +42,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0"; //// [es6ImportNamedImport_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,6 +52,7 @@ exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; //// [es6ImportNamedImport_1.js] +"use strict"; var es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_1.a; var es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js index c335337325e51..278e4ee07d28f 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.js +++ b/tests/baselines/reference/es6ImportNamedImportAmd.js @@ -43,6 +43,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0"; //// [es6ImportNamedImportAmd_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -54,6 +55,7 @@ define(["require", "exports"], function (require, exports) { }); //// [es6ImportNamedImportAmd_1.js] define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) { + "use strict"; var xxxx = es6ImportNamedImportAmd_0_1.a; var xxxx = es6ImportNamedImportAmd_0_2.a; var xxxx = es6ImportNamedImportAmd_0_3.x; diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index 59b47635ba9e9..ceb8219b2fd78 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -47,6 +47,7 @@ import { aaaa1 as bbbb } from "./server"; //// [server.js] +"use strict"; var a = (function () { function a() { } @@ -132,6 +133,7 @@ var aaaa1 = (function () { })(); exports.aaaa1 = aaaa1; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.xxxx = new server_1.a(); var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js index ce2cbea3d3d05..3f3e4694758f7 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js @@ -42,6 +42,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0"; //// [es6ImportNamedImportInEs5_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,6 +52,7 @@ exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; //// [es6ImportNamedImportInEs5_1.js] +"use strict"; var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0"); var xxxx = es6ImportNamedImportInEs5_0_1.a; var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js index 5bdbd89df0786..b67f61e88aece 100644 --- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js @@ -9,8 +9,10 @@ import { a } from "./es6ImportNamedImportInExportAssignment_0"; export = a; //// [es6ImportNamedImportInExportAssignment_0.js] +"use strict"; exports.a = 10; //// [es6ImportNamedImportInExportAssignment_1.js] +"use strict"; var es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); module.exports = es6ImportNamedImportInExportAssignment_0_1.a; diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index 418cd76c907b2..03c74489bfd36 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -13,6 +13,7 @@ import x = a; export = x; //// [es6ImportNamedImportInIndirectExportAssignment_0.js] +"use strict"; var a; (function (a) { var c = (function () { @@ -23,6 +24,7 @@ var a; a.c = c; })(a = exports.a || (exports.a = {})); //// [es6ImportNamedImportInIndirectExportAssignment_1.js] +"use strict"; var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0"); var x = es6ImportNamedImportInIndirectExportAssignment_0_1.a; module.exports = x; diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index 63bf1127a53b6..002aa5a49ce71 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -21,10 +21,12 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro //// [es6ImportNamedImportMergeErrors_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.z = exports.a; exports.z1 = exports.a; //// [es6ImportNamedImportMergeErrors_1.js] +"use strict"; var x = 10; var x44 = 10; diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js index ba607b4626f1d..71159983b9afb 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js @@ -10,6 +10,8 @@ import { a1 } from "./es6ImportNamedImportNoExportMember_0"; import { x1 as x } from "./es6ImportNamedImportNoExportMember_0"; //// [es6ImportNamedImportNoExportMember_0.js] +"use strict"; exports.a = 10; exports.x = exports.a; //// [es6ImportNamedImport_1.js] +"use strict"; diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js index 273f9a3fc3af2..2198df11f7876 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js +++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js @@ -10,6 +10,8 @@ import { a } from "./es6ImportNamedImportNoNamedExports_0"; import { a as x } from "./es6ImportNamedImportNoNamedExports_0"; //// [es6ImportNamedImportNoNamedExports_0.js] +"use strict"; var a = 10; module.exports = a; //// [es6ImportNamedImportNoNamedExports_1.js] +"use strict"; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 5175554f0f916..21ccb29a57bbf 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -41,6 +41,7 @@ export import { aaaa as bbbb } from "./server"; //// [server.js] +"use strict"; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -50,6 +51,7 @@ exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; //// [client.js] +"use strict"; var server_1 = require("./server"); exports.xxxx = server_1.a; var server_2 = require("./server"); diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index 8593f4e63431f..da401100405ea 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -21,6 +21,7 @@ export type cValInterface = I; export var cVal = new C(); //// [server.js] +"use strict"; var C = (function () { function C() { this.prop = "hello"; @@ -36,6 +37,7 @@ var C2 = (function () { })(); exports.C2 = C2; //// [client.js] +"use strict"; var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file exports.cVal = new server_1.C(); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js index b52c94a5c103f..39b6b04464c1f 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js @@ -15,14 +15,17 @@ var _b = 10; //// [es6ImportWithoutFromClauseAmd_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; }); //// [es6ImportWithoutFromClauseAmd_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.b = 10; }); //// [es6ImportWithoutFromClauseAmd_2.js] define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) { + "use strict"; var _a = 10; var _b = 10; }); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js index aacb936ab3619..c39cd1172a0b3 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js @@ -8,8 +8,10 @@ export var a = 10; import "es6ImportWithoutFromClauseInEs5_0"; //// [es6ImportWithoutFromClauseInEs5_0.js] +"use strict"; exports.a = 10; //// [es6ImportWithoutFromClauseInEs5_1.js] +"use strict"; require("es6ImportWithoutFromClauseInEs5_0"); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 208f71bcbfe9f..5ff5b62d8ecda 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -8,8 +8,10 @@ export var a = 10; export import "server"; //// [server.js] +"use strict"; exports.a = 10; //// [client.js] +"use strict"; require("server"); diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js index dec8de1e36ee1..172ce2a8729d1 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js @@ -13,6 +13,7 @@ export class A //// [es6ModuleWithModuleGenTargetAmd.js] define(["require", "exports"], function (require, exports) { + "use strict"; class A { constructor() { } diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js index 36e66cb572135..f932bb7072ff6 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js @@ -12,6 +12,7 @@ export class A } //// [es6ModuleWithModuleGenTargetCommonjs.js] +"use strict"; class A { constructor() { } diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js index d2293a56e2365..5f37f0f022030 100644 --- a/tests/baselines/reference/exportAndImport-es3-amd.js +++ b/tests/baselines/reference/exportAndImport-es3-amd.js @@ -14,6 +14,7 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; function f1() { } exports.__esModule = true; @@ -21,6 +22,7 @@ define(["require", "exports"], function (require, exports) { }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { + "use strict"; function f2() { m1_1["default"](); } diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js index 1be548bc9305c..ee1f562258f2b 100644 --- a/tests/baselines/reference/exportAndImport-es3.js +++ b/tests/baselines/reference/exportAndImport-es3.js @@ -13,11 +13,13 @@ export default function f2() { //// [m1.js] +"use strict"; function f1() { } exports.__esModule = true; exports["default"] = f1; //// [m2.js] +"use strict"; var m1_1 = require("./m1"); function f2() { m1_1["default"](); diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js index 447356b12302a..0e2cb890d2a7c 100644 --- a/tests/baselines/reference/exportAndImport-es5-amd.js +++ b/tests/baselines/reference/exportAndImport-es5-amd.js @@ -14,6 +14,7 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { + "use strict"; function f1() { } Object.defineProperty(exports, "__esModule", { value: true }); @@ -21,6 +22,7 @@ define(["require", "exports"], function (require, exports) { }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { + "use strict"; function f2() { m1_1.default(); } diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js index c0bacb94aeef0..1d2511735c7f9 100644 --- a/tests/baselines/reference/exportAndImport-es5.js +++ b/tests/baselines/reference/exportAndImport-es5.js @@ -13,11 +13,13 @@ export default function f2() { //// [m1.js] +"use strict"; function f1() { } Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f1; //// [m2.js] +"use strict"; var m1_1 = require("./m1"); function f2() { m1_1.default(); diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index d440fb9a8e5ed..0fbfcc939482a 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -19,6 +19,7 @@ var zz: Foo; zz.x; //// [exportAssignClassAndModule_0.js] +"use strict"; var Foo = (function () { function Foo() { } @@ -26,6 +27,7 @@ var Foo = (function () { })(); module.exports = Foo; //// [exportAssignClassAndModule_1.js] +"use strict"; var z; var zz; zz.x; diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js index 5784f9116f1f9..39fd33b01319d 100644 --- a/tests/baselines/reference/exportAssignDottedName.js +++ b/tests/baselines/reference/exportAssignDottedName.js @@ -11,10 +11,12 @@ export = foo1.x; // Ok //// [foo1.js] +"use strict"; function x() { return true; } exports.x = x; //// [foo2.js] +"use strict"; var foo1 = require('./foo1'); module.exports = foo1.x; diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js index b371e4db5e06d..334f33fdc3444 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.js +++ b/tests/baselines/reference/exportAssignImportedIdentifier.js @@ -15,14 +15,17 @@ import foo2 = require('./foo2'); var x = foo2(); // should be boolean //// [foo1.js] +"use strict"; function x() { return true; } exports.x = x; //// [foo2.js] +"use strict"; var foo1 = require('./foo1'); var x = foo1.x; module.exports = x; //// [foo3.js] +"use strict"; var foo2 = require('./foo2'); var x = foo2(); // should be boolean diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js index 343405c862494..8a266a35396bf 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.js +++ b/tests/baselines/reference/exportAssignNonIdentifier.js @@ -28,23 +28,31 @@ export = null; // Ok //// [foo1.js] +"use strict"; var x = 10; module.exports = typeof x; //// [foo2.js] +"use strict"; module.exports = "sausages"; //// [foo3.js] +"use strict"; module.exports = (function () { function Foo3() { } return Foo3; })(); //// [foo4.js] +"use strict"; module.exports = true; //// [foo5.js] +"use strict"; module.exports = undefined; //// [foo6.js] +"use strict"; module.exports = void ; //// [foo7.js] +"use strict"; module.exports = Date || String; //// [foo8.js] +"use strict"; module.exports = null; diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js index e898f798a7c50..60cf4e7eef54f 100644 --- a/tests/baselines/reference/exportAssignTypes.js +++ b/tests/baselines/reference/exportAssignTypes.js @@ -54,29 +54,37 @@ var v7: {(p1: x): x} = iGeneric; //// [expString.js] +"use strict"; var x = "test"; module.exports = x; //// [expNumber.js] +"use strict"; var x = 42; module.exports = x; //// [expBoolean.js] +"use strict"; var x = true; module.exports = x; //// [expArray.js] +"use strict"; var x = [1, 2]; module.exports = x; //// [expObject.js] +"use strict"; var x = { answer: 42, when: 1776 }; module.exports = x; //// [expAny.js] +"use strict"; var x; module.exports = x; //// [expGeneric.js] +"use strict"; function x(a) { return a; } module.exports = x; //// [consumer.js] +"use strict"; var iString = require('./expString'); var v1 = iString; var iNumber = require('./expNumber'); diff --git a/tests/baselines/reference/exportAssignValueAndType.js b/tests/baselines/reference/exportAssignValueAndType.js index 016ce6f24c1cf..70be1ce722b74 100644 --- a/tests/baselines/reference/exportAssignValueAndType.js +++ b/tests/baselines/reference/exportAssignValueAndType.js @@ -15,6 +15,7 @@ export = server; //// [exportAssignValueAndType.js] +"use strict"; var x = 5; var server = new Date(); module.exports = server; diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js index 40a370caf4181..26a43e10c6cf7 100644 --- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js +++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js @@ -16,8 +16,10 @@ var t2: test; // should not raise a 'container type' error //// [exportAssignedTypeAsTypeAnnotation_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [exportAssignedTypeAsTypeAnnotation_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var t2; // should not raise a 'container type' error }); diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js index c1d6510b1f719..b2202df50e6fa 100644 --- a/tests/baselines/reference/exportAssignmentAndDeclaration.js +++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js @@ -12,6 +12,7 @@ export = C1; //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; diff --git a/tests/baselines/reference/exportAssignmentCircularModules.js b/tests/baselines/reference/exportAssignmentCircularModules.js index 7634418179bca..73338840590ac 100644 --- a/tests/baselines/reference/exportAssignmentCircularModules.js +++ b/tests/baselines/reference/exportAssignmentCircularModules.js @@ -24,6 +24,7 @@ export = Foo; //// [foo_1.js] define(["require", "exports", "./foo_2"], function (require, exports, foo2) { + "use strict"; var Foo; (function (Foo) { Foo.x = foo2.x; @@ -32,6 +33,7 @@ define(["require", "exports", "./foo_2"], function (require, exports, foo2) { }); //// [foo_0.js] define(["require", "exports", './foo_1'], function (require, exports, foo1) { + "use strict"; var Foo; (function (Foo) { Foo.x = foo1.x; @@ -40,6 +42,7 @@ define(["require", "exports", './foo_1'], function (require, exports, foo1) { }); //// [foo_2.js] define(["require", "exports", "./foo_0"], function (require, exports, foo0) { + "use strict"; var Foo; (function (Foo) { Foo.x = foo0.x; diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js index a010a1e1cd2f4..000684f1a9fbb 100644 --- a/tests/baselines/reference/exportAssignmentClass.js +++ b/tests/baselines/reference/exportAssignmentClass.js @@ -13,6 +13,7 @@ var x = d.p; //// [exportAssignmentClass_A.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C = (function () { function C() { this.p = 0; @@ -23,6 +24,7 @@ define(["require", "exports"], function (require, exports) { }); //// [exportAssignmentClass_B.js] define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) { + "use strict"; var d = new D(); var x = d.p; }); diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index b62cc8251beed..08c1adb3a04c1 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -15,6 +15,7 @@ var y = new foo({a: "test", b: 42}); // Should be OK var z: number = y.test.b; //// [foo_0.js] +"use strict"; var Foo = (function () { function Foo(x) { } @@ -22,6 +23,7 @@ var Foo = (function () { })(); module.exports = Foo; //// [foo_1.js] +"use strict"; var foo = require("./foo_0"); var x = new foo(true); // Should error var y = new foo({ a: "test", b: 42 }); // Should be OK diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js index 06438fb2b5300..a4ae6898bce75 100644 --- a/tests/baselines/reference/exportAssignmentEnum.js +++ b/tests/baselines/reference/exportAssignmentEnum.js @@ -17,6 +17,7 @@ var b = EnumE.B; var c = EnumE.C; //// [exportAssignmentEnum_A.js] +"use strict"; var E; (function (E) { E[E["A"] = 0] = "A"; @@ -25,6 +26,7 @@ var E; })(E || (E = {})); module.exports = E; //// [exportAssignmentEnum_B.js] +"use strict"; var EnumE = require("./exportAssignmentEnum_A"); var a = EnumE.A; var b = EnumE.B; diff --git a/tests/baselines/reference/exportAssignmentError.js b/tests/baselines/reference/exportAssignmentError.js index adf9d741dbe3c..41485d228e550 100644 --- a/tests/baselines/reference/exportAssignmentError.js +++ b/tests/baselines/reference/exportAssignmentError.js @@ -10,6 +10,7 @@ export = M2; // should not error //// [exportEqualsModule_A.js] define(["require", "exports"], function (require, exports) { + "use strict"; var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js index 825d0f983ea4e..c8e90571cdbc9 100644 --- a/tests/baselines/reference/exportAssignmentFunction.js +++ b/tests/baselines/reference/exportAssignmentFunction.js @@ -12,10 +12,12 @@ var n: number = fooFunc(); //// [exportAssignmentFunction_A.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { return 0; } return foo; }); //// [exportAssignmentFunction_B.js] define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) { + "use strict"; var n = fooFunc(); }); diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js index b087287c34f58..e9c6e82152207 100644 --- a/tests/baselines/reference/exportAssignmentGenericType.js +++ b/tests/baselines/reference/exportAssignmentGenericType.js @@ -13,6 +13,7 @@ var y:number = x.test; //// [foo_0.js] +"use strict"; var Foo = (function () { function Foo() { } @@ -20,6 +21,7 @@ var Foo = (function () { })(); module.exports = Foo; //// [foo_1.js] +"use strict"; var foo = require("./foo_0"); var x = new foo(); var y = x.test; diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js index 22b30c03db6b4..be3f696b19b75 100644 --- a/tests/baselines/reference/exportAssignmentInterface.js +++ b/tests/baselines/reference/exportAssignmentInterface.js @@ -16,9 +16,11 @@ var n: number = i.p1; //// [exportAssignmentInterface_A.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [exportAssignmentInterface_B.js] define(["require", "exports"], function (require, exports) { + "use strict"; var i; var n = i.p1; }); diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index 3426519e626a4..7b2443fc26d6f 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -14,6 +14,7 @@ var n: number = modM.x; //// [exportAssignmentInternalModule_A.js] define(["require", "exports"], function (require, exports) { + "use strict"; var M; (function (M) { })(M || (M = {})); @@ -21,5 +22,6 @@ define(["require", "exports"], function (require, exports) { }); //// [exportAssignmentInternalModule_B.js] define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) { + "use strict"; var n = modM.x; }); diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js index f99d7f3a46555..97c6941cc338f 100644 --- a/tests/baselines/reference/exportAssignmentMergedInterface.js +++ b/tests/baselines/reference/exportAssignmentMergedInterface.js @@ -24,9 +24,11 @@ z = x.d; //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x; x("test"); x(42); diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index 51413796eb249..8d78799a05b51 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -25,6 +25,7 @@ if(!!foo.b){ } //// [foo_0.js] +"use strict"; var Foo; (function (Foo) { function a() { @@ -46,6 +47,7 @@ var Foo; })(Foo || (Foo = {})); module.exports = Foo; //// [foo_1.js] +"use strict"; var foo = require("./foo_0"); var a = foo.a(); if (!!foo.b) { diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js index 460707a3502ca..a2ddd50511ca7 100644 --- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js +++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js @@ -17,7 +17,9 @@ var a = new z(); // constructor - no error var b = z(); // call signature - no error //// [exportAssignmentOfDeclaredExternalModule_0.js] +"use strict"; //// [exportAssignmentOfDeclaredExternalModule_1.js] +"use strict"; var x = new Sammy(); // error to use as constructor as there is not constructor symbol var y = Sammy(); // error to use interface name as call target var z; // no error - z is of type interface Sammy from module 'M' diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js index 59fa01f2ca035..54d936a410181 100644 --- a/tests/baselines/reference/exportAssignmentOfGenericType1.js +++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js @@ -15,6 +15,7 @@ var r: string = m.foo; //// [exportAssignmentOfGenericType1_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var T = (function () { function T() { } @@ -29,6 +30,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) { + "use strict"; var M = (function (_super) { __extends(M, _super); function M() { diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index e0946dc48f2a2..28075a7e55b3b 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -18,6 +18,7 @@ if(foo.answer === 42){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Foo = (function () { function Foo() { this.test = "test"; @@ -32,6 +33,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; if (foo.answer === 42) { var x = new foo(); } diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index 791fc4fbd7f96..2516b1b0e2877 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -19,6 +19,7 @@ if(color === foo.green){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo; (function (foo) { foo[foo["red"] = 0] = "red"; @@ -33,6 +34,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; var color; if (color === foo.green) { color = foo.answer; diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index cccde9ede3af6..d151a61d53930 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -18,6 +18,7 @@ if(foo.answer === 42){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { return "test"; } @@ -29,6 +30,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; if (foo.answer === 42) { var x = foo(); } diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index a89559a055024..03b4ae26af9a6 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -15,6 +15,7 @@ if(foo.answer === 42){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Foo; (function (Foo) { Foo.answer = 42; @@ -23,6 +24,7 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; if (foo.answer === 42) { } }); diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js index 8afbf222e6d9c..68a195230df60 100644 --- a/tests/baselines/reference/exportAssignmentVariable.js +++ b/tests/baselines/reference/exportAssignmentVariable.js @@ -11,8 +11,10 @@ import y = require("./exportAssignmentVariable_A"); var n: number = y; //// [exportAssignmentVariable_A.js] +"use strict"; var x = 0; module.exports = x; //// [exportAssignmentVariable_B.js] +"use strict"; var y = require("./exportAssignmentVariable_A"); var n = y; diff --git a/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.js b/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.js index 74396bb951bf8..b5329b78bcb9e 100644 --- a/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.js +++ b/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.js @@ -3,5 +3,6 @@ var x; export declare export = x; //// [exportAssignmentWithDeclareAndExportModifiers.js] +"use strict"; var x; module.exports = x; diff --git a/tests/baselines/reference/exportAssignmentWithDeclareModifier.js b/tests/baselines/reference/exportAssignmentWithDeclareModifier.js index 711538616aa46..9cade7577bcce 100644 --- a/tests/baselines/reference/exportAssignmentWithDeclareModifier.js +++ b/tests/baselines/reference/exportAssignmentWithDeclareModifier.js @@ -3,5 +3,6 @@ var x; declare export = x; //// [exportAssignmentWithDeclareModifier.js] +"use strict"; var x; module.exports = x; diff --git a/tests/baselines/reference/exportAssignmentWithExportModifier.js b/tests/baselines/reference/exportAssignmentWithExportModifier.js index 9d94cc8db7530..1a2f5c40ab864 100644 --- a/tests/baselines/reference/exportAssignmentWithExportModifier.js +++ b/tests/baselines/reference/exportAssignmentWithExportModifier.js @@ -3,5 +3,6 @@ var x; export export = x; //// [exportAssignmentWithExportModifier.js] +"use strict"; var x; module.exports = x; diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js index 65d2253e3f86d..9f43a515ad06a 100644 --- a/tests/baselines/reference/exportAssignmentWithExports.js +++ b/tests/baselines/reference/exportAssignmentWithExports.js @@ -4,6 +4,7 @@ class D { } export = D; //// [exportAssignmentWithExports.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js index adfb85ae4bcb9..3e8c46cca11ba 100644 --- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js +++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js @@ -23,6 +23,7 @@ export = M; //// [exportAssignmentWithImportStatementPrivacyError.js] define(["require", "exports"], function (require, exports) { + "use strict"; var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/exportAssignmentWithPrivacyError.js b/tests/baselines/reference/exportAssignmentWithPrivacyError.js index 57d3ae6c487ff..69daab5ac5b1d 100644 --- a/tests/baselines/reference/exportAssignmentWithPrivacyError.js +++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.js @@ -19,6 +19,7 @@ export = server; //// [exportAssignmentWithPrivacyError.js] define(["require", "exports"], function (require, exports) { + "use strict"; var server; return server; }); diff --git a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js index 4929eaffd6b3c..1be46dddd35ca 100644 --- a/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js +++ b/tests/baselines/reference/exportAssignmentWithoutIdentifier1.js @@ -9,6 +9,7 @@ export = new Greeter(); //// [exportAssignmentWithoutIdentifier1.js] +"use strict"; function Greeter() { //... } diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index a6700fb5e5931..19f872bad270e 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -21,14 +21,19 @@ export { x as a, } from "./t1"; //// [t1.js] +"use strict"; exports.x = "x"; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.x = t1_1.x; //// [t3.js] +"use strict"; //// [t4.js] +"use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; //// [t5.js] +"use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js index 121db110cc148..18ced8df9d683 100644 --- a/tests/baselines/reference/exportDeclareClass1.js +++ b/tests/baselines/reference/exportDeclareClass1.js @@ -11,6 +11,7 @@ //// [exportDeclareClass1.js] define(["require", "exports"], function (require, exports) { + "use strict"; ; ; }); diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js index 7aa75288bff11..af0f1b9eca150 100644 --- a/tests/baselines/reference/exportDeclaredModule.js +++ b/tests/baselines/reference/exportDeclaredModule.js @@ -13,7 +13,9 @@ import foo1 = require('./foo1'); var x: number = foo1.b(); //// [foo1.js] +"use strict"; module.exports = M1; //// [foo2.js] +"use strict"; var foo1 = require('./foo1'); var x = foo1.b(); diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js index 34df64f5e482b..681c3ca4c19b0 100644 --- a/tests/baselines/reference/exportEqualCallable.js +++ b/tests/baselines/reference/exportEqualCallable.js @@ -15,10 +15,12 @@ connect(); //// [exportEqualCallable_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var server; return server; }); //// [exportEqualCallable_1.js] define(["require", "exports", 'exportEqualCallable_0'], function (require, exports, connect) { + "use strict"; connect(); }); diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js index 533a2c2501ce6..653c705215331 100644 --- a/tests/baselines/reference/exportEqualErrorType.js +++ b/tests/baselines/reference/exportEqualErrorType.js @@ -23,10 +23,12 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' doe //// [exportEqualErrorType_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var server; return server; }); //// [exportEqualErrorType_1.js] define(["require", "exports", 'exportEqualErrorType_0'], function (require, exports, connect) { + "use strict"; connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. }); diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js index 85972ce094588..b25ef1d3083d4 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.js +++ b/tests/baselines/reference/exportEqualMemberMissing.js @@ -22,9 +22,11 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' does not //// [exportEqualMemberMissing_0.js] +"use strict"; var server; module.exports = server; //// [exportEqualMemberMissing_1.js] +"use strict"; /// var connect = require('./exportEqualMemberMissing_0'); connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. diff --git a/tests/baselines/reference/exportEqualNamespaces.js b/tests/baselines/reference/exportEqualNamespaces.js index a95d1fd3d58e3..75189a78ccb6c 100644 --- a/tests/baselines/reference/exportEqualNamespaces.js +++ b/tests/baselines/reference/exportEqualNamespaces.js @@ -15,6 +15,7 @@ export = server; //// [exportEqualNamespaces.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 5; var server = new Date(); return server; diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index 6d8748516aed1..0177bbbecaaf7 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -17,6 +17,7 @@ export function w(): e.w { // Should be OK //// [w1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -27,10 +28,12 @@ define(["require", "exports"], function (require, exports) { }); //// [exporter.js] define(["require", "exports", './w1'], function (require, exports, w) { + "use strict"; exports.w = w; }); //// [consumer.js] define(["require", "exports", './exporter'], function (require, exports, e) { + "use strict"; function w() { return new e.w(); } diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index 10909808ffc29..6a0bf61459e35 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -14,15 +14,18 @@ lib.math.add(3, 4); // Shouldnt be error //// [exportImportMultipleFiles_math.js] define(["require", "exports"], function (require, exports) { + "use strict"; function add(a, b) { return a + b; } exports.add = add; }); //// [exportImportMultipleFiles_library.js] define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) { + "use strict"; exports.math = math; exports.math.add(3, 4); // OK }); //// [exportImportMultipleFiles_userCode.js] define(["require", "exports", './exportImportMultipleFiles_library'], function (require, exports, lib) { + "use strict"; lib.math.add(3, 4); // Shouldnt be error }); diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 2782a6f6f67bf..401183a5ead58 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -17,12 +17,15 @@ export function w(): e.w { // Should be OK //// [w1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [exporter.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [consumer.js] define(["require", "exports"], function (require, exports) { + "use strict"; function w() { return { name: 'value' }; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index 3b61281eaba23..9759f41831b66 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -36,6 +36,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesAMD.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ; let; var ; diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index c1d308b1b9419..047b22c2ce1d9 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -35,6 +35,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesCommonJS.js] +"use strict"; var ; let; var ; diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js index 3b9c5d759dc0e..c2b78f35cc2e8 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js @@ -36,6 +36,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesSystem.js] System.register([], function(exports_1) { + "use strict"; var a, b, c, d, A, e, f, B, C, a1, b1, c1, d1, D, e1, f1, g1, h1; return { setters:[], diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index 4b1e671669c89..2567fb57ecfe2 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -43,6 +43,7 @@ export let h1: D = new D; define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; var ; let; var ; diff --git a/tests/baselines/reference/exportNonVisibleType.js b/tests/baselines/reference/exportNonVisibleType.js index 101c356d582a5..ad2b2a9d910a8 100644 --- a/tests/baselines/reference/exportNonVisibleType.js +++ b/tests/baselines/reference/exportNonVisibleType.js @@ -36,9 +36,11 @@ export = C1; // Should work, private type I1 of visible class C1 only used in pr //// [foo1.js] +"use strict"; var x = { a: "test", b: 42 }; module.exports = x; //// [foo2.js] +"use strict"; var C1 = (function () { function C1() { } @@ -46,6 +48,7 @@ var C1 = (function () { })(); module.exports = C1; //// [foo3.js] +"use strict"; var C1 = (function () { function C1() { } diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js index 600bdf1223476..2bc77e079fbd1 100644 --- a/tests/baselines/reference/exportSameNameFuncVar.js +++ b/tests/baselines/reference/exportSameNameFuncVar.js @@ -5,6 +5,7 @@ export function a() { //// [exportSameNameFuncVar.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.a = 10; function a() { } diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js index 6b4343a299bb3..ac79a9bf69dac 100644 --- a/tests/baselines/reference/exportSpecifierForAGlobal.js +++ b/tests/baselines/reference/exportSpecifierForAGlobal.js @@ -13,6 +13,7 @@ export function f() { //// [b.js] +"use strict"; function f() { var x; return x; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js index e8e9678408363..cb06a818b08b2 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js @@ -9,3 +9,4 @@ export declare function foo(): X.bar; //// [exportSpecifierReferencingOuterDeclaration2_A.js] //// [exportSpecifierReferencingOuterDeclaration2_B.js] +"use strict"; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js index 4edb5f711a6b5..1badf46999668 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js @@ -11,3 +11,4 @@ export declare function bar(): X.bar; // error //// [exportSpecifierReferencingOuterDeclaration2_A.js] //// [exportSpecifierReferencingOuterDeclaration2_B.js] +"use strict"; diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index 534a23b4d5bd7..bd4c112ff2e6a 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -31,11 +31,13 @@ foo; //// [t1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 1; exports.y = 2; }); //// [t2.js] define(["require", "exports"], function (require, exports) { + "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } @@ -43,6 +45,7 @@ define(["require", "exports"], function (require, exports) { }); //// [t3.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = "x"; exports.x = x; var y = "y"; @@ -52,6 +55,7 @@ define(["require", "exports"], function (require, exports) { }); //// [t4.js] define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } @@ -61,6 +65,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export }); //// [main.js] define(["require", "exports", "./t4"], function (require, exports, t4_1) { + "use strict"; t4_1.default; t4_1.x; t4_1.y; diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index 74cf24a0f9718..a2bc44720fb69 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -30,14 +30,17 @@ foo; //// [t1.js] +"use strict"; exports.x = 1; exports.y = 2; //// [t2.js] +"use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; //// [t3.js] +"use strict"; var x = "x"; exports.x = x; var y = "y"; @@ -45,6 +48,7 @@ exports.y = y; var z = "z"; exports.z = z; //// [t4.js] +"use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } @@ -52,6 +56,7 @@ __export(require("./t1")); __export(require("./t2")); __export(require("./t3")); //// [main.js] +"use strict"; var t4_1 = require("./t4"); t4_1.default; t4_1.x; diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index d433e7b3682c8..e131d5ae8d986 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -24,6 +24,7 @@ X.A.q; X.A.r; // Error //// [exportStarFromEmptyModule_module1.js] +"use strict"; var A = (function () { function A() { } @@ -33,6 +34,7 @@ exports.A = A; //// [exportStarFromEmptyModule_module2.js] // empty //// [exportStarFromEmptyModule_module3.js] +"use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } @@ -45,6 +47,7 @@ var A = (function () { })(); exports.A = A; //// [exportStarFromEmptyModule_module4.js] +"use strict"; var X = require("./exportStarFromEmptyModule_module3"); var s; X.A.q; diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js index a18d54d8e4880..f4c7e97b29729 100644 --- a/tests/baselines/reference/exportVisibility.js +++ b/tests/baselines/reference/exportVisibility.js @@ -10,6 +10,7 @@ export function test(foo: Foo) { //// [exportVisibility.js] +"use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js index 81399ddafb53b..3e77c3c684b4c 100644 --- a/tests/baselines/reference/exportedBlockScopedDeclarations.js +++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js @@ -19,6 +19,7 @@ namespace NS1 { //// [exportedBlockScopedDeclarations.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo = foo; // compile error exports.bar = exports.bar; // should be compile error function f() { diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js index 341de323694cc..6c39978e37d3c 100644 --- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js +++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js @@ -14,4 +14,5 @@ export declare class TPromise { //// [exportedInterfaceInaccessibleInCallbackInModule.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js index 39eea8d34b584..da472fc879014 100644 --- a/tests/baselines/reference/exportedVariable1.js +++ b/tests/baselines/reference/exportedVariable1.js @@ -5,6 +5,7 @@ var upper = foo.name.toUpperCase(); //// [exportedVariable1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.foo = { name: "Bill" }; var upper = exports.foo.name.toUpperCase(); }); diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js index 2246a63bc49b3..0742731636a94 100644 --- a/tests/baselines/reference/exportingContainingVisibleType.js +++ b/tests/baselines/reference/exportingContainingVisibleType.js @@ -12,6 +12,7 @@ export var x = 5; //// [exportingContainingVisibleType.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index 39744c7f142eb..555a56ce31f0e 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var v = 1; exports.v = v; function f() { } @@ -62,6 +63,7 @@ define(["require", "exports"], function (require, exports) { }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; @@ -71,6 +73,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index 5610968bf7925..ece98a80318c8 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -35,6 +35,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] +"use strict"; var v = 1; exports.v = v; function f() { } @@ -56,6 +57,7 @@ exports.M = M; var a = M.x; exports.a = a; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -64,6 +66,7 @@ exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index cd7db07b5694a..312b379dde1f8 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -35,6 +35,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] +"use strict"; var v = 1; exports.v = v; function f() { } @@ -59,6 +60,7 @@ exports.M = M; var a = M.x; exports.a = a; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -67,6 +69,7 @@ exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js index 10f524de68441..18803de4004a7 100644 --- a/tests/baselines/reference/exportsAndImports2-amd.js +++ b/tests/baselines/reference/exportsAndImports2-amd.js @@ -15,16 +15,19 @@ export { x as y, y as x }; //// [t1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = "x"; exports.y = "y"; }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.y = t1_1.x; exports.x = t1_1.y; }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.y = t1_1.x; exports.x = t1_1.y; }); diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js index aa58c0d890237..865534b285137 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.js +++ b/tests/baselines/reference/exportsAndImports2-es6.js @@ -14,13 +14,16 @@ export { x as y, y as x }; //// [t1.js] +"use strict"; exports.x = "x"; exports.y = "y"; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js index 96a3b838ed1ec..3790510979c85 100644 --- a/tests/baselines/reference/exportsAndImports2.js +++ b/tests/baselines/reference/exportsAndImports2.js @@ -14,13 +14,16 @@ export { x as y, y as x }; //// [t1.js] +"use strict"; exports.x = "x"; exports.y = "y"; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index 3a33b12c7ffbe..be86b9ba7b8fb 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.v = 1; exports.v1 = exports.v; function f() { } @@ -64,6 +65,7 @@ define(["require", "exports"], function (require, exports) { }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; @@ -73,6 +75,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { + "use strict"; exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index d8e142de41ddd..ed509d31437b6 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -35,6 +35,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] +"use strict"; exports.v = 1; exports.v1 = exports.v; function f() { } @@ -58,6 +59,7 @@ exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -66,6 +68,7 @@ exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index 47491ccbc04af..e29f403a5e0fe 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -35,6 +35,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] +"use strict"; exports.v = 1; exports.v1 = exports.v; function f() { } @@ -61,6 +62,7 @@ exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -69,6 +71,7 @@ exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; //// [t3.js] +"use strict"; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js index e6a431854b27b..3ed3f9bf9107b 100644 --- a/tests/baselines/reference/exportsAndImports4-amd.js +++ b/tests/baselines/reference/exportsAndImports4-amd.js @@ -41,11 +41,13 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] define(["require", "exports"], function (require, exports) { + "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; }); //// [t3.js] define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) { + "use strict"; exports.a = a; a.default; exports.b = t1_1.default; diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js index 7cae0c0148917..3d3278b4462a8 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.js +++ b/tests/baselines/reference/exportsAndImports4-es6.js @@ -40,8 +40,10 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] +"use strict"; exports.default = "hello"; //// [t3.js] +"use strict"; var a = require("./t1"); exports.a = a; a.default; diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js index 7358b31eacec3..361d1305bdab1 100644 --- a/tests/baselines/reference/exportsAndImports4.js +++ b/tests/baselines/reference/exportsAndImports4.js @@ -40,9 +40,11 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] +"use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; //// [t3.js] +"use strict"; var a = require("./t1"); exports.a = a; a.default; diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js index 4b1564b5ab289..fb6946ce928a1 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js @@ -20,6 +20,7 @@ import { set as yield } from "./t1"; import { get } from "./t1"; //// [t1.js] +"use strict"; var set = { set foo(x) { } @@ -28,5 +29,8 @@ exports.set = set; var get = 10; exports.get = get; //// [t2.js] +"use strict"; //// [t3.js] +"use strict"; //// [t4.js] +"use strict"; diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js index e9a0b45446ff3..219916b304750 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js @@ -18,12 +18,16 @@ import { as as as } from "./t1"; import { as } from "./t1"; //// [t1.js] +"use strict"; var as = 100; exports.return = as; exports.as = as; //// [t2.js] +"use strict"; var as = require("./t1"); var x = as.as; var y = as.return; //// [t3.js] +"use strict"; //// [t4.js] +"use strict"; diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js index cbd36f7e7998a..0c137f54486e5 100644 --- a/tests/baselines/reference/extendClassExpressionFromModule.js +++ b/tests/baselines/reference/extendClassExpressionFromModule.js @@ -12,6 +12,7 @@ class y extends x {} //// [foo1.js] +"use strict"; var x = (function () { function x() { } @@ -19,6 +20,7 @@ var x = (function () { })(); module.exports = x; //// [foo2.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 3c05ccc6866e6..004c89be3fbb5 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -33,6 +33,7 @@ var moduleName: string; var visModel = new moduleMap[moduleName].VisualizationModel(); //// [extendingClassFromAliasAndUsageInIndexer_backbone.js] +"use strict"; var Model = (function () { function Model() { } @@ -40,6 +41,7 @@ var Model = (function () { })(); exports.Model = Model; //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -55,6 +57,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -70,6 +73,7 @@ var VisualizationModel = (function (_super) { })(Backbone.Model); exports.VisualizationModel = VisualizationModel; //// [extendingClassFromAliasAndUsageInIndexer_main.js] +"use strict"; var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA"); var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB"); var moduleATyped = moduleA; diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index e41719ef88a8b..dc74c9446e251 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -28,6 +28,7 @@ y3 = ext3; // ok //// [externalModuleAssignToVar_core_require.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C = (function () { function C() { } @@ -37,6 +38,7 @@ define(["require", "exports"], function (require, exports) { }); //// [externalModuleAssignToVar_core_require2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C = (function () { function C() { } @@ -46,6 +48,7 @@ define(["require", "exports"], function (require, exports) { }); //// [externalModuleAssignToVar_ext.js] define(["require", "exports"], function (require, exports) { + "use strict"; var D = (function () { function D() { } @@ -55,6 +58,7 @@ define(["require", "exports"], function (require, exports) { }); //// [externalModuleAssignToVar_core.js] define(["require", "exports", 'externalModuleAssignToVar_core_require', 'externalModuleAssignToVar_core_require2', 'externalModuleAssignToVar_ext'], function (require, exports, ext, ext2, ext3) { + "use strict"; var y1 = ext; y1 = ext; // ok var y2 = ext2; diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js index 5dc1e9bea1dd0..78608c08c5692 100644 --- a/tests/baselines/reference/externalModuleExportingGenericClass.js +++ b/tests/baselines/reference/externalModuleExportingGenericClass.js @@ -16,6 +16,7 @@ var v3: number = (new a()).foo; //// [externalModuleExportingGenericClass_file0.js] +"use strict"; var C = (function () { function C() { } @@ -23,6 +24,7 @@ var C = (function () { })(); module.exports = C; //// [externalModuleExportingGenericClass_file1.js] +"use strict"; var a = require('./externalModuleExportingGenericClass_file0'); var v; // this should report error var v2 = (new a()).foo; diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js index 47d83ded80c98..4193a71cc9051 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.js +++ b/tests/baselines/reference/externalModuleImmutableBindings.js @@ -52,8 +52,10 @@ for ((stuff[n]) of []) {} //// [f1.js] +"use strict"; exports.x = 1; //// [f2.js] +"use strict"; // all mutations below are illegal and should be fixed var stuff = require('./f1'); var n = 'baz'; diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js index f8ddbfae1405f..3f9978c7b0ae6 100644 --- a/tests/baselines/reference/externalModuleQualification.js +++ b/tests/baselines/reference/externalModuleQualification.js @@ -12,6 +12,7 @@ class NavigateAction { //// [externalModuleQualification.js] +"use strict"; exports.ID = "test"; var DiffEditor = (function () { function DiffEditor(id) { diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index f9c83c83cf081..cdcc0842b085e 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -10,12 +10,14 @@ file1.foo(); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo() { } exports.foo = foo; ; }); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js] define(["require", "exports", 'externalModuleReferenceOfImportDeclarationWithExportModifier_0'], function (require, exports, file1) { + "use strict"; exports.file1 = file1; exports.file1.foo(); }); diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index 48411da4a0269..1b5d41d8be4e9 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -19,10 +19,12 @@ file1.bar(); //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js] //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js] +"use strict"; function foo() { } exports.foo = foo; ; //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js] +"use strict"; /// var file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1'); file1.foo(); diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 04dc4289bb687..20dc7fa8ddae1 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -17,11 +17,13 @@ import x = require('./foo'); x.Y // .ts should be picked //// [foo.js] +"use strict"; var M2; (function (M2) { M2.Y = 1; })(M2 || (M2 = {})); module.exports = M2; //// [consumer.js] +"use strict"; var x = require('./foo'); x.Y; // .ts should be picked diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index 9d35f8e61e145..13560105544e0 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -18,11 +18,13 @@ import x = require('./foo'); x.X // .ts should be picked //// [foo.js] +"use strict"; var M2; (function (M2) { M2.X = 1; })(M2 || (M2 = {})); module.exports = M2; //// [consumer.js] +"use strict"; var x = require('./foo'); x.X; // .ts should be picked diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js index b5c939453e666..0b1f17612b01d 100644 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js @@ -5,3 +5,4 @@ } //// [externalModuleWithoutCompilerFlag1.js] +"use strict"; diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index ddd95b9e8f244..a43e9cf0a1b13 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -6,6 +6,7 @@ export class C { //// [fieldAndGetterWithSameName.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js index 9d3a73515b44b..164fd091c16c2 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js @@ -11,6 +11,7 @@ function foo() { //// [a.js] define("tests/cases/compiler/a", ["require", "exports"], function (require, exports) { + "use strict"; var c = (function () { function c() { } diff --git a/tests/baselines/reference/genericArrayExtenstions.js b/tests/baselines/reference/genericArrayExtenstions.js index 774e512d48fe3..63c67a1376074 100644 --- a/tests/baselines/reference/genericArrayExtenstions.js +++ b/tests/baselines/reference/genericArrayExtenstions.js @@ -6,3 +6,4 @@ concat(...items: T[]): T[]; //// [genericArrayExtenstions.js] +"use strict"; diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js index bd4c5a5e33adf..1ec61d098646e 100644 --- a/tests/baselines/reference/genericClassesInModule2.js +++ b/tests/baselines/reference/genericClassesInModule2.js @@ -22,6 +22,7 @@ export class B { //// [genericClassesInModule2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A(callback) { this.callback = callback; diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js index 30c7aa72e576b..4f3895a33b865 100644 --- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js +++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js @@ -9,6 +9,7 @@ export function foo(fn: (ifoo: IFoo) => void) { //// [genericInterfaceFunctionTypeParameter.js] define(["require", "exports"], function (require, exports) { + "use strict"; function foo(fn) { foo(fn); // Invocation is necessary to repro (!) } diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js index 06c33c1585220..b442b2f8757ba 100644 --- a/tests/baselines/reference/genericMemberFunction.js +++ b/tests/baselines/reference/genericMemberFunction.js @@ -24,6 +24,7 @@ export class BuildResult{ //// [genericMemberFunction.js] define(["require", "exports"], function (require, exports) { + "use strict"; var BuildError = (function () { function BuildError() { } diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js index d6c0e686ce054..f9bcc86194c76 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js @@ -15,4 +15,5 @@ export declare module TypeScript { //// [genericRecursiveImplicitConstructorErrors1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 741c721834574..76b60435f5571 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -10,6 +10,7 @@ export class DbSet { //// [genericReturnTypeFromGetter1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var DbSet = (function () { function DbSet() { } diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js index 8f136e58efdac..2ee085ef07ee8 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases1.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js @@ -20,6 +20,7 @@ x.m2(); //// [genericTypeWithMultipleBases1.js] +"use strict"; var x; x.p1; x.m1(); diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js index 8101b7a479156..4a31e354de612 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases2.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js @@ -20,6 +20,7 @@ x.m2(); //// [genericTypeWithMultipleBases2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x; x.p1; x.m1(); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index 2457d4a534e11..1a536132d15c9 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define(["require", "exports"], function (require, exports) { + "use strict"; var Collection = (function () { function Collection() { } diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline index 4582af47f5a1c..3f2e0064fc7f4 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline @@ -2,6 +2,7 @@ EmitSkipped: false EmitSkipped: false FileName : tests/cases/fourslash/inputFile2.js +"use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index a3a9023f75be7..915eb121f5f67 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -3,6 +3,7 @@ Diagnostics: Exported variable 'foo' has or is using private name 'C'. FileName : tests/cases/fourslash/inputFile.js define(["require", "exports"], function (require, exports) { + "use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 46bdaf827d5c5..75387f6f2c23a 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -683,6 +683,7 @@ export declare module eaM { //// [giant.js] define(["require", "exports"], function (require, exports) { + "use strict"; /* Prefixes p -> public diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 3329fb810a738..81b0d2fdac9af 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -15,12 +15,14 @@ module m_private { //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js] +"use strict"; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] +"use strict"; var r = require('importAliasAnExternalModuleInsideAnInternalModule_file0'); var m_private; (function (m_private) { diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index 57d71af2cda7c..5340c3049a213 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -11,6 +11,7 @@ class Hello extends Greeter { } //// [importAsBaseClass_0.js] +"use strict"; var Greeter = (function () { function Greeter() { } @@ -19,6 +20,7 @@ var Greeter = (function () { })(); exports.Greeter = Greeter; //// [importAsBaseClass_1.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index 4b2672c413503..c7cc4fe8332b6 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -82,6 +82,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo(); //// [importDecl_require.js] +"use strict"; var d = (function () { function d() { } @@ -91,6 +92,7 @@ exports.d = d; function foo() { return null; } exports.foo = foo; //// [importDecl_require1.js] +"use strict"; var d = (function () { function d() { } @@ -101,6 +103,7 @@ var x; function foo() { return null; } exports.foo = foo; //// [importDecl_require2.js] +"use strict"; var d = (function () { function d() { } @@ -110,6 +113,7 @@ exports.d = d; function foo() { return null; } exports.foo = foo; //// [importDecl_require3.js] +"use strict"; var d = (function () { function d() { } @@ -119,9 +123,11 @@ exports.d = d; function foo() { return null; } exports.foo = foo; //// [importDecl_require4.js] +"use strict"; function foo2() { return null; } exports.foo2 = foo2; //// [importDecl_1.js] +"use strict"; /// /// /// diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js index 34a662d6451fa..383c6629ed19f 100644 --- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js +++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js @@ -6,3 +6,4 @@ declare module "m1" { //// [importDeclRefereingExternalModuleWithNoResolve.js] +"use strict"; diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js index c8aefe03babb4..ce074cf696da1 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.js +++ b/tests/baselines/reference/importDeclWithClassModifiers.js @@ -11,5 +11,6 @@ var b: a; //// [importDeclWithClassModifiers.js] define(["require", "exports"], function (require, exports) { + "use strict"; var b; }); diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js index 3c80e47a90f1d..e5267678a49dd 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.js +++ b/tests/baselines/reference/importDeclWithDeclareModifier.js @@ -8,4 +8,5 @@ var b: a; //// [importDeclWithDeclareModifier.js] +"use strict"; var b; diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js index dd2e1e11111f6..4ff25cfa37d14 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.js +++ b/tests/baselines/reference/importDeclWithExportModifier.js @@ -9,5 +9,6 @@ var b: a; //// [importDeclWithExportModifier.js] define(["require", "exports"], function (require, exports) { + "use strict"; var b; }); diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js index a8d2e94980587..f4264878076bd 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js @@ -7,3 +7,4 @@ export import a = x.c; export = x; //// [importDeclWithExportModifierAndExportAssignment.js] +"use strict"; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index 51839c35df2b5..958b154cd282c 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -12,6 +12,7 @@ export var x: typeof a; //// [importDeclarationUsedAsTypeQuery_require.js] +"use strict"; var B = (function () { function B() { } @@ -19,6 +20,7 @@ var B = (function () { })(); exports.B = B; //// [importDeclarationUsedAsTypeQuery_1.js] +"use strict"; //// [importDeclarationUsedAsTypeQuery_require.d.ts] diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index bbb450f2849b7..31932455784d6 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -17,6 +17,7 @@ var x = foo; // Cause a runtime dependency //// [foo_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C1 = (function () { function C1() { this.m1 = 42; @@ -28,9 +29,11 @@ define(["require", "exports"], function (require, exports) { }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var answer = 42; // No exports }); //// [foo_2.js] define(["require", "exports", "./foo_1"], function (require, exports, foo) { + "use strict"; var x = foo; // Cause a runtime dependency }); diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index 5151e01f764e1..d4f12d0c1b622 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -10,6 +10,7 @@ export module myModule { } //// [importInsideModule_file2.js] +"use strict"; var myModule; (function (myModule) { var a = foo.x; diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index 002c1da7dfcf2..2a8e679286072 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -20,6 +20,7 @@ var foo; })(foo || (foo = {})); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { + "use strict"; // Import should fail. foo_0 not an external module if (foo.answer === 42) { } diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js index 46185a2dfe45f..002092d816222 100644 --- a/tests/baselines/reference/importNonStringLiteral.js +++ b/tests/baselines/reference/importNonStringLiteral.js @@ -4,4 +4,5 @@ import foo = require(x); // invalid //// [foo_0.js] +"use strict"; var x = "filename"; diff --git a/tests/baselines/reference/importShadowsGlobalName.js b/tests/baselines/reference/importShadowsGlobalName.js index fe37e938a5a8f..cd0cd1791eb4c 100644 --- a/tests/baselines/reference/importShadowsGlobalName.js +++ b/tests/baselines/reference/importShadowsGlobalName.js @@ -12,6 +12,7 @@ export = Bar; //// [Foo.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Foo = (function () { function Foo() { } @@ -26,6 +27,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define(["require", "exports", 'Foo'], function (require, exports, Error) { + "use strict"; var Bar = (function (_super) { __extends(Bar, _super); function Bar() { diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js index 138ff7b755ade..b57df50499354 100644 --- a/tests/baselines/reference/importTsBeforeDTs.js +++ b/tests/baselines/reference/importTsBeforeDTs.js @@ -14,8 +14,10 @@ var z2 = foo.y + 10; // Should resolve //// [foo_0.js] +"use strict"; exports.y = 42; //// [foo_1.js] +"use strict"; var foo = require("./foo_0"); var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts var z2 = foo.y + 10; // Should resolve diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index 129e7b44fd760..7fa341cd28a53 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -12,6 +12,7 @@ var r: string = s.foo; //// [importUsedInExtendsList1_require.js] +"use strict"; var Super = (function () { function Super() { } @@ -19,6 +20,7 @@ var Super = (function () { })(); exports.Super = Super; //// [importUsedInExtendsList1_1.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index db6e10107fd8d..68d2ee34671dd 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -23,6 +23,7 @@ var x = new UserServices().getUserName(); //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var App; (function (App) { var Services; @@ -43,6 +44,7 @@ define(["require", "exports"], function (require, exports) { }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { + "use strict"; var Services = appJs.Services; var UserServices = Services.UserServices; var x = new UserServices().getUserName(); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 6d5415bcd2aff..6f329afbf54d8 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -19,6 +19,7 @@ var x = new Services.UserServices().getUserName(); //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var App; (function (App) { var Services; @@ -37,6 +38,7 @@ define(["require", "exports"], function (require, exports) { }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { + "use strict"; var Services = appJs.App.Services; var x = new Services.UserServices().getUserName(); }); diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js index a438daec3f22d..157702acd1e1b 100644 --- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js +++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js @@ -18,6 +18,7 @@ var p = testData[0].name; //// [b.js] //// [a.js] define(["require", "exports"], function (require, exports) { + "use strict"; var testData; var p = testData[0].name; }); diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js index 6b37f631efc92..ed6470751ed08 100644 --- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js +++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js @@ -12,6 +12,7 @@ var v = new hostVar.Host(); //// [host.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Host = (function () { function Host() { } @@ -21,6 +22,7 @@ define(["require", "exports"], function (require, exports) { }); //// [consumer.js] define(["require", "exports", "host"], function (require, exports, host) { + "use strict"; var hostVar = host; var v = new hostVar.Host(); }); diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index fb56b1ac0d7fa..d342deedef278 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -20,6 +20,7 @@ export module ImportingModule { //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var elaborate; (function (elaborate) { var nested; @@ -43,6 +44,7 @@ define(["require", "exports"], function (require, exports) { }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ImportingModule; (function (ImportingModule) { var UsesReferredType = (function () { diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index c67af2089faf9..a12ab331c48f7 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -8,6 +8,7 @@ class foo { } //// [importedModuleClassNameClash.js] define(["require", "exports"], function (require, exports) { + "use strict"; var foo = (function () { function foo() { } diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index e4ebccc365f88..02c0eb0eea49a 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -13,6 +13,7 @@ function IsFoo(value: any): boolean { //// [instanceOfInExternalModules_require.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Foo = (function () { function Foo() { } @@ -22,6 +23,7 @@ define(["require", "exports"], function (require, exports) { }); //// [instanceOfInExternalModules_1.js] define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) { + "use strict"; function IsFoo(value) { return value instanceof Bar.Foo; } diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index 2dbdb958d6b2d..a0012121c0d3a 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -22,6 +22,7 @@ class Bug { //// [interfaceContextualType.js] +"use strict"; var Bug = (function () { function Bug() { } diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index 4984bc48126dd..c3cbf47771d5d 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -57,6 +57,7 @@ interface I2 extends I1 { item:string; } //// [interfaceDeclaration3.js] define(["require", "exports"], function (require, exports) { + "use strict"; var M1; (function (M1) { var C1 = (function () { diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js index acb40160d842b..6a643e4b066b2 100644 --- a/tests/baselines/reference/interfaceDeclaration5.js +++ b/tests/baselines/reference/interfaceDeclaration5.js @@ -5,6 +5,7 @@ export class C1 { } //// [interfaceDeclaration5.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C1 = (function () { function C1() { } diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index 4feb6804db35a..e21499a20f470 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -26,6 +26,7 @@ export class Test { //// [interfaceImplementation6.js] define(["require", "exports"], function (require, exports) { + "use strict"; var C1 = (function () { function C1() { } diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index c240f97b3c9bd..6714c10411eea 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -18,6 +18,7 @@ export module m2 { export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithExport.js] +"use strict"; var x; (function (x) { var c = (function () { diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 1685843d11390..64bfe61fa6a03 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -16,6 +16,7 @@ export module m2 { } //// [internalAliasClassInsideLocalModuleWithoutExport.js] +"use strict"; var x; (function (x) { var c = (function () { diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index d8af951b7e810..49b784a9e99f6 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -18,6 +18,7 @@ export module m2 { export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js] +"use strict"; var x; (function (x) { var c = (function () { diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index ef13909e48c83..1fa90e62b82f0 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -12,6 +12,7 @@ export var cProp = new xc(); var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithExport.js] +"use strict"; var x; (function (x) { var c = (function () { diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 156ca84dfb2bf..d4e1f3fc8e394 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -12,6 +12,7 @@ export var cProp = new xc(); var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithoutExport.js] +"use strict"; var x; (function (x) { var c = (function () { diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index f2223b197e00f..dd30dc814aed3 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithExport.js] +"use strict"; var a; (function (a) { (function (weekend) { diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index afd6597869be6..7f00d69a8d6f9 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithoutExport.js] +"use strict"; var a; (function (a) { (function (weekend) { diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index acd3f4c61b185..8612e74f82955 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -15,6 +15,7 @@ export module c { var happyFriday = c.b.Friday; //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js] +"use strict"; var a; (function (a) { (function (weekend) { diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 96e17c6f6e305..c7396fded2ac2 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -13,6 +13,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { (function (weekend) { diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index b224c22f45e1a..1cf1b0b8b1633 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -13,6 +13,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { (function (weekend) { diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index e7b536f3107f4..b96586dfa8eb6 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -13,6 +13,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithExport.js] +"use strict"; var a; (function (a) { function foo(x) { diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index da24367ad503a..dca4287815782 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -13,6 +13,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithoutExport.js] +"use strict"; var a; (function (a) { function foo(x) { diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index dd1eaa222c21e..62e5f622ae7f9 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -13,6 +13,7 @@ export module c { var d = c.b(11); //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js] +"use strict"; var a; (function (a) { function foo(x) { diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index cfcb7737be680..be096720e5e10 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -12,6 +12,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { function foo(x) { diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index 1d33505c1030b..ec702b7e0218b 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -11,6 +11,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js] +"use strict"; var a; (function (a) { function foo(x) { diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index ca8ad55cdcd38..0906321df884f 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -13,6 +13,7 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { var b; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index c50324562afe6..212f4f841eb13 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -12,6 +12,7 @@ export module c { } //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js] +"use strict"; var a; (function (a) { var b; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index 5088566306235..e6a3cd9f93804 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -14,6 +14,7 @@ export module c { export var d = new c.b.c(); //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js] +"use strict"; var a; (function (a) { var b; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index cf1e82bb72583..ea7681a2a503f 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -10,6 +10,7 @@ export import b = a.b; export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js] +"use strict"; var a; (function (a) { var b; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 8c905bd554304..90fd7212794ef 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -11,6 +11,7 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { var b; diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index 8db0ad7f49e25..044b393b36775 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var c; (function (c) { })(c = exports.c || (exports.c = {})); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 047553fa66810..78bfc72a789bf 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var c; (function (c) { })(c = exports.c || (exports.c = {})); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index e5ac69a44c122..d0c4543c194ec 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -13,6 +13,7 @@ var x: c.b; //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { + "use strict"; var c; (function (c) { })(c = exports.c || (exports.c = {})); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js index 912336068da63..1d6cb8c07e968 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js @@ -9,6 +9,7 @@ export var x: b; //// [internalAliasInterfaceInsideTopLevelModuleWithExport.js] +"use strict"; //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index 3964e539fdf10..fb666a9cad20f 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -10,6 +10,7 @@ export var x: b; //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index f6faee442c427..38e0c38728652 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { } //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js] +"use strict"; var c; (function (c) { c.x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 2ef3c5320a86b..4912293d48c95 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -14,6 +14,7 @@ export module c { } //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js] +"use strict"; var c; (function (c) { c.x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index ea13aae8aa13b..1015e2a1d63a0 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -18,6 +18,7 @@ export var z: c.b.I; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { + "use strict"; var c; (function (c) { c.x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index edfc3be8e6966..dac3821a30d5e 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -14,6 +14,7 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x.foo(); }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 6e484e67cdba9..dc1029c666410 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -13,6 +13,7 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js] +"use strict"; exports.x.foo(); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index ab8cae0691059..a2921311e539c 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -11,6 +11,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { a.x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index ac6f282ba817e..8718dc18fdd29 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -11,6 +11,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { a.x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index 604a9a2a41408..aa61fc77216b7 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -11,6 +11,7 @@ export module c { export var z = c.b; //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js] +"use strict"; var a; (function (a) { a.x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 3dbc9b6a94a96..5427dbf026f1f 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -10,6 +10,7 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a; (function (a) { a.x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index 8ce6f91d040f2..7c7c2cd327e7f 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -9,6 +9,7 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithoutExport.js] +"use strict"; var a; (function (a) { a.x = 10; diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index 4498b462e1878..f5dcb65bc9a8f 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -14,6 +14,7 @@ export {c1} from "module"; export var z = x; //// [file1.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js index 7f4f4219123f8..1e45ee159d673 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js @@ -6,5 +6,6 @@ run(1); //// [isolatedModulesPlainFile-AMD.js] define(["require", "exports"], function (require, exports) { + "use strict"; run(1); }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js index 7026a7d9bed2d..f40d217368525 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js @@ -5,4 +5,5 @@ run(1); //// [isolatedModulesPlainFile-CommonJS.js] +"use strict"; run(1); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-System.js b/tests/baselines/reference/isolatedModulesPlainFile-System.js index b924a3b21f991..b66bd49781026 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-System.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-System.js @@ -6,6 +6,7 @@ run(1); //// [isolatedModulesPlainFile-System.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js index b4f8cf436ecbc..08ec75c48f089 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js @@ -13,5 +13,6 @@ run(1); define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; run(1); }); diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js index 6d002e5a66ed2..89547811855f7 100644 --- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js @@ -2,3 +2,4 @@ export var x; //// [file1.js] +"use strict"; diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js index 6d002e5a66ed2..89547811855f7 100644 --- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js @@ -2,3 +2,4 @@ export var x; //// [file1.js] +"use strict"; diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js index 40b21e87c3fd2..552c7e26f12f2 100644 --- a/tests/baselines/reference/jsxImportInAttribute.js +++ b/tests/baselines/reference/jsxImportInAttribute.js @@ -15,6 +15,7 @@ let x = Test; // emit test_1.default //// [consumer.jsx] +"use strict"; /// var Test_1 = require('Test'); var x = Test_1["default"]; // emit test_1.default diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js index 6bf61af67f5fb..c980dc256c625 100644 --- a/tests/baselines/reference/jsxViaImport.js +++ b/tests/baselines/reference/jsxViaImport.js @@ -24,6 +24,7 @@ class TestComponent extends React.Component { //// [consumer.jsx] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js index 686ab4126a27b..4a8c519dc7734 100644 --- a/tests/baselines/reference/localAliasExportAssignment.js +++ b/tests/baselines/reference/localAliasExportAssignment.js @@ -17,9 +17,11 @@ connect(); //// [localAliasExportAssignment_0.js] +"use strict"; var server; module.exports = server; //// [localAliasExportAssignment_1.js] +"use strict"; /// var connect = require('./localAliasExportAssignment_0'); connect(); diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index b6c26e908f725..bbeafeab3462a 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -16,6 +16,7 @@ WinJS.Promise.timeout(10); //// [memberAccessMustUseModuleInstances_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Promise = (function () { function Promise() { } @@ -28,5 +29,6 @@ define(["require", "exports"], function (require, exports) { }); //// [memberAccessMustUseModuleInstances_1.js] define(["require", "exports", 'memberAccessMustUseModuleInstances_0'], function (require, exports, WinJS) { + "use strict"; WinJS.Promise.timeout(10); }); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index d5cda7c91099d..64a4b9d00bd89 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -16,6 +16,7 @@ export module X { } //// [mergedModuleDeclarationCodeGen.js] +"use strict"; var X; (function (X) { var Y; diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js index 1d4f55a4df1f3..5312f8b0cf6ee 100644 --- a/tests/baselines/reference/missingImportAfterModuleImport.js +++ b/tests/baselines/reference/missingImportAfterModuleImport.js @@ -25,6 +25,7 @@ export = MainModule; //// [missingImportAfterModuleImport_0.js] //// [missingImportAfterModuleImport_1.js] +"use strict"; var MainModule = (function () { function MainModule() { } diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js index ae95e2f7361d8..3706eae6ae24a 100644 --- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js +++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js @@ -16,9 +16,11 @@ fn(a); // Error: property 'x' is missing from 'a' //// [moduleAliasAsFunctionArgument_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [moduleAliasAsFunctionArgument_1.js] define(["require", "exports", 'moduleAliasAsFunctionArgument_0'], function (require, exports, a) { + "use strict"; function fn(arg) { } a.x; // OK diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index afc1ce23e3707..bfb1d0e56c358 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -22,6 +22,7 @@ var v = E2.B; //// [moduleCodeGenTest5.js] +"use strict"; exports.x = 0; var y = 0; function f1() { } diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index 884b88e0160c8..362785a5d6805 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -5,6 +5,7 @@ Baz.x = "goodbye"; void 0; //// [moduleCodegenTest4.js] +"use strict"; var Baz; (function (Baz) { Baz.x = "hello"; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 70ed9380c592f..724237c35cf27 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -15,6 +15,7 @@ if (!module.exports) module.exports = ""; //// [moduleExports1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var TypeScript; (function (TypeScript) { var Strasse; diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js index 9b7449b95ca81..81be08f21c2ad 100644 --- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js +++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js @@ -13,6 +13,7 @@ class Test1 extends C1 { //// [moduleImportedForTypeArgumentPosition_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [moduleImportedForTypeArgumentPosition_1.js] var __extends = (this && this.__extends) || function (d, b) { @@ -21,6 +22,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define(["require", "exports"], function (require, exports) { + "use strict"; var C1 = (function () { function C1() { } diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index bcce5f7463259..970cc300b178e 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -12,6 +12,7 @@ var x = (w1: WinJS) => { }; //// [moduleInTypePosition1_0.js] +"use strict"; var Promise = (function () { function Promise() { } @@ -19,4 +20,5 @@ var Promise = (function () { })(); exports.Promise = Promise; //// [moduleInTypePosition1_1.js] +"use strict"; var x = function (w1) { }; diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js index f47e579111713..70e43e25bbbc6 100644 --- a/tests/baselines/reference/moduleMergeConstructor.js +++ b/tests/baselines/reference/moduleMergeConstructor.js @@ -29,6 +29,7 @@ class Test { //// [index.js] define(["require", "exports", "foo"], function (require, exports, foo) { + "use strict"; var Test = (function () { function Test() { this.bar = new foo.Foo(); diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index 904808b9f6b6d..a701defdc688c 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -5,6 +5,7 @@ export class Foo {} //// [modulePrologueAMD.js] define(["require", "exports"], function (require, exports) { + "use strict"; "use strict"; var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 67b704a365070..86df3f3b50471 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -4,7 +4,7 @@ export class Foo {} //// [modulePrologueCommonjs.js] -"use strict"; +"use strict";"use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js index 91703d1c7fba7..93af4afd31f57 100644 --- a/tests/baselines/reference/modulePrologueSystem.js +++ b/tests/baselines/reference/modulePrologueSystem.js @@ -5,6 +5,7 @@ export class Foo {} //// [modulePrologueSystem.js] System.register([], function(exports_1) { + "use strict"; "use strict"; var Foo; return { diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index 65803af6cadec..aab9e8368ad52 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -12,6 +12,7 @@ export class Foo {} define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; "use strict"; var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js index 9f0537a5ad5c2..c73be6b6981f1 100644 --- a/tests/baselines/reference/moduleResolutionNoResolve.js +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -9,5 +9,7 @@ export var c = ''; //// [a.js] +"use strict"; //// [b.js] +"use strict"; exports.c = ''; diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index cbe435e570c97..adfcd3673a86c 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -28,9 +28,11 @@ var v1 = "sausages"; // Global scope var v2 = 42; // Global scope var v4 = function () { return 5; }; //// [file3.js] +"use strict"; exports.v3 = true; var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope //// [file4.js] +"use strict"; var file3 = require('./file3'); var t1 = v1; var t2 = v2; diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index 5a03f3c848d1f..28ebecdd0f0ae 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -26,6 +26,7 @@ class Adder { export = Adder; //// [Adder.js] +"use strict"; var Adder = (function () { function Adder() { } @@ -35,14 +36,17 @@ var Adder = (function () { })(); module.exports = Adder; //// [Math.js] +"use strict"; var Adder = require('./Adder'); var Math = { Adder: Adder }; module.exports = Math; //// [Drawing.js] +"use strict"; exports.Math = require('./Math/Math'); //// [consumer.js] +"use strict"; var Drawing = require('./Drawing'); var addr = new Drawing.Math.Adder(); diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index b1ff3b4353cd8..2a9dc18ca7779 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -19,6 +19,7 @@ import Entity from "./m1" Entity(); //// [m1.js] +"use strict"; var foo = (function () { function foo() { } @@ -34,5 +35,6 @@ var x = 10; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = x; //// [m2.js] +"use strict"; var m1_1 = require("./m1"); m1_1.default(); diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js index 7b43c43ee603f..0e9fed272cde6 100644 --- a/tests/baselines/reference/multipleDefaultExports02.js +++ b/tests/baselines/reference/multipleDefaultExports02.js @@ -16,6 +16,7 @@ import Entity from "./m1" Entity(); //// [m1.js] +"use strict"; function foo() { } Object.defineProperty(exports, "__esModule", { value: true }); @@ -25,5 +26,6 @@ function bar() { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = bar; //// [m2.js] +"use strict"; var m1_1 = require("./m1"); m1_1.default(); diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js index 2824c7a5ac124..d5699d850c0e4 100644 --- a/tests/baselines/reference/multipleDefaultExports03.js +++ b/tests/baselines/reference/multipleDefaultExports03.js @@ -7,6 +7,7 @@ export default class C { } //// [multipleDefaultExports03.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js index 73582d7389eff..020f9b758bb27 100644 --- a/tests/baselines/reference/multipleDefaultExports04.js +++ b/tests/baselines/reference/multipleDefaultExports04.js @@ -7,6 +7,7 @@ export default function f() { } //// [multipleDefaultExports04.js] +"use strict"; function f() { } Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleExportAssignments.js b/tests/baselines/reference/multipleExportAssignments.js index 4068cb7a04d2b..e7ee549a1210e 100644 --- a/tests/baselines/reference/multipleExportAssignments.js +++ b/tests/baselines/reference/multipleExportAssignments.js @@ -17,5 +17,6 @@ export = connectExport; //// [multipleExportAssignments.js] +"use strict"; var server; module.exports = server; diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index ec795ef9913e1..c70a5005aab11 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -13,6 +13,7 @@ export module M { //// [multipleExports.js] +"use strict"; var M; (function (M) { M.v = 0; diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js index 3088545261f7f..6d00b54d69b30 100644 --- a/tests/baselines/reference/nameDelimitedBySlashes.js +++ b/tests/baselines/reference/nameDelimitedBySlashes.js @@ -9,7 +9,9 @@ var x = foo.foo + 42; //// [foo_0.js] +"use strict"; exports.foo = 42; //// [foo_1.js] +"use strict"; var foo = require('./test/foo_0'); var x = foo.foo + 42; diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js index 9f601e19aef3e..2d487ede24572 100644 --- a/tests/baselines/reference/nameWithFileExtension.js +++ b/tests/baselines/reference/nameWithFileExtension.js @@ -9,5 +9,6 @@ var x = foo.foo + 42; //// [foo_1.js] +"use strict"; var foo = require('./foo_0.js'); var x = foo.foo + 42; diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index c0793e31ab6ca..e348c5b1cedcf 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -24,18 +24,22 @@ if(foo2.M2.x){ //// [foo_0.js] +"use strict"; exports.foo = 42; //// [foo_1.js] +"use strict"; function f() { return 42; } exports.f = f; //// [foo_2.js] +"use strict"; var M2; (function (M2) { M2.x = true; })(M2 = exports.M2 || (exports.M2 = {})); //// [foo_3.js] +"use strict"; var foo0 = require('../foo_0'); var foo1 = require('./test/foo_1'); var foo2 = require('./.././test/foo_2'); diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js index 3516342e3b22f..deda55cef0f59 100644 --- a/tests/baselines/reference/nodeResolution1.js +++ b/tests/baselines/reference/nodeResolution1.js @@ -8,5 +8,7 @@ export var x = 1; import y = require("./a"); //// [a.js] +"use strict"; exports.x = 1; //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution2.js b/tests/baselines/reference/nodeResolution2.js index a5935461088c9..a139eaf62cf7b 100644 --- a/tests/baselines/reference/nodeResolution2.js +++ b/tests/baselines/reference/nodeResolution2.js @@ -8,3 +8,4 @@ export var x: number; import y = require("a"); //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution3.js b/tests/baselines/reference/nodeResolution3.js index 6e0ec60832301..99b6a69281915 100644 --- a/tests/baselines/reference/nodeResolution3.js +++ b/tests/baselines/reference/nodeResolution3.js @@ -8,3 +8,4 @@ export var x: number; import y = require("b"); //// [a.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js index 0965c257da9fe..7678b7c1c5cf8 100644 --- a/tests/baselines/reference/nodeResolution4.js +++ b/tests/baselines/reference/nodeResolution4.js @@ -14,4 +14,6 @@ import y = require("./a"); //// [ref.js] var x = 1; //// [a.js] +"use strict"; //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution5.js b/tests/baselines/reference/nodeResolution5.js index 2bc009c15223f..766d4118e97d8 100644 --- a/tests/baselines/reference/nodeResolution5.js +++ b/tests/baselines/reference/nodeResolution5.js @@ -11,3 +11,4 @@ import y = require("a"); //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js index 140edd61f5a9f..58a9b907250d2 100644 --- a/tests/baselines/reference/nodeResolution6.js +++ b/tests/baselines/reference/nodeResolution6.js @@ -16,3 +16,4 @@ import y = require("a"); //// [ref.js] var x = 1; //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution7.js b/tests/baselines/reference/nodeResolution7.js index abfbbad52a628..028d7ed2e8117 100644 --- a/tests/baselines/reference/nodeResolution7.js +++ b/tests/baselines/reference/nodeResolution7.js @@ -11,3 +11,4 @@ import y = require("a"); //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js index aa67f4bf9ccb5..36b53eec553ef 100644 --- a/tests/baselines/reference/nodeResolution8.js +++ b/tests/baselines/reference/nodeResolution8.js @@ -15,3 +15,4 @@ import y = require("a"); //// [ref.js] var x = 1; //// [b.js] +"use strict"; diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js index 2e7f7f67ee67d..a577329f1cf26 100644 --- a/tests/baselines/reference/nonMergedOverloads.js +++ b/tests/baselines/reference/nonMergedOverloads.js @@ -6,6 +6,7 @@ export function f() { } //// [nonMergedOverloads.js] +"use strict"; var f = 10; function f() { } diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js index 27dc6e2bd1a89..1e58f89501f5e 100644 --- a/tests/baselines/reference/objectIndexer.js +++ b/tests/baselines/reference/objectIndexer.js @@ -17,6 +17,7 @@ class Emitter { //// [objectIndexer.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Emitter = (function () { function Emitter() { this.listeners = {}; diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js index a1c874abb7cdd..cfcd1bad9b8b1 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js +++ b/tests/baselines/reference/outModuleConcatAmd.js @@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A() { } @@ -23,6 +24,7 @@ define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports.A = A; }); define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) { + "use strict"; var B = (function (_super) { __extends(B, _super); function B() { diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map index 44cd5ce9955bd..a4c3944d3d7a4 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt index eec3a6014aa3e..2c695dca40d77 100644 --- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt @@ -14,18 +14,19 @@ sourceFile:tests/cases/compiler/ref/a.ts >>> d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); >>>}; >>>define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> var A = (function () { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(7, 5) Source(2, 1) + SourceIndex(0) +1 >Emitted(8, 5) Source(2, 1) + SourceIndex(0) --- >>> function A() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(8, 9) Source(2, 1) + SourceIndex(0) name (A) +1->Emitted(9, 9) Source(2, 1) + SourceIndex(0) name (A) --- >>> } 1->^^^^^^^^ @@ -33,16 +34,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(9, 9) Source(2, 18) + SourceIndex(0) name (A.constructor) -2 >Emitted(9, 10) Source(2, 19) + SourceIndex(0) name (A.constructor) +1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A.constructor) +2 >Emitted(10, 10) Source(2, 19) + SourceIndex(0) name (A.constructor) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(10, 17) Source(2, 19) + SourceIndex(0) name (A) +1->Emitted(11, 9) Source(2, 18) + SourceIndex(0) name (A) +2 >Emitted(11, 17) Source(2, 19) + SourceIndex(0) name (A) --- >>> })(); 1 >^^^^ @@ -54,10 +55,10 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(11, 5) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(11, 6) Source(2, 19) + SourceIndex(0) name (A) -3 >Emitted(11, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(11, 10) Source(2, 19) + SourceIndex(0) +1 >Emitted(12, 5) Source(2, 18) + SourceIndex(0) name (A) +2 >Emitted(12, 6) Source(2, 19) + SourceIndex(0) name (A) +3 >Emitted(12, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(12, 10) Source(2, 19) + SourceIndex(0) --- >>> exports.A = A; 1->^^^^ @@ -68,10 +69,10 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > A 3 > { } 4 > -1->Emitted(12, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(12, 14) Source(2, 15) + SourceIndex(0) -3 >Emitted(12, 18) Source(2, 19) + SourceIndex(0) -4 >Emitted(12, 19) Source(2, 19) + SourceIndex(0) +1->Emitted(13, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(13, 14) Source(2, 15) + SourceIndex(0) +3 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) +4 >Emitted(13, 19) Source(2, 19) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:all.js @@ -79,34 +80,35 @@ sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- >>>}); >>>define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) { +>>> "use strict"; >>> var B = (function (_super) { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >import {A} from "./ref/a"; > -1 >Emitted(15, 5) Source(2, 1) + SourceIndex(1) +1 >Emitted(17, 5) Source(2, 1) + SourceIndex(1) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(16, 9) Source(2, 24) + SourceIndex(1) name (B) -2 >Emitted(16, 30) Source(2, 25) + SourceIndex(1) name (B) +1->Emitted(18, 9) Source(2, 24) + SourceIndex(1) name (B) +2 >Emitted(18, 30) Source(2, 25) + SourceIndex(1) name (B) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(17, 9) Source(2, 1) + SourceIndex(1) name (B) +1 >Emitted(19, 9) Source(2, 1) + SourceIndex(1) name (B) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(18, 13) Source(2, 24) + SourceIndex(1) name (B.constructor) -2 >Emitted(18, 43) Source(2, 25) + SourceIndex(1) name (B.constructor) +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 >^^^^^^^^ @@ -114,16 +116,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(19, 9) Source(2, 28) + SourceIndex(1) name (B.constructor) -2 >Emitted(19, 10) Source(2, 29) + SourceIndex(1) name (B.constructor) +1 >Emitted(21, 9) Source(2, 28) + SourceIndex(1) name (B.constructor) +2 >Emitted(21, 10) Source(2, 29) + SourceIndex(1) name (B.constructor) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(20, 17) Source(2, 29) + SourceIndex(1) name (B) +1->Emitted(22, 9) Source(2, 28) + SourceIndex(1) name (B) +2 >Emitted(22, 17) Source(2, 29) + SourceIndex(1) name (B) --- >>> })(a_1.A); 1 >^^^^ @@ -139,12 +141,12 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(21, 5) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(21, 6) Source(2, 29) + SourceIndex(1) name (B) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 8) Source(2, 24) + SourceIndex(1) -5 >Emitted(21, 13) Source(2, 25) + SourceIndex(1) -6 >Emitted(21, 15) Source(2, 29) + SourceIndex(1) +1 >Emitted(23, 5) Source(2, 28) + SourceIndex(1) name (B) +2 >Emitted(23, 6) Source(2, 29) + SourceIndex(1) name (B) +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) +6 >Emitted(23, 15) Source(2, 29) + SourceIndex(1) --- >>> exports.B = B; 1->^^^^ @@ -155,10 +157,10 @@ sourceFile:tests/cases/compiler/b.ts 2 > B 3 > extends A { } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 14) Source(2, 15) + SourceIndex(1) -3 >Emitted(22, 18) Source(2, 29) + SourceIndex(1) -4 >Emitted(22, 19) Source(2, 29) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 14) Source(2, 15) + SourceIndex(1) +3 >Emitted(24, 18) Source(2, 29) + SourceIndex(1) +4 >Emitted(24, 19) Source(2, 29) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=all.js.map \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js index 1f8bdbd80703b..688221ca5b2fe 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js +++ b/tests/baselines/reference/outModuleConcatSystem.js @@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; System.register("tests/cases/compiler/ref/a", [], function(exports_1) { + "use strict"; var A; return { setters:[], @@ -29,6 +30,7 @@ System.register("tests/cases/compiler/ref/a", [], function(exports_1) { } }); System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) { + "use strict"; var a_1; var B; return { diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map index 77ff05f84fbf2..91dd31751cd8f 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt index 489487772dbf0..7abebabbc61ec 100644 --- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt @@ -14,6 +14,7 @@ sourceFile:tests/cases/compiler/ref/a.ts >>> d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); >>>}; >>>System.register("tests/cases/compiler/ref/a", [], function(exports_1) { +>>> "use strict"; >>> var A; >>> return { >>> setters:[], @@ -23,13 +24,13 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 13) Source(2, 1) + SourceIndex(0) +1 >Emitted(12, 13) Source(2, 1) + SourceIndex(0) --- >>> function A() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(12, 17) Source(2, 1) + SourceIndex(0) name (A) +1->Emitted(13, 17) Source(2, 1) + SourceIndex(0) name (A) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -37,16 +38,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(13, 17) Source(2, 18) + SourceIndex(0) name (A.constructor) -2 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) name (A.constructor) +1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A.constructor) +2 >Emitted(14, 18) Source(2, 19) + SourceIndex(0) name (A.constructor) --- >>> return A; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(14, 25) Source(2, 19) + SourceIndex(0) name (A) +1->Emitted(15, 17) Source(2, 18) + SourceIndex(0) name (A) +2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0) name (A) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -58,10 +59,10 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(15, 13) Source(2, 18) + SourceIndex(0) name (A) -2 >Emitted(15, 14) Source(2, 19) + SourceIndex(0) name (A) -3 >Emitted(15, 14) Source(2, 1) + SourceIndex(0) -4 >Emitted(15, 18) Source(2, 19) + SourceIndex(0) +1 >Emitted(16, 13) Source(2, 18) + SourceIndex(0) name (A) +2 >Emitted(16, 14) Source(2, 19) + SourceIndex(0) name (A) +3 >Emitted(16, 14) Source(2, 1) + SourceIndex(0) +4 >Emitted(16, 18) Source(2, 19) + SourceIndex(0) --- >>> exports_1("A", A); 1->^^^^^^^^^^^^ @@ -70,9 +71,9 @@ sourceFile:tests/cases/compiler/ref/a.ts 1-> 2 > export class A { } 3 > -1->Emitted(16, 13) Source(2, 1) + SourceIndex(0) -2 >Emitted(16, 30) Source(2, 19) + SourceIndex(0) -3 >Emitted(16, 31) Source(2, 19) + SourceIndex(0) +1->Emitted(17, 13) Source(2, 1) + SourceIndex(0) +2 >Emitted(17, 30) Source(2, 19) + SourceIndex(0) +3 >Emitted(17, 31) Source(2, 19) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:all.js @@ -82,6 +83,7 @@ sourceFile:tests/cases/compiler/b.ts >>> } >>>}); >>>System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) { +>>> "use strict"; >>> var a_1; >>> var B; >>> return { @@ -95,29 +97,29 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >import {A} from "./ref/a"; > -1 >Emitted(29, 13) Source(2, 1) + SourceIndex(1) +1 >Emitted(31, 13) Source(2, 1) + SourceIndex(1) --- >>> __extends(B, _super); 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(30, 17) Source(2, 24) + SourceIndex(1) name (B) -2 >Emitted(30, 38) Source(2, 25) + SourceIndex(1) name (B) +1->Emitted(32, 17) Source(2, 24) + SourceIndex(1) name (B) +2 >Emitted(32, 38) Source(2, 25) + SourceIndex(1) name (B) --- >>> function B() { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(31, 17) Source(2, 1) + SourceIndex(1) name (B) +1 >Emitted(33, 17) Source(2, 1) + SourceIndex(1) name (B) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(32, 21) Source(2, 24) + SourceIndex(1) name (B.constructor) -2 >Emitted(32, 51) Source(2, 25) + SourceIndex(1) name (B.constructor) +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 >^^^^^^^^^^^^^^^^ @@ -125,16 +127,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(33, 17) Source(2, 28) + SourceIndex(1) name (B.constructor) -2 >Emitted(33, 18) Source(2, 29) + SourceIndex(1) name (B.constructor) +1 >Emitted(35, 17) Source(2, 28) + SourceIndex(1) name (B.constructor) +2 >Emitted(35, 18) Source(2, 29) + SourceIndex(1) name (B.constructor) --- >>> return B; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(34, 17) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(34, 25) Source(2, 29) + SourceIndex(1) name (B) +1->Emitted(36, 17) Source(2, 28) + SourceIndex(1) name (B) +2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1) name (B) --- >>> })(a_1.A); 1 >^^^^^^^^^^^^ @@ -150,12 +152,12 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(35, 13) Source(2, 28) + SourceIndex(1) name (B) -2 >Emitted(35, 14) Source(2, 29) + SourceIndex(1) name (B) -3 >Emitted(35, 14) Source(2, 1) + SourceIndex(1) -4 >Emitted(35, 16) Source(2, 24) + SourceIndex(1) -5 >Emitted(35, 21) Source(2, 25) + SourceIndex(1) -6 >Emitted(35, 23) Source(2, 29) + SourceIndex(1) +1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1) name (B) +2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1) name (B) +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) +6 >Emitted(37, 23) Source(2, 29) + SourceIndex(1) --- >>> exports_2("B", B); 1->^^^^^^^^^^^^ @@ -164,9 +166,9 @@ sourceFile:tests/cases/compiler/b.ts 1-> 2 > export class B extends A { } 3 > -1->Emitted(36, 13) Source(2, 1) + SourceIndex(1) -2 >Emitted(36, 30) Source(2, 29) + SourceIndex(1) -3 >Emitted(36, 31) Source(2, 29) + SourceIndex(1) +1->Emitted(38, 13) Source(2, 1) + SourceIndex(1) +2 >Emitted(38, 30) Source(2, 29) + SourceIndex(1) +3 >Emitted(38, 31) Source(2, 29) + SourceIndex(1) --- >>> } >>> } diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js index ae4ac43b5c982..88cb9c9ed3800 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js +++ b/tests/baselines/reference/outModuleTripleSlashRefs.js @@ -43,6 +43,7 @@ var Foo = (function () { return Foo; })(); define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) { + "use strict"; /// var A = (function () { function A() { @@ -52,6 +53,7 @@ define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports.A = A; }); define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) { + "use strict"; var B = (function (_super) { __extends(B, _super); function B() { diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map index 711163a76e862..4c44ff6ae260d 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt index c95eb22cb10ed..b90ce2e7dcd99 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt +++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt @@ -75,27 +75,28 @@ emittedFile:all.js sourceFile:tests/cases/compiler/ref/a.ts ------------------------------------------------------------------- >>>define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> /// 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1-> > 2 > /// -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) -2 >Emitted(13, 36) Source(2, 32) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(14, 36) Source(2, 32) + SourceIndex(1) --- >>> var A = (function () { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(14, 5) Source(3, 1) + SourceIndex(1) +1 >Emitted(15, 5) Source(3, 1) + SourceIndex(1) --- >>> function A() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(15, 9) Source(3, 1) + SourceIndex(1) name (A) +1->Emitted(16, 9) Source(3, 1) + SourceIndex(1) name (A) --- >>> } 1->^^^^^^^^ @@ -105,16 +106,16 @@ sourceFile:tests/cases/compiler/ref/a.ts > member: typeof GlobalFoo; > 2 > } -1->Emitted(16, 9) Source(5, 1) + SourceIndex(1) name (A.constructor) -2 >Emitted(16, 10) Source(5, 2) + SourceIndex(1) name (A.constructor) +1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) name (A.constructor) +2 >Emitted(17, 10) Source(5, 2) + SourceIndex(1) name (A.constructor) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) name (A) -2 >Emitted(17, 17) Source(5, 2) + SourceIndex(1) name (A) +1->Emitted(18, 9) Source(5, 1) + SourceIndex(1) name (A) +2 >Emitted(18, 17) Source(5, 2) + SourceIndex(1) name (A) --- >>> })(); 1 >^^^^ @@ -128,10 +129,10 @@ sourceFile:tests/cases/compiler/ref/a.ts 4 > export class A { > member: typeof GlobalFoo; > } -1 >Emitted(18, 5) Source(5, 1) + SourceIndex(1) name (A) -2 >Emitted(18, 6) Source(5, 2) + SourceIndex(1) name (A) -3 >Emitted(18, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(18, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(19, 5) Source(5, 1) + SourceIndex(1) name (A) +2 >Emitted(19, 6) Source(5, 2) + SourceIndex(1) name (A) +3 >Emitted(19, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.A = A; 1->^^^^ @@ -144,10 +145,10 @@ sourceFile:tests/cases/compiler/ref/a.ts > member: typeof GlobalFoo; > } 4 > -1->Emitted(19, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(19, 14) Source(3, 15) + SourceIndex(1) -3 >Emitted(19, 18) Source(5, 2) + SourceIndex(1) -4 >Emitted(19, 19) Source(5, 2) + SourceIndex(1) +1->Emitted(20, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(20, 14) Source(3, 15) + SourceIndex(1) +3 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) +4 >Emitted(20, 19) Source(5, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:all.js @@ -155,34 +156,35 @@ sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- >>>}); >>>define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) { +>>> "use strict"; >>> var B = (function (_super) { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >import {A} from "./ref/a"; > -1 >Emitted(22, 5) Source(2, 1) + SourceIndex(2) +1 >Emitted(24, 5) Source(2, 1) + SourceIndex(2) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(23, 9) Source(2, 24) + SourceIndex(2) name (B) -2 >Emitted(23, 30) Source(2, 25) + SourceIndex(2) name (B) +1->Emitted(25, 9) Source(2, 24) + SourceIndex(2) name (B) +2 >Emitted(25, 30) Source(2, 25) + SourceIndex(2) name (B) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(24, 9) Source(2, 1) + SourceIndex(2) name (B) +1 >Emitted(26, 9) Source(2, 1) + SourceIndex(2) name (B) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(25, 13) Source(2, 24) + SourceIndex(2) name (B.constructor) -2 >Emitted(25, 43) Source(2, 25) + SourceIndex(2) name (B.constructor) +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 >^^^^^^^^ @@ -190,16 +192,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(26, 9) Source(2, 28) + SourceIndex(2) name (B.constructor) -2 >Emitted(26, 10) Source(2, 29) + SourceIndex(2) name (B.constructor) +1 >Emitted(28, 9) Source(2, 28) + SourceIndex(2) name (B.constructor) +2 >Emitted(28, 10) Source(2, 29) + SourceIndex(2) name (B.constructor) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(27, 9) Source(2, 28) + SourceIndex(2) name (B) -2 >Emitted(27, 17) Source(2, 29) + SourceIndex(2) name (B) +1->Emitted(29, 9) Source(2, 28) + SourceIndex(2) name (B) +2 >Emitted(29, 17) Source(2, 29) + SourceIndex(2) name (B) --- >>> })(a_1.A); 1 >^^^^ @@ -215,12 +217,12 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(28, 5) Source(2, 28) + SourceIndex(2) name (B) -2 >Emitted(28, 6) Source(2, 29) + SourceIndex(2) name (B) -3 >Emitted(28, 6) Source(2, 1) + SourceIndex(2) -4 >Emitted(28, 8) Source(2, 24) + SourceIndex(2) -5 >Emitted(28, 13) Source(2, 25) + SourceIndex(2) -6 >Emitted(28, 15) Source(2, 29) + SourceIndex(2) +1 >Emitted(30, 5) Source(2, 28) + SourceIndex(2) name (B) +2 >Emitted(30, 6) Source(2, 29) + SourceIndex(2) name (B) +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) +6 >Emitted(30, 15) Source(2, 29) + SourceIndex(2) --- >>> exports.B = B; 1->^^^^ @@ -231,10 +233,10 @@ sourceFile:tests/cases/compiler/b.ts 2 > B 3 > extends A { } 4 > -1->Emitted(29, 5) Source(2, 14) + SourceIndex(2) -2 >Emitted(29, 14) Source(2, 15) + SourceIndex(2) -3 >Emitted(29, 18) Source(2, 29) + SourceIndex(2) -4 >Emitted(29, 19) Source(2, 29) + SourceIndex(2) +1->Emitted(31, 5) Source(2, 14) + SourceIndex(2) +2 >Emitted(31, 14) Source(2, 15) + SourceIndex(2) +3 >Emitted(31, 18) Source(2, 29) + SourceIndex(2) +4 >Emitted(31, 19) Source(2, 29) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=all.js.map \ No newline at end of file diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js index 3f9f7eb1415a8..afcc0f829c891 100644 --- a/tests/baselines/reference/overloadModifiersMustAgree.js +++ b/tests/baselines/reference/overloadModifiersMustAgree.js @@ -16,6 +16,7 @@ interface I { //// [overloadModifiersMustAgree.js] +"use strict"; var baz = (function () { function baz() { } diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js index cd6a20742a85c..87248eb8d8395 100644 --- a/tests/baselines/reference/parser0_004152.js +++ b/tests/baselines/reference/parser0_004152.js @@ -5,6 +5,7 @@ export class Game { } //// [parser0_004152.js] +"use strict"; var Game = (function () { function Game() { this.position = new DisplayPosition([]); diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js index 5524a4d606f6c..9a38cdc8b6153 100644 --- a/tests/baselines/reference/parser509546.js +++ b/tests/baselines/reference/parser509546.js @@ -5,6 +5,7 @@ export class Logger { //// [parser509546.js] +"use strict"; var Logger = (function () { function Logger() { } diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js index d0e32feb1cad8..847ded1fdbab2 100644 --- a/tests/baselines/reference/parser509546_1.js +++ b/tests/baselines/reference/parser509546_1.js @@ -5,6 +5,7 @@ export class Logger { //// [parser509546_1.js] +"use strict"; var Logger = (function () { function Logger() { } diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js index 976bbd1e471d1..caeb714c61770 100644 --- a/tests/baselines/reference/parser509546_2.js +++ b/tests/baselines/reference/parser509546_2.js @@ -7,7 +7,7 @@ export class Logger { //// [parser509546_2.js] -"use strict"; +"use strict";"use strict"; var Logger = (function () { function Logger() { } diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js index e52c9667e764a..dbcad3e3d6ef4 100644 --- a/tests/baselines/reference/parser618973.js +++ b/tests/baselines/reference/parser618973.js @@ -5,6 +5,7 @@ export export class Foo { } //// [parser618973.js] +"use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js index d33e8931d18dd..222b2c5ac89ec 100644 --- a/tests/baselines/reference/parserArgumentList1.js +++ b/tests/baselines/reference/parserArgumentList1.js @@ -6,6 +6,7 @@ export function removeClass (node:HTMLElement, className:string) { } //// [parserArgumentList1.js] +"use strict"; function removeClass(node, className) { node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) { return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : ''; diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js index eb1d17566aa06..3f772a2f692c5 100644 --- a/tests/baselines/reference/parserClass1.js +++ b/tests/baselines/reference/parserClass1.js @@ -10,6 +10,7 @@ } //// [parserClass1.js] +"use strict"; var NullLogger = (function () { function NullLogger() { } diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js index b3816ea6ebb68..1fe84f37a074d 100644 --- a/tests/baselines/reference/parserClass2.js +++ b/tests/baselines/reference/parserClass2.js @@ -8,6 +8,7 @@ } //// [parserClass2.js] +"use strict"; var LoggerAdapter = (function () { function LoggerAdapter(logger) { this.logger = logger; diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js index 3b71eee5e49d8..e54fff50c7392 100644 --- a/tests/baselines/reference/parserEnum1.js +++ b/tests/baselines/reference/parserEnum1.js @@ -9,6 +9,7 @@ } //// [parserEnum1.js] +"use strict"; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["IsIndexer"] = 1] = "IsIndexer"; diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js index 9a49b145954f0..8e7da5c73cd8d 100644 --- a/tests/baselines/reference/parserEnum2.js +++ b/tests/baselines/reference/parserEnum2.js @@ -9,6 +9,7 @@ } //// [parserEnum2.js] +"use strict"; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["IsIndexer"] = 1] = "IsIndexer"; diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js index bbfb203931433..1d0c445d3a0d0 100644 --- a/tests/baselines/reference/parserEnum3.js +++ b/tests/baselines/reference/parserEnum3.js @@ -5,6 +5,7 @@ } //// [parserEnum3.js] +"use strict"; (function (SignatureFlags) { })(exports.SignatureFlags || (exports.SignatureFlags = {})); var SignatureFlags = exports.SignatureFlags; diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js index 1bad704748623..1a207960714a3 100644 --- a/tests/baselines/reference/parserEnum4.js +++ b/tests/baselines/reference/parserEnum4.js @@ -6,6 +6,7 @@ } //// [parserEnum4.js] +"use strict"; (function (SignatureFlags) { })(exports.SignatureFlags || (exports.SignatureFlags = {})); var SignatureFlags = exports.SignatureFlags; diff --git a/tests/baselines/reference/parserExportAssignment1.js b/tests/baselines/reference/parserExportAssignment1.js index 5f3c0e1513f9a..cecfe2789f4ee 100644 --- a/tests/baselines/reference/parserExportAssignment1.js +++ b/tests/baselines/reference/parserExportAssignment1.js @@ -2,3 +2,4 @@ export = foo //// [parserExportAssignment1.js] +"use strict"; diff --git a/tests/baselines/reference/parserExportAssignment2.js b/tests/baselines/reference/parserExportAssignment2.js index aaa12cea1795b..cf3f5a1114539 100644 --- a/tests/baselines/reference/parserExportAssignment2.js +++ b/tests/baselines/reference/parserExportAssignment2.js @@ -2,3 +2,4 @@ export = foo; //// [parserExportAssignment2.js] +"use strict"; diff --git a/tests/baselines/reference/parserExportAssignment3.js b/tests/baselines/reference/parserExportAssignment3.js index 13e04c3607af2..55dd6f107bb91 100644 --- a/tests/baselines/reference/parserExportAssignment3.js +++ b/tests/baselines/reference/parserExportAssignment3.js @@ -2,3 +2,4 @@ export = //// [parserExportAssignment3.js] +"use strict"; diff --git a/tests/baselines/reference/parserExportAssignment4.js b/tests/baselines/reference/parserExportAssignment4.js index 7cfd8206dbe0f..8c2c3a8746b8e 100644 --- a/tests/baselines/reference/parserExportAssignment4.js +++ b/tests/baselines/reference/parserExportAssignment4.js @@ -2,3 +2,4 @@ export = ; //// [parserExportAssignment4.js] +"use strict"; diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js index 52f9848c243e0..4e3982e429562 100644 --- a/tests/baselines/reference/parserExportAssignment7.js +++ b/tests/baselines/reference/parserExportAssignment7.js @@ -5,6 +5,7 @@ export class C { export = B; //// [parserExportAssignment7.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js index 3c5b851284e0b..580a0bfe80471 100644 --- a/tests/baselines/reference/parserExportAssignment8.js +++ b/tests/baselines/reference/parserExportAssignment8.js @@ -5,6 +5,7 @@ export class C { } //// [parserExportAssignment8.js] +"use strict"; var C = (function () { function C() { } diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.js b/tests/baselines/reference/parserInterfaceDeclaration6.js index 3cecca19198c9..1ec3325de3443 100644 --- a/tests/baselines/reference/parserInterfaceDeclaration6.js +++ b/tests/baselines/reference/parserInterfaceDeclaration6.js @@ -3,3 +3,4 @@ export export interface I { } //// [parserInterfaceDeclaration6.js] +"use strict"; diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.js b/tests/baselines/reference/parserInterfaceDeclaration7.js index 40998c119cf38..eed874db1431d 100644 --- a/tests/baselines/reference/parserInterfaceDeclaration7.js +++ b/tests/baselines/reference/parserInterfaceDeclaration7.js @@ -3,3 +3,4 @@ export interface I { } //// [parserInterfaceDeclaration7.js] +"use strict"; diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js index 1796c9eddf5d5..e7234a4d2742c 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js @@ -5,6 +5,7 @@ export function foo() { //// [parserModifierOnStatementInBlock1.js] +"use strict"; function foo() { exports.x = this; } diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js index 9c625f0dc7ff7..0520d0e1d0740 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js @@ -6,6 +6,7 @@ export function foo() { //// [parserModifierOnStatementInBlock3.js] +"use strict"; function foo() { function bar() { } diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js index 1eba49114ab83..749715a39d1a1 100644 --- a/tests/baselines/reference/parserModule1.js +++ b/tests/baselines/reference/parserModule1.js @@ -32,6 +32,7 @@ } //// [parserModule1.js] +"use strict"; var CompilerDiagnostics; (function (CompilerDiagnostics) { CompilerDiagnostics.debug = false; diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js index 26edee4e3f7da..c53a6f2ee691d 100644 --- a/tests/baselines/reference/prespecializedGenericMembers1.js +++ b/tests/baselines/reference/prespecializedGenericMembers1.js @@ -21,6 +21,7 @@ var catThing = { var catBag = new CatBag(catThing); //// [prespecializedGenericMembers1.js] +"use strict"; var Cat = (function () { function Cat() { } diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index b9825807eb748..efd96c4442b12 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -1060,6 +1060,7 @@ module publicModuleInGlobal { } //// [privacyAccessorDeclFile_externalModule.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index 8c4108ea9e857..cb6bbc38a7e07 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -138,6 +138,7 @@ class privateClassWithPrivateModuleGetAccessorTypes { //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js] //// [privacyCannotNameAccessorDeclFile_Widgets.js] +"use strict"; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -164,6 +165,7 @@ var SpecializedWidget; SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); //// [privacyCannotNameAccessorDeclFile_exporter.js] +"use strict"; /// var Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -184,6 +186,7 @@ function createExportedWidget4() { } exports.createExportedWidget4 = createExportedWidget4; //// [privacyCannotNameAccessorDeclFile_consumer.js] +"use strict"; var exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index b40d1dc4980b0..b64e813f4ee0f 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -102,6 +102,7 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4() //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js] //// [privacyCannotNameVarTypeDeclFile_Widgets.js] +"use strict"; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -128,6 +129,7 @@ var SpecializedWidget; SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); //// [privacyCannotNameVarTypeDeclFile_exporter.js] +"use strict"; /// var Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -148,6 +150,7 @@ function createExportedWidget4() { } exports.createExportedWidget4 = createExportedWidget4; //// [privacyCannotNameVarTypeDeclFile_consumer.js] +"use strict"; var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index 70bc067bb8d1e..92be6f737ccf1 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -17,6 +17,7 @@ module Query { //// [privacyCheckAnonymousFunctionParameter.js] +"use strict"; exports.x = 1; // Makes this an external module var Query; (function (Query) { diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index 77bb7e9349bb5..9965f472d7510 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -16,6 +16,7 @@ module Q { //// [privacyCheckAnonymousFunctionParameter2.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 1; // Makes this an external module var Q; (function (Q) { diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js index faaef563ebb7c..54ad8acd2f170 100644 --- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js +++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js @@ -9,6 +9,7 @@ export interface B extends A { //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js index 7b5e63ce00992..af368f52078ee 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js @@ -9,6 +9,7 @@ var Foo: new () => Foo.A>; export = Foo; //// [privacyCheckExportAssignmentOnExportedGenericInterface1.js] +"use strict"; var Foo; module.exports = Foo; diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js index 11a5131823098..cb61a82399014 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js @@ -15,6 +15,7 @@ module Foo { //// [privacyCheckExportAssignmentOnExportedGenericInterface2.js] define(["require", "exports"], function (require, exports) { + "use strict"; function Foo(array) { return undefined; } diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js index 8ed0b3cfa1b95..94933d322e690 100644 --- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js +++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js @@ -14,6 +14,7 @@ interface Bar { } //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.js] +"use strict"; var Foo = (function () { function Foo(a) { this.a = a; @@ -22,6 +23,7 @@ var Foo = (function () { })(); module.exports = Foo; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js] +"use strict"; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts] diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js index 6e2ef7449467d..1788435755af3 100644 --- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js +++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js @@ -12,6 +12,7 @@ export class B { //// [privacyCheckOnTypeParameterReferenceInConstructorParameter.js] define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A(callback) { var child = new B(this); diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js index b29a21b98b513..b810dafcca70e 100644 --- a/tests/baselines/reference/privacyCheckTypeOfFunction.js +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js @@ -6,6 +6,7 @@ export var b = foo; //// [privacyCheckTypeOfFunction.js] +"use strict"; function foo() { } exports.b = foo; diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index f632ea8b26ff6..74a4234b47433 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -128,6 +128,7 @@ export class glo_C12_public extends glo_c_private implements glo_i_private, glo } //// [privacyClass.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index a3ddd387883be..4efc6e12b1655 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -98,6 +98,7 @@ class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal { //// [privacyClassExtendsClauseDeclFile_externalModule.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 8327a75b8ab8f..74f1ec1bec69b 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -95,6 +95,7 @@ class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceI //// [privacyClassImplementsClauseDeclFile_externalModule.js] +"use strict"; var publicModule; (function (publicModule) { var privateClassImplementingPublicInterfaceInModule = (function () { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index bf2d820e2eade..6f567ec3bd0ef 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -158,6 +158,7 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js] //// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js] +"use strict"; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -184,6 +185,7 @@ var SpecializedWidget; SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js] +"use strict"; /// var Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -204,6 +206,7 @@ function createExportedWidget4() { } exports.createExportedWidget4 = createExportedWidget4; //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js] +"use strict"; var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index 8de50f4ea8ac5..1de0f2b664276 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -165,6 +165,7 @@ function privateFunctionWithPrivateModuleReturnTypes1() { //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js] //// [privacyFunctionReturnTypeDeclFile_Widgets.js] +"use strict"; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -191,6 +192,7 @@ var SpecializedWidget; SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); //// [privacyFunctionReturnTypeDeclFile_exporter.js] +"use strict"; /// var Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -211,6 +213,7 @@ function createExportedWidget4() { } exports.createExportedWidget4 = createExportedWidget4; //// [privacyFunctionReturnTypeDeclFile_consumer.js] +"use strict"; var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index 91de4d4ffff2b..e02c221d33395 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -687,6 +687,7 @@ module publicModuleInGlobal { } //// [privacyFunctionParameterDeclFile_externalModule.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 05e418ccaa80f..b312578b7a390 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -1194,6 +1194,7 @@ module publicModuleInGlobal { } //// [privacyFunctionReturnTypeDeclFile_externalModule.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index ff10e6238cb84..95e3dda5643e7 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -209,6 +209,7 @@ class C8_private { //// [privacyGetter.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m1; (function (m1) { var C1_public = (function () { diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index 3ae522b146cda..ff801078df569 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -532,6 +532,7 @@ export function f12_public(): C5_private { //error //// [privacyGloFunc.js] define(["require", "exports"], function (require, exports) { + "use strict"; var m1; (function (m1) { var C1_public = (function () { diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 02ee47341c4ba..13a6bc396eadf 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -357,6 +357,7 @@ export module m3 { } //// [privacyImport.js] +"use strict"; var m1; (function (m1) { var m1_M1_public; diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index 71f20286f901e..7a7e7141684fa 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -357,6 +357,7 @@ export module m3 { } //// [privacyImportParseErrors.js] +"use strict"; var m1; (function (m1) { var m1_M1_public; diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 43fd3682f5053..78e87bc22d24f 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -265,6 +265,7 @@ export interface glo_C6_public extends glo_i_private, glo_i_public { } //// [privacyInterface.js] +"use strict"; var m1; (function (m1) { var C1_public = (function () { diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js index 65f0a2af420b7..8b2c4de8bf387 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js @@ -95,4 +95,5 @@ interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInter //// [privacyInterfaceExtendsClauseDeclFile_externalModule.js] +"use strict"; //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js] diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index 2088123015643..e5c127272b7a4 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -153,6 +153,7 @@ module import_private { } //// [privacyLocalInternalReferenceImportWithExport.js] +"use strict"; // private elements var m_private; (function (m_private) { diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 65565d3a5de09..9cc4f6a9160c4 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -154,6 +154,7 @@ module import_private { //// [privacyLocalInternalReferenceImportWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; // private elements var m_private; (function (m_private) { diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js index 4d184dfe7148d..5cb455f47bc08 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js @@ -51,6 +51,7 @@ export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); //// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.js] //// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js] //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js] +"use strict"; // Public elements var c_public = (function () { function c_public() { @@ -59,6 +60,7 @@ var c_public = (function () { })(); exports.c_public = c_public; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js] +"use strict"; var c_public = (function () { function c_public() { } @@ -66,6 +68,7 @@ var c_public = (function () { })(); exports.c_public = c_public; //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js] +"use strict"; /// /// // Privacy errors - importing private elements diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js index c03c532da3bbf..a03c7dcef6225 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -52,6 +52,7 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js] //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js] define(["require", "exports"], function (require, exports) { + "use strict"; // Public elements var c_public = (function () { function c_public() { @@ -62,6 +63,7 @@ define(["require", "exports"], function (require, exports) { }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var c_public = (function () { function c_public() { } @@ -71,6 +73,7 @@ define(["require", "exports"], function (require, exports) { }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js] define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) { + "use strict"; // Usage of privacy error imports var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private(); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index ec2d039df012d..5daa00d576465 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -101,6 +101,7 @@ export var publicUse_im_public_mu_public: im_public_mu_public.i; //// [privacyTopLevelInternalReferenceImportWithExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; // private elements var m_private; (function (m_private) { diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index a0eb39985b418..2abc4b11d9364 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -102,6 +102,7 @@ export var publicUse_im_private_mu_public: im_private_mu_public.i; //// [privacyTopLevelInternalReferenceImportWithoutExport.js] define(["require", "exports"], function (require, exports) { + "use strict"; // private elements var m_private; (function (m_private) { diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js index 5505e1a5b3b09..ec447d9ccbbcd 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunction.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js @@ -133,6 +133,7 @@ function privateFunctionWithPublicTypeParametersWithoutExtends() { } //// [privacyTypeParameterOfFunction.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 16b1e360f3367..41dbb84a3ff7f 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -439,6 +439,7 @@ module privateModule { } //// [privacyTypeParameterOfFunctionDeclFile.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js index c76eaa67851c7..8118d94ab7d08 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClass.js +++ b/tests/baselines/reference/privacyTypeParametersOfClass.js @@ -44,6 +44,7 @@ class privateClassWithPublicTypeParametersWithoutExtends { //// [privacyTypeParametersOfClass.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index d2db553e9db31..e9e1ad218bdc4 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -155,6 +155,7 @@ module privateModule { //// [privacyTypeParametersOfClassDeclFile.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js index 02e63ce70985c..c77da126cb615 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterface.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js @@ -59,6 +59,7 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends { } //// [privacyTypeParametersOfInterface.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index 69ed8d36fc3a6..ae8ee2d43f325 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -191,6 +191,7 @@ module privateModule { } //// [privacyTypeParametersOfInterfaceDeclFile.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index 17c7b1a74d152..b5a68268074f6 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -175,6 +175,7 @@ var glo_v23_private: glo_C2_private = new glo_C2_private(); export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error //// [privacyVar.js] +"use strict"; var m1; (function (m1) { var C1_public = (function () { diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 4632ef8c60a96..5dd2e611ffb03 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -426,6 +426,7 @@ module publicModuleInGlobal { } //// [privacyVarDeclFile_externalModule.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js index 078eed7d1f186..d3a0c1c87642d 100644 --- a/tests/baselines/reference/privatePropertyUsingObjectType.js +++ b/tests/baselines/reference/privatePropertyUsingObjectType.js @@ -11,6 +11,7 @@ export interface IFilterProvider { //// [privatePropertyUsingObjectType.js] define(["require", "exports"], function (require, exports) { + "use strict"; var FilterManager = (function () { function FilterManager() { } diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js index ed53ca816db39..2586bbb23bddc 100644 --- a/tests/baselines/reference/project/baseline/amd/decl.js +++ b/tests/baselines/reference/project/baseline/amd/decl.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; ; function point(x, y) { return { x: x, y: y }; diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js deleted file mode 100644 index 12560b1cabeed..0000000000000 --- a/tests/baselines/reference/project/baseline/amd/emit.js +++ /dev/null @@ -1,3 +0,0 @@ -define(["require", "exports", "./decl"], function (require, exports, g) { - var p = g.point(10, 20); -}); diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js index eb0c46dd93e3f..f6c19174e54a7 100644 --- a/tests/baselines/reference/project/baseline/node/decl.js +++ b/tests/baselines/reference/project/baseline/node/decl.js @@ -1,3 +1,4 @@ +"use strict"; ; function point(x, y) { return { x: x, y: y }; diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js deleted file mode 100644 index 2188cfe391050..0000000000000 --- a/tests/baselines/reference/project/baseline/node/emit.js +++ /dev/null @@ -1,2 +0,0 @@ -var g = require("./decl"); -var p = g.point(10, 20); diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js index ed53ca816db39..2586bbb23bddc 100644 --- a/tests/baselines/reference/project/baseline2/amd/decl.js +++ b/tests/baselines/reference/project/baseline2/amd/decl.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; ; function point(x, y) { return { x: x, y: y }; diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js deleted file mode 100644 index d3e9e871c2d8e..0000000000000 --- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js +++ /dev/null @@ -1,3 +0,0 @@ -define(["require", "exports"], function (require, exports) { - var p = { x: 10, y: 20 }; -}); diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js index eb0c46dd93e3f..f6c19174e54a7 100644 --- a/tests/baselines/reference/project/baseline2/node/decl.js +++ b/tests/baselines/reference/project/baseline2/node/decl.js @@ -1,3 +1,4 @@ +"use strict"; ; function point(x, y) { return { x: x, y: y }; diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js deleted file mode 100644 index b6239b1295dfa..0000000000000 --- a/tests/baselines/reference/project/baseline2/node/dont_emit.js +++ /dev/null @@ -1 +0,0 @@ -var p = { x: 10, y: 20 }; diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js index d1d6f93af988a..36eb17665d60f 100644 --- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var outer; (function (outer) { var inner; diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js index d69e2022379c5..1d5c5c9d534ec 100644 --- a/tests/baselines/reference/project/baseline3/node/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js @@ -1,3 +1,4 @@ +"use strict"; var outer; (function (outer) { var inner; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts deleted file mode 100644 index c766ad8c44145..0000000000000 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -declare module "quotedm1" { - import m4 = require("m4"); - class v { - c: m4.d; - } -} -declare module "quotedm2" { - import m1 = require("quotedm1"); - var c: m1.v; -} diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts deleted file mode 100644 index c766ad8c44145..0000000000000 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -declare module "quotedm1" { - import m4 = require("m4"); - class v { - c: m4.d; - } -} -declare module "quotedm2" { - import m1 = require("quotedm1"); - var c: m1.v; -} diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts deleted file mode 100644 index f9388238202d2..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import glo_m4 = require("glo_m4"); -export declare var useGlo_m4_x4: glo_m4.d; -export declare var useGlo_m4_d4: typeof glo_m4.d; -export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js deleted file mode 100644 index 8e81cc2d03fbf..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js +++ /dev/null @@ -1,5 +0,0 @@ -define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) { - exports.useGlo_m4_x4 = glo_m4.x; - exports.useGlo_m4_d4 = glo_m4.d; - exports.useGlo_m4_f4 = glo_m4.foo(); -}); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts deleted file mode 100644 index f9388238202d2..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import glo_m4 = require("glo_m4"); -export declare var useGlo_m4_x4: glo_m4.d; -export declare var useGlo_m4_d4: typeof glo_m4.d; -export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js deleted file mode 100644 index 11b8659fda69f..0000000000000 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js +++ /dev/null @@ -1,4 +0,0 @@ -var glo_m4 = require("glo_m4"); -exports.useGlo_m4_x4 = glo_m4.x; -exports.useGlo_m4_d4 = glo_m4.d; -exports.useGlo_m4_f4 = glo_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts deleted file mode 100644 index 40f147141dea5..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare module usePrivate_m4_m1 { - var numberVar: number; -} diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js deleted file mode 100644 index fd6c8ad47f40d..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js +++ /dev/null @@ -1,8 +0,0 @@ -define(["require", "exports", "private_m4"], function (require, exports, private_m4) { - var usePrivate_m4_m1; - (function (usePrivate_m4_m1) { - var x3 = private_m4.x; - var d3 = private_m4.d; - var f3 = private_m4.foo(); - })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); -}); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts deleted file mode 100644 index 40f147141dea5..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare module usePrivate_m4_m1 { - var numberVar: number; -} diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js deleted file mode 100644 index 8fe4cca6e92f8..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js +++ /dev/null @@ -1,8 +0,0 @@ -// only used privately no need to emit -var private_m4 = require("private_m4"); -var usePrivate_m4_m1; -(function (usePrivate_m4_m1) { - var x3 = private_m4.x; - var d3 = private_m4.d; - var f3 = private_m4.foo(); -})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts deleted file mode 100644 index 68bda5279ee29..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import fncOnly_m4 = require("fncOnly_m4"); -export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js deleted file mode 100644 index b8bed40b45895..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js +++ /dev/null @@ -1,3 +0,0 @@ -define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) { - exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); -}); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts deleted file mode 100644 index 68bda5279ee29..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import fncOnly_m4 = require("fncOnly_m4"); -export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js deleted file mode 100644 index 77269ecdb7831..0000000000000 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js +++ /dev/null @@ -1,2 +0,0 @@ -var fncOnly_m4 = require("fncOnly_m4"); -exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js deleted file mode 100644 index ef62a311ef337..0000000000000 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js +++ /dev/null @@ -1,6 +0,0 @@ -define(["require", "exports", "m4"], function (require, exports, m4) { - function foo2() { - return new m4.d(); - } - exports.foo2 = foo2; -}); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js deleted file mode 100644 index dd66dca110af6..0000000000000 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js +++ /dev/null @@ -1,8 +0,0 @@ -define(["require", "exports", "m5"], function (require, exports, m5) { - exports.d = m5.foo2(); - exports.x = m5.foo2; - function n() { - return m5.foo2(); - } - exports.n = n; -}); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js deleted file mode 100644 index 4cac240b5185d..0000000000000 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js +++ /dev/null @@ -1,5 +0,0 @@ -var m4 = require("m4"); // Emit used -function foo2() { - return new m4.d(); -} -exports.foo2 = foo2; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js deleted file mode 100644 index f458d0b1f1735..0000000000000 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js +++ /dev/null @@ -1,8 +0,0 @@ -// Do not emit unused import -var m5 = require("m5"); -exports.d = m5.foo2(); -exports.x = m5.foo2; -function n() { - return m5.foo2(); -} -exports.n = n; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts deleted file mode 100644 index 508c764d1537e..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} -export declare var useMultiImport_m4_x4: m4.d; -export declare var useMultiImport_m4_d4: typeof m4.d; -export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js deleted file mode 100644 index 870c93af0850c..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) { - exports.x4 = m4.x; - exports.d4 = m4.d; - exports.f4 = m4.foo(); - var m1; - (function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); - exports.useMultiImport_m4_x4 = multiImport_m4.x; - exports.useMultiImport_m4_d4 = multiImport_m4.d; - exports.useMultiImport_m4_f4 = multiImport_m4.foo(); -}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts deleted file mode 100644 index 508c764d1537e..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} -export declare var useMultiImport_m4_x4: m4.d; -export declare var useMultiImport_m4_d4: typeof m4.d; -export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js deleted file mode 100644 index f55c2425fa130..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js +++ /dev/null @@ -1,18 +0,0 @@ -var m4 = require("m4"); // Emit used -exports.x4 = m4.x; -exports.d4 = m4.d; -exports.f4 = m4.foo(); -var m1; -(function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); -// Do not emit multiple used import statements -var multiImport_m4 = require("m4"); // Emit used -exports.useMultiImport_m4_x4 = multiImport_m4.x; -exports.useMultiImport_m4_d4 = multiImport_m4.d; -exports.useMultiImport_m4_f4 = multiImport_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts deleted file mode 100644 index 8f3e96bb9daf9..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import m4 = require("m4"); -export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js deleted file mode 100644 index ef62a311ef337..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js +++ /dev/null @@ -1,6 +0,0 @@ -define(["require", "exports", "m4"], function (require, exports, m4) { - function foo2() { - return new m4.d(); - } - exports.foo2 = foo2; -}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts deleted file mode 100644 index f2ba92bca9e3b..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} -export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js deleted file mode 100644 index f3874188538a8..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { - exports.x4 = m4.x; - exports.d4 = m4.d; - exports.f4 = m4.foo(); - var m1; - (function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); - exports.d = m5.foo2(); -}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts deleted file mode 100644 index 8f3e96bb9daf9..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import m4 = require("m4"); -export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js deleted file mode 100644 index 4cac240b5185d..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js +++ /dev/null @@ -1,5 +0,0 @@ -var m4 = require("m4"); // Emit used -function foo2() { - return new m4.d(); -} -exports.foo2 = foo2; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts deleted file mode 100644 index f2ba92bca9e3b..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} -export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js deleted file mode 100644 index 0e0b8a00f8148..0000000000000 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js +++ /dev/null @@ -1,16 +0,0 @@ -var m4 = require("m4"); // Emit used -exports.x4 = m4.x; -exports.d4 = m4.d; -exports.f4 = m4.foo(); -var m1; -(function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); -// Do not emit unused import -var m5 = require("m5"); -exports.d = m5.foo2(); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js index c89712ecc7f88..1d46a3ca30270 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts deleted file mode 100644 index c5355f22ef5da..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js deleted file mode 100644 index 065672a1e0a2a..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js +++ /dev/null @@ -1,14 +0,0 @@ -define(["require", "exports", "m4"], function (require, exports, m4) { - exports.x4 = m4.x; - exports.d4 = m4.d; - exports.f4 = m4.foo(); - var m1; - (function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); -}); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts deleted file mode 100644 index 6cb9280b837dd..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare class d { -} -export declare var x: d; -export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js index 2c8c4f0714967..505e7d74da84f 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js @@ -1,3 +1,4 @@ +"use strict"; var d = (function () { function d() { } diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts deleted file mode 100644 index c5355f22ef5da..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import m4 = require("m4"); -export declare var x4: m4.d; -export declare var d4: typeof m4.d; -export declare var f4: m4.d; -export declare module m1 { - var x2: m4.d; - var d2: typeof m4.d; - var f2: m4.d; -} diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js deleted file mode 100644 index 66e5ab171428e..0000000000000 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js +++ /dev/null @@ -1,13 +0,0 @@ -var m4 = require("m4"); // Emit used -exports.x4 = m4.x; -exports.d4 = m4.d; -exports.f4 = m4.foo(); -var m1; -(function (m1) { - m1.x2 = m4.x; - m1.d2 = m4.d; - m1.f2 = m4.foo(); - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 8e555fb23f217..baf1850273705 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:../../ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 9dad0db002a05..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 0e907c1a2cad0..35ab07b71bb72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index c664292eca356..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 1602fe4d4e088..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 240277bfc7004..ba1c349340ca1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ../../ref/m2.ts emittedFile:ref/m2.js sourceFile:../../ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index 3eaebd5c1367e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index cbb2dc3649237..4dd1893855b02 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index c664292eca356..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 1602fe4d4e088..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 1a530c850e242..75464f26d822a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:../../ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index 9dad0db002a05..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 0e907c1a2cad0..35ab07b71bb72 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index c664292eca356..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 1602fe4d4e088..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 511832f1de058..5a334744761e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ../../ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:../../ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index 3eaebd5c1367e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index cbb2dc3649237..4dd1893855b02 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index c664292eca356..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 1602fe4d4e088..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index af837fd203136..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 94371fe696d3e..521e71d31151c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 94348f987ce1b..9a119a0b9ab38 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:../ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:../test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index de704afeedb14..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 22aaecafe2d3d..70bbc8a159bc5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index c0dbdb42cdf16..ec3a5b9c64025 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:../ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:../test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index b02c7fdd8c2bf..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index 8fe95a1506f8a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 4b883a84e706d..9df06b821f56b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:../../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index 52b5e682660ed..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 652d934d6022c..85ab08c32f501 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index a2a29b4dcfc07..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index be0b3a580f51c..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index f9d0dd89e9ce8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index 589c5838a2c10..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 5ab3146b09944..694d1abdf8c94 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../ref/m1.ts emittedFile:ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: ../../../outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: ../../test.ts emittedFile:test.js sourceFile:../../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:../../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:../../test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:../../test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index b0e6a265bc985..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 15bddd32fe5c9..1b7d4d64d0e20 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 16422a234c58c..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index eae921435ac84..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 1236cb2c82711..44026abac0c90 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 52b5e682660ed..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 652d934d6022c..85ab08c32f501 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index a2a29b4dcfc07..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index be0b3a580f51c..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 8fe95a1506f8a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index b02c7fdd8c2bf..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 7fd3bf30722e4..174f60d93d3ed 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: ../../../outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: ../../test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:../../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:../../test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:../../test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index b0e6a265bc985..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 15bddd32fe5c9..1b7d4d64d0e20 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 16422a234c58c..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index eae921435ac84..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 589c5838a2c10..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index f9d0dd89e9ce8..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 25cd156c4ab29..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index c532c3846d9a3..832025f87dde8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 4462b142d9804..9cf0b9a026c95 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index 86c0ba4123800..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 7f5576a8a9c7f..68633de02d188 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 834a5c3a112c1..04d7ecd06041b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:../m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 6e24571a3f270..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index 80d6bbf450bb9..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index c8a4f5c91a47b..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index ce271e4a3cd16..648fd1e599d94 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 668c24e25c517..b7876bdd67c39 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../m1.ts emittedFile:m1.js sourceFile:../m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../test.ts emittedFile:test.js sourceFile:../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index 080dcf6e8181e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index de9ec1f985913..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ebb800ef3dd85..3af789a02dd54 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:../m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index 86c0ba4123800..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 7f5576a8a9c7f..68633de02d188 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 6e24571a3f270..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 80d6bbf450bb9..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ed2f07140c453..cde2e4bfc5c30 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../m1.ts emittedFile:outdir/simple/m1.js sourceFile:../m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../test.ts emittedFile:outdir/simple/test.js sourceFile:../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index c8a4f5c91a47b..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ce271e4a3cd16..648fd1e599d94 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 080dcf6e8181e..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index de9ec1f985913..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index d3d9bd9dc8583..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 6377a26395e5e..6b99313a1542e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index d8ab3db126671..ef4538e91dbb7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index a8488d8a1345c..69df918515ea5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index e819d557c4032..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 88e67e19b3669..d03127f163428 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 3b2cd1a24c424..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 80d6bbf450bb9..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index f227d9809ada5..fc72f7483cd86 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../ref/m1.ts emittedFile:ref/m1.js sourceFile:../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../test.ts emittedFile:test.js sourceFile:../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index a420241c901c3..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 420650feeac89..d9775d0dc64d9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index f6319258d8f9d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 15d4e3e1c9b08..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index f5cd30a8a50d0..d503f9569dbed 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index e819d557c4032..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 88e67e19b3669..d03127f163428 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/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":";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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 3b2cd1a24c424..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 80d6bbf450bb9..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 2e0ba5061ceca..fec071a7b2532 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../test.ts emittedFile:outdir/simple/test.js sourceFile:../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index a420241c901c3..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 420650feeac89..d9775d0dc64d9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index f6319258d8f9d..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 15d4e3e1c9b08..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 176c3f78407c2..0000000000000 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index f77c1351b1584..5d8a832b073b8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index d63cf86d23670..54642411b7210 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index e6c67f2d66a12..d2675a63be54e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 4f0b35f21c7e5..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 81bb9202e5a9c..79ee2262fd075 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 15ea98ef7edde..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 3fcfc31e4d1be..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index ad208f9375c4f..13996b5046c62 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ../../outputdir_mixed_subfolder/ref/m2.ts emittedFile:ref/m2.js sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index f13773b3384b3..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 98da596cfa43d..c580cfcdef64e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 15ea98ef7edde..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 3fcfc31e4d1be..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 181b1b84b5f27..40d5929b13e56 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index e4c8f7b361033..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 81bb9202e5a9c..79ee2262fd075 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index ce180d55323bd..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 3fcfc31e4d1be..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 4230c8e6366f1..506f9be4304d5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ../../outputdir_mixed_subfolder/ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index d78261fe225e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 98da596cfa43d..c580cfcdef64e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index ce180d55323bd..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 3fcfc31e4d1be..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index bd14cd07502d1..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index ca8dd0934b5b4..792db4167a2e8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index cfd0952c941db..1aa0ea128ce32 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 59405bccb9c15..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 794d2a5817671..9d14f5266f473 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index cb14a553f053a..c3a519b1609c4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:../outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index 9745ad1a4ab6c..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index ad9b3f686118e..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 12d96900c84c4..3374eb17aec02 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:../../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index 09fbf68994d4d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index e7200adafdbc0..13589ceb7d1db 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 90dee0800c7b8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index f2b1ea701105c..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index c2ac2bc27101a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index 573ce2ac6c550..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 567b51cfff5f8..ec68e0273dcb4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../projects/outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: ../../projects/outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: ../../projects/outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:../../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:../../projects/outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 87f1f3a51b7a5..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 074ab743af3ed..bffb00ffe1078 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 6e2fb8d785198..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 85da8e394210b..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 58dd5dfef8213..386510e17901f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 3b74c0f890ef4..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7200adafdbc0..13589ceb7d1db 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 5224ad7d4fde7..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index f2b1ea701105c..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 2f060a4768661..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 9745ad1a4ab6c..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index b4900315771c4..ed272d5a3f882 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../projects/outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../../../projects/outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: ../../projects/outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: ../../projects/outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:../../projects/outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index ab4a16c55108d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 074ab743af3ed..bffb00ffe1078 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index c439bd5a5ef55..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 85da8e394210b..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index f8a4cd2f22225..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index c2ac2bc27101a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 8b1094335619f..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index a7235c6c2b368..31d0025dfdc5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 47e1835365a19..b71034c501723 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index 1fe3446e4bc00..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index e2625035edb1b..087db19967d45 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 76375ce0d0c9b..5fd77f00b8c76 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:../outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:../outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 14471b6e983ce..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index 5ce1629342421..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 73a399fe2533e..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index 0950101384da7..01f697a5a059f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index aff5583a5e9ac..63394af9b7336 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../outputdir_module_simple/m1.ts emittedFile:m1.js sourceFile:../outputdir_module_simple/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../outputdir_module_simple/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../outputdir_module_simple/test.ts emittedFile:test.js sourceFile:../outputdir_module_simple/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../outputdir_module_simple/test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index 1a2a4fc5e6abd..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index c0654a8e141c4..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 458c6b0616238..e3425c6a6a97d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:../outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index 1c7488c76ca50..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index e2625035edb1b..087db19967d45 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 5de61a43765a3..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 5ce1629342421..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index bcfdd607553c2..f27c4c330dfe6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../outputdir_module_simple/m1.ts emittedFile:outdir/simple/m1.js sourceFile:../outputdir_module_simple/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../outputdir_module_simple/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../outputdir_module_simple/test.ts emittedFile:outdir/simple/test.js sourceFile:../outputdir_module_simple/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../outputdir_module_simple/test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index a39c6a4f1040d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 0950101384da7..01f697a5a059f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index acba051a083a7..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index c0654a8e141c4..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 8ff2bbdb75b7d..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index b94a5ff18e5b1..8eb534d2c9e30 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 8099c2f176aef..7aa54e01e30ce 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 46af484749055..ce04b487c0c6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:../../outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:../outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index 3e8406858e243..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 66acf4aace791..6541a3e240157 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 84b62ed0fc7af..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 6139e8293b0ef..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 48f639a7ee2ee..6c416312324f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../outputdir_module_subfolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:../../outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../../outputdir_module_subfolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../outputdir_module_subfolder/test.ts emittedFile:test.js sourceFile:../outputdir_module_subfolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 2dbac1edb8e92..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 7e9c3643b9982..246d94a0ec836 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index c6dd0639fb74e..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 64b21aa3115db..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 59c165fe0e3e7..1478fd96830f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:../../outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index 60a3a0f5552b6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 66acf4aace791..6541a3e240157 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 14791061d04ad..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 6139e8293b0ef..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index abf4b9d6a848d..d5358c4da8137 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../outputdir_module_subfolder/ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:../../outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../../outputdir_module_subfolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../outputdir_module_subfolder/test.ts emittedFile:outdir/simple/test.js sourceFile:../outputdir_module_subfolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 5f32feb74bdd9..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 7e9c3643b9982..246d94a0ec836 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 5c2cb37295456..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 64b21aa3115db..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index ccc0a7b503b98..0000000000000 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index ae6d9b422211d..5abdaa8f6ba8e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index e666ef224a3cb..fc9b3049fd963 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 7c797a023a2ff..cbd6de77fe9a2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index aa404804b4587..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index c2157bc3b1b87..e6dacba2b78e1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 767d260e0b828..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 6aecdcd084ae7..4eaeab55eff9c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts emittedFile:ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index a39f0f50e5f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0230aad40a59d..e0bf14b5bc474 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 767d260e0b828..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 06b8e768334c6..7949c2d5b3ca1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index aa404804b4587..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index c2157bc3b1b87..e6dacba2b78e1 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 767d260e0b828..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 468e5d2338b7f..4a8ba9b217550 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index a39f0f50e5f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0230aad40a59d..e0bf14b5bc474 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 767d260e0b828..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6fbac81a12dba..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index c6996bb53b9d7..6605d8898031a 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 0fa723ff01b48..b014323fd2478 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 8c16871c4a728..0000000000000 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index d78e3b4607a62..1500c77b6385f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 6746d0609b6f9..893609a1c3bf4 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index 66c8fa96a0b8e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index e926e95f3c38b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index f07b7d9212d5f..0e5a6dcb68838 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index e8004c87aadb5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 37bc803927189..52ccb1efa3d41 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 01ad8f96e78ea..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index 4e7e9721b83c0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index ec29dfcad186b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index 721fdf3827f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index e3d905204b2d3..e8553f1185b49 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 7b14808a06713..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index c88465aaec47d..b1bab88571001 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index b9191db7d5ffb..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 6a18d277c1070..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 34cc5d53b87b6..d4ced7ae277c8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index e8004c87aadb5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 37bc803927189..52ccb1efa3d41 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 01ad8f96e78ea..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 4e7e9721b83c0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index e926e95f3c38b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 66c8fa96a0b8e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 097d3769047b1..bd6c5fe69aeff 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: file:///tests/cases/projects/outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 7b14808a06713..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index c88465aaec47d..b1bab88571001 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index b9191db7d5ffb..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 6a18d277c1070..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 721fdf3827f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index ec29dfcad186b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 0734d350e1117..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 211bf71cbedf0..79898c4e3e919 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 5805c876be804..07d59c79c595f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index 1a4d200cdcb5c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map index d2270dfd2ce62..c27af9c0c27e2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index 7df7c4142e888..4dd2bbd8ab1b1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index d752d7f8395e1..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index de9d99184d24d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 02ca4ab81c74b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map index bc2e2667bcd70..9a7bceb490a42 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index ff16dbdb8d68e..4b5038260ac44 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts emittedFile:m1.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_simple/test.ts emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index 1d5a32f0ad5e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index b9c164bb73283..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 4a730d962af85..67c6f8a950167 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index 1a4d200cdcb5c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index d2270dfd2ce62..c27af9c0c27e2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index d752d7f8395e1..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index de9d99184d24d..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 67a86d9d9ae97..bd53b11f4b7bd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts emittedFile:outdir/simple/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_simple/test.ts emittedFile:outdir/simple/test.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 02ca4ab81c74b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index bc2e2667bcd70..9a7bceb490a42 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 1d5a32f0ad5e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index b9c164bb73283..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 77db9e80a53e0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 445268f27c17b..81c38ed7deff6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 36bfe394d3907..107ecea85beb0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index d2d74c7219d48..bfd54370663ae 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index 73309eabe3027..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index ec8a7690d4715..283556019d71e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 270604ea7cbd0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 35691a873b83e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index acf02348d67ec..6cd516d176c43 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_subfolder/test.ts emittedFile:test.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 8f31dc2aaa230..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 95de442e92d38..95a20adfaf231 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 9bb4ed0180a31..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index fee2f4cb12936..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index b41fcbbc7b615..e8d959e801a71 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index 73309eabe3027..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index ec8a7690d4715..283556019d71e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 270604ea7cbd0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 35691a873b83e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index a70074a2fbd23..c81c5ed9b0abc 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: file:///tests/cases/projects/outputdir_module_subfolder/test.ts emittedFile:outdir/simple/test.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 8f31dc2aaa230..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 95de442e92d38..95a20adfaf231 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 9bb4ed0180a31..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index fee2f4cb12936..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 10c38a7441189..0000000000000 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 439677f8aba06..30926365155a1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 617b90f7c814e..94eda1f9ae80b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index d7a3195e99556..0dfbd650bcc4e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index aa404804b4587..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index 04f168a6289cc..b5ad7ba171bd7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index fe1ebdb1cc96a..31d496eaf780c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index a39f0f50e5f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0ce68e169af7d..adcafe3407594 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 6f2bf783957ab..4f491eac30eb4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index aa404804b4587..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 04f168a6289cc..b5ad7ba171bd7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index eff1de8b03918..a747e9cc86443 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index a39f0f50e5f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0ce68e169af7d..adcafe3407594 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index d346b13ac18dc..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 6fbac81a12dba..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 37bb9be8a9590..cccdce4c32039 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 1a75ab0b60194..61e9fc62b6dee 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 8c16871c4a728..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index f3058d9f8787f..7132f8221606f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 2a4bc95cbc247..144c780957a2f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index 3b00d82ab66c4..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index e926e95f3c38b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index e8aa1436d988a..990eb941b4ea5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index e8004c87aadb5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 8c257bd111148..496137bf2d900 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 01ad8f96e78ea..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index 8612cd0d1085a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index 058e405b6061e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index 721fdf3827f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index a8f4f3bf2385b..e8f7704fcdfde 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 7b14808a06713..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index e7f54a4a2e144..cd11e38f17e56 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index b9191db7d5ffb..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 4ac74c2fcdb7c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 009fa65f89ca6..b476277976efb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index e8004c87aadb5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 8c257bd111148..496137bf2d900 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 01ad8f96e78ea..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 8612cd0d1085a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index e926e95f3c38b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 3b00d82ab66c4..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 8fbb0bd391688..cf0aabf1c4830 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 7b14808a06713..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7f54a4a2e144..cd11e38f17e56 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index b9191db7d5ffb..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 4ac74c2fcdb7c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 721fdf3827f91..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 058e405b6061e..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 0734d350e1117..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 85e465474d309..35d74f3b18542 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 20a9789039979..4131a828e0b2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index 1a4d200cdcb5c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 6751f2f82cd22..e0d61ffec8ba4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 06f3e02521d12..ef80095c4140d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index d752d7f8395e1..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 02ca4ab81c74b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index ca45773f423fb..cd7a2b2b59000 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 2843c88faf5ac..1e24fe0eba725 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index 1d5a32f0ad5e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index 41d3e11e99563..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 0f31c24c53996..55d4683ae6c21 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index 1a4d200cdcb5c..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 6751f2f82cd22..e0d61ffec8ba4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index d752d7f8395e1..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 8b33b445d72bb..0aab28818cd5e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 02ca4ab81c74b..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ca45773f423fb..cd7a2b2b59000 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 1d5a32f0ad5e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 41d3e11e99563..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 77db9e80a53e0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 2ace469f90296..5052e3d39724c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index bd33dbb5ec7e0..e82573212547a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 89ea048e26883..e890b5ab95ed7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index 73309eabe3027..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6c5413f630e73..ee2b86c4e4195 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 270604ea7cbd0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index bf0333f3d1263..16acdea18a852 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 8f31dc2aaa230..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 35e7e9a48dd7c..fbaa84744b325 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 9bb4ed0180a31..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index d0638b6c34ce5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c16c32be6b264..1a942a4a1ad83 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index 73309eabe3027..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6c5413f630e73..ee2b86c4e4195 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 270604ea7cbd0..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 363cd0e29f154..277733317c527 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 8f31dc2aaa230..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 35e7e9a48dd7c..fbaa84744b325 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 9bb4ed0180a31..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index d0638b6c34ce5..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 10c38a7441189..0000000000000 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 29e01bc0bc6d2..3e3afaaac13ee 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 557f15f4e2a0b..01b8b2237ff3e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js deleted file mode 100644 index c10bad1802df2..0000000000000 --- a/tests/baselines/reference/project/nonRelative/amd/consume.js +++ /dev/null @@ -1,8 +0,0 @@ -define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) { - x.hello(); - y.hello(); - var str = mod.call(); - if (str !== "success") { - fail(); - } -}); diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js index 03d7ba46e190f..f2dbc101a5221 100644 --- a/tests/baselines/reference/project/nonRelative/amd/decl.js +++ b/tests/baselines/reference/project/nonRelative/amd/decl.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; function call() { return "success"; } diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js deleted file mode 100644 index 6ffe8c5344558..0000000000000 --- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js +++ /dev/null @@ -1,4 +0,0 @@ -define(["require", "exports"], function (require, exports) { - function hello() { } - exports.hello = hello; -}); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js deleted file mode 100644 index 6ffe8c5344558..0000000000000 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js +++ /dev/null @@ -1,4 +0,0 @@ -define(["require", "exports"], function (require, exports) { - function hello() { } - exports.hello = hello; -}); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js deleted file mode 100644 index 6ffe8c5344558..0000000000000 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js +++ /dev/null @@ -1,4 +0,0 @@ -define(["require", "exports"], function (require, exports) { - function hello() { } - exports.hello = hello; -}); diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js deleted file mode 100644 index 7d1bc0ecace5d..0000000000000 --- a/tests/baselines/reference/project/nonRelative/node/consume.js +++ /dev/null @@ -1,9 +0,0 @@ -var mod = require("decl"); -var x = require("lib/foo/a"); -var y = require("lib/bar/a"); -x.hello(); -y.hello(); -var str = mod.call(); -if (str !== "success") { - fail(); -} diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js index a8dc375b1c703..e2d4b03d1c1e1 100644 --- a/tests/baselines/reference/project/nonRelative/node/decl.js +++ b/tests/baselines/reference/project/nonRelative/node/decl.js @@ -1,3 +1,4 @@ +"use strict"; function call() { return "success"; } diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js deleted file mode 100644 index 58114de3a4d49..0000000000000 --- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js +++ /dev/null @@ -1,2 +0,0 @@ -function hello() { } -exports.hello = hello; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js deleted file mode 100644 index 58114de3a4d49..0000000000000 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js +++ /dev/null @@ -1,2 +0,0 @@ -function hello() { } -exports.hello = hello; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js deleted file mode 100644 index 58114de3a4d49..0000000000000 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js +++ /dev/null @@ -1,2 +0,0 @@ -function hello() { } -exports.hello = hello; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js index 2c61fd1d935db..67db806ee95c9 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 572002356018b..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,12 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js index b7c7f5d81398a..818f4c9dd06a5 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,3 +1,4 @@ +"use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 572002356018b..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,12 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index 2c61fd1d935db..67db806ee95c9 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 572002356018b..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,12 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index b7c7f5d81398a..818f4c9dd06a5 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,3 +1,4 @@ +"use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 572002356018b..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,12 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 40bdaa24fc9b9..c7642c55d72ef 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -9,6 +9,7 @@ function m1_f1() { return m1_instance1; } define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 40bdaa24fc9b9..c7642c55d72ef 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -9,6 +9,7 @@ function m1_f1() { return m1_instance1; } define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js deleted file mode 100644 index 2c61fd1d935db..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js +++ /dev/null @@ -1,14 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index f83ccabfd350e..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js deleted file mode 100644 index b7c7f5d81398a..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js +++ /dev/null @@ -1,12 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index d1c1b22a85b26..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,16 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index f83ccabfd350e..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 2c61fd1d935db..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,14 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index d1c1b22a85b26..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,16 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index b7c7f5d81398a..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,12 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 0814424ca390d..e489fc1e9645a 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,5 @@ define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -13,6 +14,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { exports.m1_f1 = m1_f1; }); define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -27,6 +29,7 @@ define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], functio exports.m2_f1 = m2_f1; }); define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index b6c62f75f3c22..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index d016c5ff00a9f..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,14 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index b6c62f75f3c22..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index d016c5ff00a9f..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,14 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js index d07eebbd7260c..30a7145ab87e6 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,5 @@ define("m1", ["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -13,6 +14,7 @@ define("m1", ["require", "exports"], function (require, exports) { exports.m1_f1 = m1_f1; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index ef183a5773cfc..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 548a35e714c17..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,14 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index c2a6326846e86..469ba2c199fb0 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index ef183a5773cfc..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 37f4ec486b23c..01ed51fe662f1 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,3 +1,4 @@ +"use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 548a35e714c17..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,14 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js index a1bb15d7b355e..78afb5215e363 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,4 +1,5 @@ define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -13,6 +14,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { exports.m1_f1 = m1_f1; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; exports.a1 = 10; var c1 = (function () { function c1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 381b239c573ab..9f1a3b7cdab92 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 7e234d178b806..4e7eeccf52c95 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index b5e6eec3623b3..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 2963737a5a064..6c2b1041f3749 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index f0b41e615ae1f..ff8cee9612b54 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index b5e6eec3623b3..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 381b239c573ab..9f1a3b7cdab92 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index b5e6eec3623b3..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 999019984d6cf..f7f008db1a11f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 2963737a5a064..6c2b1041f3749 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index b5e6eec3623b3..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 9ed3d1262fa7b..37197425fe4f6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 13e9de8f87f84..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 3aa34b0f8331c..97675cadfb353 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 7ede7f02c360f..24c086e4e8926 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 81bb710c58080..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 454bdf3acb0de..a88d1a915a77b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index b686585c9775a..9ba6e2f6f81cb 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index c4c57a82e126f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 71e1da5d3ccf8..44fdde7bc0a96 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 11b024ba13440..bd5760752eaee 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index aeb0a1c3c5d12..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index 7e08245de722a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map index de341c87ec136..f6b72ad687f19 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index 9072b5c7129d6..58a0821c6bffd 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 0b67e7ee4815f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 71e1da5d3ccf8..44fdde7bc0a96 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index aeb0a1c3c5d12..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index c4c57a82e126f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 0a60d710297e2..6e74e50fac1ba 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index de341c87ec136..f6b72ad687f19 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 0b67e7ee4815f..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 7e08245de722a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index fbbb2304152d6..9f3f95db1633a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 994e21ca0326d..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 0fd0b2def0c7e..25f6cd89f8a66 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 8c710d9c4da3e..b417e2fbcca1d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map index 89373fc1cfaf0..fb868d3d53051 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 0ff03b640b1a1..c13ebe54358f3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index 945ed0583adfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map index 9bf6e024b3f55..61c62cd49e80a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index 55790d252721b..1e9dc1a90dd79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index a7792ef52426b..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 89373fc1cfaf0..fb868d3d53051 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 945ed0583adfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 52eadf10bdbc8..8fe0b795041c3 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 9bf6e024b3f55..61c62cd49e80a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index a7792ef52426b..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index e4c6d218e888b..3f15739b645f2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f385e49ecd198..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index a910369c3e4bf..8fa40d29d211d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 827aa235ef262..a1d2dad808349 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6f750f89857a4..9e4b4e0562a7d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 990b84fd4fd97..aca288cf1c698 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index f65cfa554d17b..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 19b046a427c58..6076465420c50 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 757d17973aff9..73a462e3858aa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index c63a094397635..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6f750f89857a4..9e4b4e0562a7d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index f65cfa554d17b..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 4491a6dbea557..673d151169db0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 19b046a427c58..6076465420c50 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index c63a094397635..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 4849be6e95a34..322e0b7a23268 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 18d212c7e69ab..0000000000000 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 30bac946d14ac..7b492567422f1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index af6c2b21fdc89..2999011a7c1f2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map index 0927206ec1bd1..c7461e844d492 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index a144760b69f8f..fb47e534263c2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 6014ca9159858..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map index 84f18c56247b3..924ae0012314f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 64ebd330860a1..d06f563cdf061 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 6014ca9159858..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 0927206ec1bd1..c7461e844d492 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 6014ca9159858..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index a8377701181ab..0fdb98ad308c9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 84f18c56247b3..924ae0012314f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 6014ca9159858..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index d8857daae5c01..c2afb0a087e93 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 13e9de8f87f84..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 62f932a571e19..39977ec102050 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index d722bc8936af3..302148b3c90d2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 81bb710c58080..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index a9529891ffd37..f6c5a9b601846 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index d1799c07a98c0..1310d81a6ba10 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index 414fa845b2ec7..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map index 0cdc44d330d6d..2cb429e6d93dd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 77e69f9879021..ad373e763587b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index 20138821cfe42..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index 92fd6e19cfb36..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map index 292dcb61933f2..4743ee4fb4a6a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 095d4b65fdfbe..24666ed2fedf6 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index a603394fc15a9..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 0cdc44d330d6d..2cb429e6d93dd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 20138821cfe42..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 414fa845b2ec7..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 82da7e4770b15..a20e8da570633 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 292dcb61933f2..4743ee4fb4a6a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index a603394fc15a9..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 92fd6e19cfb36..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 28aa64ae076f7..b29ca636cc072 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 994e21ca0326d..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 39dcc66e06b8d..e2ecc6d797dea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 43c4340ba370b..c659566b4e83a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map index e0af3af9b222c..0b1acf6706143 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index b4f6ed8c48879..b45bccec37528 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index 22f07c1754496..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map index 05c53f0182efb..d5af38a63f949 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 82c62b23d3c1c..d6e6f6b50fa9d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index 1e72e2a220395..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index e0af3af9b222c..0b1acf6706143 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 22f07c1754496..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index cf74f45b0dc24..f95ad8fde86b4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index 05c53f0182efb..d5af38a63f949 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 1e72e2a220395..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index d94164cc05673..0696d7e2e959c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f385e49ecd198..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 262e5cdc1f397..93ac647487766 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index fc0f367f34368..1f65e84c04e0c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map index aaae11bb5b5be..dc7a0122e7ef8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index a483e0ff9fc60..16db3752a6405 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 22f07c1754496..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map index 702b574b61472..a00de348e73b9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 4e25047bafc0f..5cff040008988 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index b3972a3cfc174..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index aaae11bb5b5be..dc7a0122e7ef8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 22f07c1754496..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index fe64e38c46853..b757eda32d82b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 702b574b61472..a00de348e73b9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index b3972a3cfc174..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index ebcaec60aaac2..4f85ae9858464 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 18d212c7e69ab..0000000000000 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index dc294ebd160d1..34fe5e0783371 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 83f9ef1f262eb..bd8cf27217030 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map index cbb7eed495327..37d9f97b2e6fe 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index 40be0ca660cbd..e680cdb32448c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index c9a79b35d3c52..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map index 0826e9e95f33a..a46677d1d0ff1 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index d3eeabc27b53f..5fd4cafa95695 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: m2.ts emittedFile:ref/m2.js sourceFile:m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index c9a79b35d3c52..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index aabf49f904d98..3ec717007cf90 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index bad31ecf8d2a4..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 4557384d5b831..9c55b29820ee1 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:../../../ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:../../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:../../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:../../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:../../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:../../../ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:../../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index e31d90a8f0c70..381e2d8c1a596 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index bad31ecf8d2a4..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 7a377d04299ef..687772a4eaa27 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ../../../ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:../../../ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:../../../ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:../../../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:../../../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:../../../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:../../../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:../../../ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:../../../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 13e9de8f87f84..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 94371fe696d3e..521e71d31151c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index 821236c5c8505..9e02e711ab6b2 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:../ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:../test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 81bb710c58080..0000000000000 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index 22aaecafe2d3d..70bbc8a159bc5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 4394eb0748eaf..7f46671ac144a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:../ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:../ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:../ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:../ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:../ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:../ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:../ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:../ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:../test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:../test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:../test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:../test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:../test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:../test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index cbb7eed495327..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map index 51755e4c9a347..601543b621331 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 383a66a6e2fb5..d014b6cdaf2a2 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index 462fa38ab4239..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index 0826e9e95f33a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map index 095951a67d097..04a71341b2ec8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 0036386e6c44a..2d96b317a10d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:ref/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: m2.ts emittedFile:diskFile1.js sourceFile:m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 3b3ef6b145c44..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 820b088730f71..abc573e7f3ed4 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 181025cda92fd..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index ac636fcee1646..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 7158e15c4935b..3d074d558ca83 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:../../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:../../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:../../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:../../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:../../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:../../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:../../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:../../../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:../../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:../../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 6df33fbb9e655..d7f92759b6ad8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index cda16e9fb3e0c..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 5a37db58aa093..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 0548113dc8198..cd11cb3f3b657 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../../ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:../../../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: ../../../../outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: ../../../test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:../../../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:../../../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:../../../test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:../../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:../../../test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:../../../test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:../../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:../../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:../../../test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:../../../test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:../../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:../../../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 994e21ca0326d..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index c532c3846d9a3..832025f87dde8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6c8bdf4da742c..47a5c776cb2e4 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:../test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map index 51755e4c9a347..601543b621331 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt index b461163a8b8e4..101ed41087dd2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index 9bcc170386cc8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map index 095951a67d097..04a71341b2ec8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt index d5247e7eeb021..28f51b4edd209 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index 7bae4ed7491a2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 4a09f6eebdda0..7458559ae940d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 67882e5327bfc..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c8c025ac58271..79523a01114f9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:../../m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index fbcf63377be22..f5e8e736e677c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 1c53bf2849cf2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 8fda552208ba7..9ba11de04846e 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../m1.ts emittedFile:outdir/simple/m1.js sourceFile:../../m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:../../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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../../test.ts emittedFile:outdir/simple/test.js sourceFile:../../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../../test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f385e49ecd198..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 6377a26395e5e..6b99313a1542e 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index 71c0a41b2d11a..ba4fa8a9415c3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map index 51755e4c9a347..601543b621331 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index b6ddd879bc183..91e9b4a8d4235 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index 9bcc170386cc8..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map index 095951a67d097..04a71341b2ec8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index 3319b4e31f9dc..a567cfc411709 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:ref/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index 56d42d8bdfd58..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 652d934d6022c..85ab08c32f501 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/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":";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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index 67882e5327bfc..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index de5d168dad2c1..1bfc8f2e82eb3 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../../../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:../../test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:../../test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 15bddd32fe5c9..1b7d4d64d0e20 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/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":"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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index bcab7aa3bc644..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index a9427c9fc8bbc..e62a090d47373 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ../../../ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:../../../ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:../../../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:../../../ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:../../../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:../../../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:../../../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:../../../ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:../../../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: ../../test.ts emittedFile:outdir/simple/test.js sourceFile:../../test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:../../test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:../../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:../../test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:../../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:../../test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:../../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:../../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:../../test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:../../test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:../../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 18d212c7e69ab..0000000000000 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index f77c1351b1584..5d8a832b073b8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index 9c12e1749caaf..2320fb0091bad 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:../ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:../ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:../ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:../ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:../ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:../ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:../ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:../ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:../test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:../test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:../test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:../test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:../test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:../test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:../test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:../test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:../test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:../test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map index 04f168a6289cc..b5ad7ba171bd7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 6abc36a083230..749fb23fba2f1 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map index 0ce68e169af7d..adcafe3407594 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 49e704a99e1f8..1e8a61767b222 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map index 04f168a6289cc..b5ad7ba171bd7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 7e0989aabb01e..c4090583fd815 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -152,6 +152,7 @@ emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -164,24 +165,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -191,16 +192,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -214,10 +215,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -231,10 +232,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -253,20 +254,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -280,11 +281,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -293,8 +294,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map index 0ce68e169af7d..adcafe3407594 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map @@ -1 +1 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index eac3af459682f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 8b8abfc1aedb1..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,13 +0,0 @@ -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index e425f41290b8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 3d19accc614eb..39d19f41c05e6 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -151,6 +151,7 @@ sources: ref/m2.ts emittedFile:outdir/simple/ref/m2.js sourceFile:ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -163,24 +164,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -190,16 +191,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -213,10 +214,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -230,10 +231,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -252,20 +253,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -279,11 +280,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -292,8 +293,8 @@ sourceFile:ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -307,10 +308,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 13e9de8f87f84..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map index 37bb9be8a9590..cccdce4c32039 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 51a641cb750a4..254c4216a67c0 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/test.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts deleted file mode 100644 index c3a64f5b6eb2f..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -declare var m1_a1: number; -declare class m1_c1 { - m1_c1_p1: number; -} -declare var m1_instance1: m1_c1; -declare function m1_f1(): m1_c1; -declare module "ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare var a1: number; -declare class c1 { - p1: number; -} -declare var instance1: c1; -declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js deleted file mode 100644 index 81bb710c58080..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ /dev/null @@ -1,37 +0,0 @@ -var m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -var m1_instance1 = new m1_c1(); -function m1_f1() { - return m1_instance1; -} -define("ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -/// -/// -var a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -var instance1 = new c1(); -function f1() { - return instance1; -} -//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map index f3058d9f8787f..7132f8221606f 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map @@ -1 +1 @@ -{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index df760dc79b022..47272d72094cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -146,6 +146,7 @@ emittedFile:bin/outAndOutDirFile.js sourceFile:ref/m2.ts ------------------------------------------------------------------- >>>define("ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1->^^^^ 2 > ^^^^^^^^^^^^^ @@ -158,24 +159,24 @@ sourceFile:ref/m2.ts 3 > = 4 > 10 5 > ; -1->Emitted(12, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(12, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(12, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(12, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(12, 24) Source(1, 23) + SourceIndex(1) +1->Emitted(13, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(13, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(13, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(13, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(13, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(13, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(14, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -185,16 +186,16 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(15, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(15, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(16, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -208,10 +209,10 @@ sourceFile:ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(17, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(17, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(17, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -225,10 +226,10 @@ sourceFile:ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(18, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(18, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(18, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(18, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(19, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(19, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(19, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -247,20 +248,20 @@ sourceFile:ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(19, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(19, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(19, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(19, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(19, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(19, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(19, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(20, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(20, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(20, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(20, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(20, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(20, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(20, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -274,11 +275,11 @@ sourceFile:ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(21, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(21, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(21, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(21, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(21, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -287,8 +288,8 @@ sourceFile:ref/m2.ts 1 > > 2 > } -1 >Emitted(22, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(22, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -301,10 +302,10 @@ sourceFile:ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(23, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(23, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(23, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(23, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(24, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(24, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/outAndOutDirFile.js @@ -317,8 +318,8 @@ sourceFile:test.ts 3 > ^-> 1 > 2 >/// -1 >Emitted(25, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(25, 34) Source(1, 34) + SourceIndex(2) +1 >Emitted(26, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(26, 34) Source(1, 34) + SourceIndex(2) --- >>>/// 1-> @@ -326,8 +327,8 @@ sourceFile:test.ts 1-> > 2 >/// -1->Emitted(26, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(26, 34) Source(2, 34) + SourceIndex(2) +1->Emitted(27, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(27, 34) Source(2, 34) + SourceIndex(2) --- >>>var a1 = 10; 1 > @@ -344,25 +345,25 @@ sourceFile:test.ts 4 > = 5 > 10 6 > ; -1 >Emitted(27, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(27, 5) Source(3, 5) + SourceIndex(2) -3 >Emitted(27, 7) Source(3, 7) + SourceIndex(2) -4 >Emitted(27, 10) Source(3, 10) + SourceIndex(2) -5 >Emitted(27, 12) Source(3, 12) + SourceIndex(2) -6 >Emitted(27, 13) Source(3, 13) + SourceIndex(2) +1 >Emitted(28, 1) Source(3, 1) + SourceIndex(2) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(2) +3 >Emitted(28, 7) Source(3, 7) + SourceIndex(2) +4 >Emitted(28, 10) Source(3, 10) + SourceIndex(2) +5 >Emitted(28, 12) Source(3, 12) + SourceIndex(2) +6 >Emitted(28, 13) Source(3, 13) + SourceIndex(2) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(28, 1) Source(4, 1) + SourceIndex(2) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(29, 5) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^ @@ -372,16 +373,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(30, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(30, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(31, 14) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1) --- >>>})(); 1 > @@ -395,10 +396,10 @@ sourceFile:test.ts 4 > class c1 { > public p1: number; > } -1 >Emitted(32, 1) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(32, 2) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(32, 2) Source(4, 1) + SourceIndex(2) -4 >Emitted(32, 6) Source(6, 2) + SourceIndex(2) +1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2) +4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2) --- >>>var instance1 = new c1(); 1-> @@ -419,21 +420,21 @@ sourceFile:test.ts 6 > c1 7 > () 8 > ; -1->Emitted(33, 1) Source(8, 1) + SourceIndex(2) -2 >Emitted(33, 5) Source(8, 5) + SourceIndex(2) -3 >Emitted(33, 14) Source(8, 14) + SourceIndex(2) -4 >Emitted(33, 17) Source(8, 17) + SourceIndex(2) -5 >Emitted(33, 21) Source(8, 21) + SourceIndex(2) -6 >Emitted(33, 23) Source(8, 23) + SourceIndex(2) -7 >Emitted(33, 25) Source(8, 25) + SourceIndex(2) -8 >Emitted(33, 26) Source(8, 26) + SourceIndex(2) +1->Emitted(34, 1) Source(8, 1) + SourceIndex(2) +2 >Emitted(34, 5) Source(8, 5) + SourceIndex(2) +3 >Emitted(34, 14) Source(8, 14) + SourceIndex(2) +4 >Emitted(34, 17) Source(8, 17) + SourceIndex(2) +5 >Emitted(34, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(34, 23) Source(8, 23) + SourceIndex(2) +7 >Emitted(34, 25) Source(8, 25) + SourceIndex(2) +8 >Emitted(34, 26) Source(8, 26) + SourceIndex(2) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(34, 1) Source(9, 1) + SourceIndex(2) +1 >Emitted(35, 1) Source(9, 1) + SourceIndex(2) --- >>> return instance1; 1->^^^^ @@ -447,11 +448,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(35, 5) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(35, 11) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(35, 12) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(35, 21) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(35, 22) Source(10, 22) + SourceIndex(2) name (f1) +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 > @@ -460,7 +461,7 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(36, 1) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(36, 2) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1) --- >>>//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map deleted file mode 100644 index 3b00d82ab66c4..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map index 8c257bd111148..496137bf2d900 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 0fa4d7bfa36f5..211811b2a387a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map deleted file mode 100644 index 8612cd0d1085a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map deleted file mode 100644 index 058e405b6061e..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map index e7f54a4a2e144..cd11e38f17e56 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 625e81c473819..6e576f3d79944 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:diskFile1.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map deleted file mode 100644 index 4ac74c2fcdb7c..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index 8c257bd111148..496137bf2d900 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 5cca04a0f2567..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 8612cd0d1085a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index 144ad24e2de69..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 3b00d82ab66c4..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 8a9a8cba4301e..f02aa603acccc 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -193,24 +195,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -220,16 +222,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 >^^^^ @@ -243,10 +245,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -260,10 +262,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -282,20 +284,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -309,11 +311,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 >^^^^ @@ -322,8 +324,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -336,10 +338,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m2.js.map=================================================================== @@ -353,6 +355,7 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -367,24 +370,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(3, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(3, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(3, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(3, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(3, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(3, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(3, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(3, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(3, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(3, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -394,16 +397,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(6, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -417,10 +420,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(4, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(6, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -434,10 +437,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(4, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(4, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(6, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(6, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(4, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(4, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(6, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(6, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -456,20 +459,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(8, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(8, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(8, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(8, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(8, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(8, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(8, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(8, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(8, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(8, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(8, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(8, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(8, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(8, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(9, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -483,11 +486,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(10, 22) + SourceIndex(0) name (f1) +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 >^^^^ @@ -496,8 +499,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -511,10 +514,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(9, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(9, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(11, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(9, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(9, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(11, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(11, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -534,13 +537,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(13, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(13, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(13, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(13, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(13, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(13, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(13, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(13, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(13, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(13, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(13, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(13, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(13, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(13, 26) + SourceIndex(0) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -558,13 +561,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(15, 5) Source(14, 12) + SourceIndex(0) -2 >Emitted(15, 15) Source(14, 14) + SourceIndex(0) -3 >Emitted(15, 18) Source(14, 17) + SourceIndex(0) -4 >Emitted(15, 20) Source(14, 19) + SourceIndex(0) -5 >Emitted(15, 21) Source(14, 20) + SourceIndex(0) -6 >Emitted(15, 26) Source(14, 25) + SourceIndex(0) -7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0) +1->Emitted(16, 5) Source(14, 12) + SourceIndex(0) +2 >Emitted(16, 15) Source(14, 14) + SourceIndex(0) +3 >Emitted(16, 18) Source(14, 17) + SourceIndex(0) +4 >Emitted(16, 20) Source(14, 19) + SourceIndex(0) +5 >Emitted(16, 21) Source(14, 20) + SourceIndex(0) +6 >Emitted(16, 26) Source(14, 25) + SourceIndex(0) +7 >Emitted(16, 27) Source(14, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map index e7f54a4a2e144..cd11e38f17e56 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts deleted file mode 100644 index 4afd4e69f2d52..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import m1 = require("ref/m1"); -import m2 = require("../outputdir_module_multifolder_ref/m2"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; -export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js deleted file mode 100644 index 14c09e444a52a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ /dev/null @@ -1,17 +0,0 @@ -var m1 = require("ref/m1"); -var m2 = require("../outputdir_module_multifolder_ref/m2"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -exports.a3 = m2.m2_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map deleted file mode 100644 index 4ac74c2fcdb7c..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts deleted file mode 100644 index c09a3c0c32ae8..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m2_a1: number; -export declare class m2_c1 { - m2_c1_p1: number; -} -export declare var m2_instance1: m2_c1; -export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js deleted file mode 100644 index ec0a73b5af84d..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m2_a1 = 10; -var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; -})(); -exports.m2_c1 = m2_c1; -exports.m2_instance1 = new m2_c1(); -function m2_f1() { - return exports.m2_instance1; -} -exports.m2_f1 = m2_f1; -//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map deleted file mode 100644 index 058e405b6061e..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index f2cac8f7a2abc..b823a010c7825 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: outputdir_module_multifolder/ref/m1.ts emittedFile:outdir/simple/outputdir_module_multifolder/ref/m1.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile:outputdir_module_multifolder/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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: m2.js @@ -179,6 +180,7 @@ sources: outputdir_module_multifolder_ref/m2.ts emittedFile:outdir/simple/outputdir_module_multifolder_ref/m2.js sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m2_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -191,24 +193,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m2_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m2_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1) --- >>> } 1->^^^^ @@ -218,16 +220,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor) -2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m2_c1) +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 > @@ -241,10 +243,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) -2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_c1 = m2_c1; 1-> @@ -258,10 +260,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m2_instance1 = new m2_c1(); 1-> @@ -280,20 +282,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m2_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m2_instance1; 1->^^^^ @@ -307,11 +309,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m2_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m2_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m2_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m2_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m2_f1) +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 > @@ -320,8 +322,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1) --- >>>exports.m2_f1 = m2_f1; 1-> @@ -335,10 +337,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m2.js.map=================================================================== JsFile: test.js @@ -350,6 +352,7 @@ sources: outputdir_module_multifolder/test.ts emittedFile:outdir/simple/outputdir_module_multifolder/test.js sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -366,13 +369,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>var m2 = require("../outputdir_module_multifolder_ref/m2"); 1-> @@ -390,13 +393,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > "../outputdir_module_multifolder_ref/m2" 6 > ) 7 > ; -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(2, 8) + SourceIndex(0) -3 >Emitted(2, 7) Source(2, 10) + SourceIndex(0) -4 >Emitted(2, 18) Source(2, 21) + SourceIndex(0) -5 >Emitted(2, 58) Source(2, 61) + SourceIndex(0) -6 >Emitted(2, 59) Source(2, 62) + SourceIndex(0) -7 >Emitted(2, 60) Source(2, 63) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(2, 8) + SourceIndex(0) +3 >Emitted(3, 7) Source(2, 10) + SourceIndex(0) +4 >Emitted(3, 18) Source(2, 21) + SourceIndex(0) +5 >Emitted(3, 58) Source(2, 61) + SourceIndex(0) +6 >Emitted(3, 59) Source(2, 62) + SourceIndex(0) +7 >Emitted(3, 60) Source(2, 63) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -411,24 +414,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(3, 1) Source(3, 12) + SourceIndex(0) -2 >Emitted(3, 11) Source(3, 14) + SourceIndex(0) -3 >Emitted(3, 14) Source(3, 17) + SourceIndex(0) -4 >Emitted(3, 16) Source(3, 19) + SourceIndex(0) -5 >Emitted(3, 17) Source(3, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 12) + SourceIndex(0) +2 >Emitted(4, 11) Source(3, 14) + SourceIndex(0) +3 >Emitted(4, 14) Source(3, 17) + SourceIndex(0) +4 >Emitted(4, 16) Source(3, 19) + SourceIndex(0) +5 >Emitted(4, 17) Source(3, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(4, 1) Source(4, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1) +1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -438,16 +441,16 @@ sourceFile:outputdir_module_multifolder/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(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor) --- >>> 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(8, 5) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -461,10 +464,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export 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) -3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) +1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1) +2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1) +3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0) +4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -478,10 +481,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(9, 1) Source(4, 14) + SourceIndex(0) -2 >Emitted(9, 11) Source(4, 16) + SourceIndex(0) -3 >Emitted(9, 16) Source(6, 2) + SourceIndex(0) -4 >Emitted(9, 17) Source(6, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 14) + SourceIndex(0) +2 >Emitted(10, 11) Source(4, 16) + SourceIndex(0) +3 >Emitted(10, 16) Source(6, 2) + SourceIndex(0) +4 >Emitted(10, 17) Source(6, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -500,20 +503,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(10, 1) Source(8, 12) + SourceIndex(0) -2 >Emitted(10, 18) Source(8, 21) + SourceIndex(0) -3 >Emitted(10, 21) Source(8, 24) + SourceIndex(0) -4 >Emitted(10, 25) Source(8, 28) + SourceIndex(0) -5 >Emitted(10, 27) Source(8, 30) + SourceIndex(0) -6 >Emitted(10, 29) Source(8, 32) + SourceIndex(0) -7 >Emitted(10, 30) Source(8, 33) + SourceIndex(0) +1->Emitted(11, 1) Source(8, 12) + SourceIndex(0) +2 >Emitted(11, 18) Source(8, 21) + SourceIndex(0) +3 >Emitted(11, 21) Source(8, 24) + SourceIndex(0) +4 >Emitted(11, 25) Source(8, 28) + SourceIndex(0) +5 >Emitted(11, 27) Source(8, 30) + SourceIndex(0) +6 >Emitted(11, 29) Source(8, 32) + SourceIndex(0) +7 >Emitted(11, 30) Source(8, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -527,11 +530,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) name (f1) -2 >Emitted(12, 11) Source(10, 11) + SourceIndex(0) name (f1) -3 >Emitted(12, 12) Source(10, 12) + SourceIndex(0) name (f1) -4 >Emitted(12, 29) Source(10, 21) + SourceIndex(0) name (f1) -5 >Emitted(12, 30) Source(10, 22) + SourceIndex(0) name (f1) +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 > @@ -540,8 +543,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 >} -1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) name (f1) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) name (f1) +1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1) +2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -555,10 +558,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(14, 1) Source(9, 17) + SourceIndex(0) -2 >Emitted(14, 11) Source(9, 19) + SourceIndex(0) -3 >Emitted(14, 16) Source(11, 2) + SourceIndex(0) -4 >Emitted(14, 17) Source(11, 2) + SourceIndex(0) +1->Emitted(15, 1) Source(9, 17) + SourceIndex(0) +2 >Emitted(15, 11) Source(9, 19) + SourceIndex(0) +3 >Emitted(15, 16) Source(11, 2) + SourceIndex(0) +4 >Emitted(15, 17) Source(11, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -578,13 +581,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(15, 1) Source(13, 12) + SourceIndex(0) -2 >Emitted(15, 11) Source(13, 14) + SourceIndex(0) -3 >Emitted(15, 14) Source(13, 17) + SourceIndex(0) -4 >Emitted(15, 16) Source(13, 19) + SourceIndex(0) -5 >Emitted(15, 17) Source(13, 20) + SourceIndex(0) -6 >Emitted(15, 22) Source(13, 25) + SourceIndex(0) -7 >Emitted(15, 23) Source(13, 26) + SourceIndex(0) +1->Emitted(16, 1) Source(13, 12) + SourceIndex(0) +2 >Emitted(16, 11) Source(13, 14) + SourceIndex(0) +3 >Emitted(16, 14) Source(13, 17) + SourceIndex(0) +4 >Emitted(16, 16) Source(13, 19) + SourceIndex(0) +5 >Emitted(16, 17) Source(13, 20) + SourceIndex(0) +6 >Emitted(16, 22) Source(13, 25) + SourceIndex(0) +7 >Emitted(16, 23) Source(13, 26) + SourceIndex(0) --- >>>exports.a3 = m2.m2_c1; 1-> @@ -603,12 +606,12 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(16, 1) Source(14, 12) + SourceIndex(0) -2 >Emitted(16, 11) Source(14, 14) + SourceIndex(0) -3 >Emitted(16, 14) Source(14, 17) + SourceIndex(0) -4 >Emitted(16, 16) Source(14, 19) + SourceIndex(0) -5 >Emitted(16, 17) Source(14, 20) + SourceIndex(0) -6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0) -7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0) +1->Emitted(17, 1) Source(14, 12) + SourceIndex(0) +2 >Emitted(17, 11) Source(14, 14) + SourceIndex(0) +3 >Emitted(17, 14) Source(14, 17) + SourceIndex(0) +4 >Emitted(17, 16) Source(14, 19) + SourceIndex(0) +5 >Emitted(17, 17) Source(14, 20) + SourceIndex(0) +6 >Emitted(17, 22) Source(14, 25) + SourceIndex(0) +7 >Emitted(17, 23) Source(14, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 9b6af66589aff..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "../outputdir_module_multifolder_ref/m2" { - export var m2_a1: number; - export class m2_c1 { - m2_c1_p1: number; - } - export var m2_instance1: m2_c1; - export function m2_f1(): m2_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - import m2 = require("../outputdir_module_multifolder_ref/m2"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; - export var a3: typeof m2.m2_c1; -} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 994e21ca0326d..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,45 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { - exports.m2_a1 = 10; - var m2_c1 = (function () { - function m2_c1() { - } - return m2_c1; - })(); - exports.m2_c1 = m2_c1; - exports.m2_instance1 = new m2_c1(); - function m2_f1() { - return exports.m2_instance1; - } - exports.m2_f1 = m2_f1; -}); -define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; - exports.a3 = m2.m2_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map index 85e465474d309..35d74f3b18542 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index d2331ef357941..44aaf229c7e44 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:outputdir_module_multifolder/ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts ------------------------------------------------------------------- >>>}); >>>define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m2_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -187,24 +189,24 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(1, 12) + SourceIndex(1) -2 >Emitted(16, 18) Source(1, 17) + SourceIndex(1) -3 >Emitted(16, 21) Source(1, 20) + SourceIndex(1) -4 >Emitted(16, 23) Source(1, 22) + SourceIndex(1) -5 >Emitted(16, 24) Source(1, 23) + SourceIndex(1) +1 >Emitted(18, 5) Source(1, 12) + SourceIndex(1) +2 >Emitted(18, 18) Source(1, 17) + SourceIndex(1) +3 >Emitted(18, 21) Source(1, 20) + SourceIndex(1) +4 >Emitted(18, 23) Source(1, 22) + SourceIndex(1) +5 >Emitted(18, 24) Source(1, 23) + SourceIndex(1) --- >>> var m2_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) --- >>> function m2_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) +1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1) --- >>> } 1->^^^^^^^^ @@ -214,16 +216,16 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > 2 > } -1->Emitted(19, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor) -2 >Emitted(19, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor) +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) --- >>> return m2_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(20, 21) Source(4, 2) + SourceIndex(1) name (m2_c1) +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 >^^^^ @@ -237,10 +239,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 4 > export class m2_c1 { > public m2_c1_p1: number; > } -1 >Emitted(21, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) -2 >Emitted(21, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) -3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1) +2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1) +3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_c1 = m2_c1; 1->^^^^ @@ -254,10 +256,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > public m2_c1_p1: number; > } 4 > -1->Emitted(22, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(22, 18) Source(2, 19) + SourceIndex(1) -3 >Emitted(22, 26) Source(4, 2) + SourceIndex(1) -4 >Emitted(22, 27) Source(4, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(24, 18) Source(2, 19) + SourceIndex(1) +3 >Emitted(24, 26) Source(4, 2) + SourceIndex(1) +4 >Emitted(24, 27) Source(4, 2) + SourceIndex(1) --- >>> exports.m2_instance1 = new m2_c1(); 1->^^^^ @@ -276,20 +278,20 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 5 > m2_c1 6 > () 7 > ; -1->Emitted(23, 5) Source(6, 12) + SourceIndex(1) -2 >Emitted(23, 25) Source(6, 24) + SourceIndex(1) -3 >Emitted(23, 28) Source(6, 27) + SourceIndex(1) -4 >Emitted(23, 32) Source(6, 31) + SourceIndex(1) -5 >Emitted(23, 37) Source(6, 36) + SourceIndex(1) -6 >Emitted(23, 39) Source(6, 38) + SourceIndex(1) -7 >Emitted(23, 40) Source(6, 39) + SourceIndex(1) +1->Emitted(25, 5) Source(6, 12) + SourceIndex(1) +2 >Emitted(25, 25) Source(6, 24) + SourceIndex(1) +3 >Emitted(25, 28) Source(6, 27) + SourceIndex(1) +4 >Emitted(25, 32) Source(6, 31) + SourceIndex(1) +5 >Emitted(25, 37) Source(6, 36) + SourceIndex(1) +6 >Emitted(25, 39) Source(6, 38) + SourceIndex(1) +7 >Emitted(25, 40) Source(6, 39) + SourceIndex(1) --- >>> function m2_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(7, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(7, 1) + SourceIndex(1) --- >>> return exports.m2_instance1; 1->^^^^^^^^ @@ -303,11 +305,11 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 3 > 4 > m2_instance1 5 > ; -1->Emitted(25, 9) Source(8, 5) + SourceIndex(1) name (m2_f1) -2 >Emitted(25, 15) Source(8, 11) + SourceIndex(1) name (m2_f1) -3 >Emitted(25, 16) Source(8, 12) + SourceIndex(1) name (m2_f1) -4 >Emitted(25, 36) Source(8, 24) + SourceIndex(1) name (m2_f1) -5 >Emitted(25, 37) Source(8, 25) + SourceIndex(1) name (m2_f1) +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 >^^^^ @@ -316,8 +318,8 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) -2 >Emitted(26, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) +1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1) +2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1) --- >>> exports.m2_f1 = m2_f1; 1->^^^^ @@ -330,10 +332,10 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts > return m2_instance1; > } 4 > -1->Emitted(27, 5) Source(7, 17) + SourceIndex(1) -2 >Emitted(27, 18) Source(7, 22) + SourceIndex(1) -3 >Emitted(27, 26) Source(9, 2) + SourceIndex(1) -4 >Emitted(27, 27) Source(9, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(7, 17) + SourceIndex(1) +2 >Emitted(29, 18) Source(7, 22) + SourceIndex(1) +3 >Emitted(29, 26) Source(9, 2) + SourceIndex(1) +4 >Emitted(29, 27) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -341,6 +343,7 @@ sourceFile:outputdir_module_multifolder/test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -355,24 +358,24 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(30, 5) Source(3, 12) + SourceIndex(2) -2 >Emitted(30, 15) Source(3, 14) + SourceIndex(2) -3 >Emitted(30, 18) Source(3, 17) + SourceIndex(2) -4 >Emitted(30, 20) Source(3, 19) + SourceIndex(2) -5 >Emitted(30, 21) Source(3, 20) + SourceIndex(2) +1 >Emitted(33, 5) Source(3, 12) + SourceIndex(2) +2 >Emitted(33, 15) Source(3, 14) + SourceIndex(2) +3 >Emitted(33, 18) Source(3, 17) + SourceIndex(2) +4 >Emitted(33, 20) Source(3, 19) + SourceIndex(2) +5 >Emitted(33, 21) Source(3, 20) + SourceIndex(2) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(31, 5) Source(4, 1) + SourceIndex(2) +1->Emitted(34, 5) Source(4, 1) + SourceIndex(2) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(32, 9) Source(4, 1) + SourceIndex(2) name (c1) +1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1) --- >>> } 1->^^^^^^^^ @@ -382,16 +385,16 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > 2 > } -1->Emitted(33, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) -2 >Emitted(33, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) +1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor) +2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(34, 18) Source(6, 2) + SourceIndex(2) name (c1) +1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1) --- >>> })(); 1 >^^^^ @@ -405,10 +408,10 @@ sourceFile:outputdir_module_multifolder/test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(35, 5) Source(6, 1) + SourceIndex(2) name (c1) -2 >Emitted(35, 6) Source(6, 2) + SourceIndex(2) name (c1) -3 >Emitted(35, 6) Source(4, 1) + SourceIndex(2) -4 >Emitted(35, 10) Source(6, 2) + SourceIndex(2) +1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1) +2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1) +3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2) +4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2) --- >>> exports.c1 = c1; 1->^^^^ @@ -422,10 +425,10 @@ sourceFile:outputdir_module_multifolder/test.ts > public p1: number; > } 4 > -1->Emitted(36, 5) Source(4, 14) + SourceIndex(2) -2 >Emitted(36, 15) Source(4, 16) + SourceIndex(2) -3 >Emitted(36, 20) Source(6, 2) + SourceIndex(2) -4 >Emitted(36, 21) Source(6, 2) + SourceIndex(2) +1->Emitted(39, 5) Source(4, 14) + SourceIndex(2) +2 >Emitted(39, 15) Source(4, 16) + SourceIndex(2) +3 >Emitted(39, 20) Source(6, 2) + SourceIndex(2) +4 >Emitted(39, 21) Source(6, 2) + SourceIndex(2) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -444,20 +447,20 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > c1 6 > () 7 > ; -1->Emitted(37, 5) Source(8, 12) + SourceIndex(2) -2 >Emitted(37, 22) Source(8, 21) + SourceIndex(2) -3 >Emitted(37, 25) Source(8, 24) + SourceIndex(2) -4 >Emitted(37, 29) Source(8, 28) + SourceIndex(2) -5 >Emitted(37, 31) Source(8, 30) + SourceIndex(2) -6 >Emitted(37, 33) Source(8, 32) + SourceIndex(2) -7 >Emitted(37, 34) Source(8, 33) + SourceIndex(2) +1->Emitted(40, 5) Source(8, 12) + SourceIndex(2) +2 >Emitted(40, 22) Source(8, 21) + SourceIndex(2) +3 >Emitted(40, 25) Source(8, 24) + SourceIndex(2) +4 >Emitted(40, 29) Source(8, 28) + SourceIndex(2) +5 >Emitted(40, 31) Source(8, 30) + SourceIndex(2) +6 >Emitted(40, 33) Source(8, 32) + SourceIndex(2) +7 >Emitted(40, 34) Source(8, 33) + SourceIndex(2) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 5) Source(9, 1) + SourceIndex(2) +1 >Emitted(41, 5) Source(9, 1) + SourceIndex(2) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -471,11 +474,11 @@ sourceFile:outputdir_module_multifolder/test.ts 3 > 4 > instance1 5 > ; -1->Emitted(39, 9) Source(10, 5) + SourceIndex(2) name (f1) -2 >Emitted(39, 15) Source(10, 11) + SourceIndex(2) name (f1) -3 >Emitted(39, 16) Source(10, 12) + SourceIndex(2) name (f1) -4 >Emitted(39, 33) Source(10, 21) + SourceIndex(2) name (f1) -5 >Emitted(39, 34) Source(10, 22) + SourceIndex(2) name (f1) +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 >^^^^ @@ -484,8 +487,8 @@ sourceFile:outputdir_module_multifolder/test.ts 1 > > 2 > } -1 >Emitted(40, 5) Source(11, 1) + SourceIndex(2) name (f1) -2 >Emitted(40, 6) Source(11, 2) + SourceIndex(2) name (f1) +1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1) +2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -499,10 +502,10 @@ sourceFile:outputdir_module_multifolder/test.ts > return instance1; > } 4 > -1->Emitted(41, 5) Source(9, 17) + SourceIndex(2) -2 >Emitted(41, 15) Source(9, 19) + SourceIndex(2) -3 >Emitted(41, 20) Source(11, 2) + SourceIndex(2) -4 >Emitted(41, 21) Source(11, 2) + SourceIndex(2) +1->Emitted(44, 5) Source(9, 17) + SourceIndex(2) +2 >Emitted(44, 15) Source(9, 19) + SourceIndex(2) +3 >Emitted(44, 20) Source(11, 2) + SourceIndex(2) +4 >Emitted(44, 21) Source(11, 2) + SourceIndex(2) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -522,13 +525,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(42, 5) Source(13, 12) + SourceIndex(2) -2 >Emitted(42, 15) Source(13, 14) + SourceIndex(2) -3 >Emitted(42, 18) Source(13, 17) + SourceIndex(2) -4 >Emitted(42, 20) Source(13, 19) + SourceIndex(2) -5 >Emitted(42, 21) Source(13, 20) + SourceIndex(2) -6 >Emitted(42, 26) Source(13, 25) + SourceIndex(2) -7 >Emitted(42, 27) Source(13, 26) + SourceIndex(2) +1->Emitted(45, 5) Source(13, 12) + SourceIndex(2) +2 >Emitted(45, 15) Source(13, 14) + SourceIndex(2) +3 >Emitted(45, 18) Source(13, 17) + SourceIndex(2) +4 >Emitted(45, 20) Source(13, 19) + SourceIndex(2) +5 >Emitted(45, 21) Source(13, 20) + SourceIndex(2) +6 >Emitted(45, 26) Source(13, 25) + SourceIndex(2) +7 >Emitted(45, 27) Source(13, 26) + SourceIndex(2) --- >>> exports.a3 = m2.m2_c1; 1->^^^^ @@ -546,13 +549,13 @@ sourceFile:outputdir_module_multifolder/test.ts 5 > . 6 > m2_c1 7 > ; -1->Emitted(43, 5) Source(14, 12) + SourceIndex(2) -2 >Emitted(43, 15) Source(14, 14) + SourceIndex(2) -3 >Emitted(43, 18) Source(14, 17) + SourceIndex(2) -4 >Emitted(43, 20) Source(14, 19) + SourceIndex(2) -5 >Emitted(43, 21) Source(14, 20) + SourceIndex(2) -6 >Emitted(43, 26) Source(14, 25) + SourceIndex(2) -7 >Emitted(43, 27) Source(14, 26) + SourceIndex(2) +1->Emitted(46, 5) Source(14, 12) + SourceIndex(2) +2 >Emitted(46, 15) Source(14, 14) + SourceIndex(2) +3 >Emitted(46, 18) Source(14, 17) + SourceIndex(2) +4 >Emitted(46, 20) Source(14, 19) + SourceIndex(2) +5 >Emitted(46, 21) Source(14, 20) + SourceIndex(2) +6 >Emitted(46, 26) Source(14, 25) + SourceIndex(2) +7 >Emitted(46, 27) Source(14, 26) + SourceIndex(2) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map index 6751f2f82cd22..e0d61ffec8ba4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 15f5ae4bc9321..f9423ff0754fb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map index ca45773f423fb..cd7a2b2b59000 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 75f6eb8394069..739e15d29837f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map deleted file mode 100644 index 41d3e11e99563..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map index 6751f2f82cd22..e0d61ffec8ba4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 372f1052b89d5..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 6a53c3e993607..4577731e2f769 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map index ca45773f423fb..cd7a2b2b59000 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index 250d2615a794a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index c2e7dfa443bfd..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index 41d3e11e99563..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index c4f12e28fe814..415542f779dd4 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: m1.ts emittedFile:outdir/simple/m1.js sourceFile:m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,16 @@ sourceFile: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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 22) Source(1, 25) + SourceIndex(0) -6 >Emitted(1, 23) Source(1, 26) + SourceIndex(0) -7 >Emitted(1, 24) Source(1, 27) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0) +6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0) +7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index df062274b3ed6..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index f385e49ecd198..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map index 2ace469f90296..5052e3d39724c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index e0c060eb88922..138176f4d55d6 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:m1.ts ------------------------------------------------------------------- >>>define("m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map index 6c5413f630e73..ee2b86c4e4195 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 880d55412f825..cda805f1182d3 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map index 35e7e9a48dd7c..fbaa84744b325 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 7fc9e0c1f6090..36982bf658b03 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map deleted file mode 100644 index d0638b6c34ce5..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js deleted file mode 100644 index bbaba444ba29a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ /dev/null @@ -1,15 +0,0 @@ -define(["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map index 6c5413f630e73..ee2b86c4e4195 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js deleted file mode 100644 index 6c8aeb3190bf9..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ /dev/null @@ -1,16 +0,0 @@ -define(["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map deleted file mode 100644 index a57b57d2b17db..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index fdfa62ec27bbd..1ba537e095bb9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=m1.js.map=================================================================== @@ -181,6 +182,7 @@ emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -194,24 +196,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 15) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 18) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 20) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 21) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^^^^^ @@ -221,16 +223,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 10) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 18) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) name (c1) --- >>> })(); 1 >^^^^ @@ -244,10 +246,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 6) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 6) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(5, 2) + SourceIndex(0) --- >>> exports.c1 = c1; 1->^^^^ @@ -261,10 +263,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 5) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 15) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 20) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 21) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -283,20 +285,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 5) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 22) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 25) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 29) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 31) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 33) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 34) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 5) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -310,11 +312,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 9) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 15) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 16) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 33) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 34) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 9) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 15) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 16) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 33) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 34) Source(9, 22) + SourceIndex(0) name (f1) --- >>> } 1 >^^^^ @@ -323,8 +325,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 6) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 5) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 6) Source(10, 2) + SourceIndex(0) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -338,10 +340,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 5) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 15) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 20) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 21) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -360,13 +362,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 5) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 15) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 18) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 20) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 21) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 26) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 5) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts deleted file mode 100644 index 4a53b24b156e2..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare var m1_a1: number; -export declare class m1_c1 { - m1_c1_p1: number; -} -export declare var m1_instance1: m1_c1; -export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js deleted file mode 100644 index 1b4470e2b3750..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ /dev/null @@ -1,13 +0,0 @@ -exports.m1_a1 = 10; -var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; -})(); -exports.m1_c1 = m1_c1; -exports.m1_instance1 = new m1_c1(); -function m1_f1() { - return exports.m1_instance1; -} -exports.m1_f1 = m1_f1; -//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map index 35e7e9a48dd7c..fbaa84744b325 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map @@ -1 +1 @@ -{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts deleted file mode 100644 index a61d8541048e6..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import m1 = require("ref/m1"); -export declare var a1: number; -export declare class c1 { - p1: number; -} -export declare var instance1: c1; -export declare function f1(): c1; -export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js deleted file mode 100644 index 46c9f29e55a8a..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ /dev/null @@ -1,15 +0,0 @@ -var m1 = require("ref/m1"); -exports.a1 = 10; -var c1 = (function () { - function c1() { - } - return c1; -})(); -exports.c1 = c1; -exports.instance1 = new c1(); -function f1() { - return exports.instance1; -} -exports.f1 = f1; -exports.a2 = m1.m1_c1; -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map deleted file mode 100644 index d0638b6c34ce5..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index c97d88b3d59a3..b3b492bbb9824 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -8,6 +8,7 @@ sources: ref/m1.ts emittedFile:outdir/simple/ref/m1.js sourceFile:ref/m1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>exports.m1_a1 = 10; 1 > 2 >^^^^^^^^^^^^^ @@ -20,24 +21,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(1, 1) Source(1, 12) + SourceIndex(0) -2 >Emitted(1, 14) Source(1, 17) + SourceIndex(0) -3 >Emitted(1, 17) Source(1, 20) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 22) + SourceIndex(0) -5 >Emitted(1, 20) Source(1, 23) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0) +2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0) +3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0) +4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0) +5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0) --- >>>var m1_c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^ @@ -47,16 +48,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(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) +2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) --- >>> 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(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1) --- >>>})(); 1 > @@ -70,10 +71,10 @@ sourceFile:ref/m1.ts 4 > export 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) -3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0) -4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0) +1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0) +4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_c1 = m1_c1; 1-> @@ -87,10 +88,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(7, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(7, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 22) Source(4, 2) + SourceIndex(0) -4 >Emitted(7, 23) Source(4, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0) +4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0) --- >>>exports.m1_instance1 = new m1_c1(); 1-> @@ -109,20 +110,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(8, 1) Source(6, 12) + SourceIndex(0) -2 >Emitted(8, 21) Source(6, 24) + SourceIndex(0) -3 >Emitted(8, 24) Source(6, 27) + SourceIndex(0) -4 >Emitted(8, 28) Source(6, 31) + SourceIndex(0) -5 >Emitted(8, 33) Source(6, 36) + SourceIndex(0) -6 >Emitted(8, 35) Source(6, 38) + SourceIndex(0) -7 >Emitted(8, 36) Source(6, 39) + SourceIndex(0) +1->Emitted(9, 1) Source(6, 12) + SourceIndex(0) +2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0) +3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0) +4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0) +5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0) +6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0) +7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0) --- >>>function m1_f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(9, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(10, 1) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^ @@ -136,11 +137,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(10, 5) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(10, 11) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(10, 12) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(10, 32) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(10, 33) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 > @@ -149,8 +150,8 @@ sourceFile:ref/m1.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>>exports.m1_f1 = m1_f1; 1-> @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(12, 1) Source(7, 17) + SourceIndex(0) -2 >Emitted(12, 14) Source(7, 22) + SourceIndex(0) -3 >Emitted(12, 22) Source(9, 2) + SourceIndex(0) -4 >Emitted(12, 23) Source(9, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 17) + SourceIndex(0) +2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0) +3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0) +4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=m1.js.map=================================================================== JsFile: test.js @@ -179,6 +180,7 @@ sources: test.ts emittedFile:outdir/simple/test.js sourceFile:test.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m1 = require("ref/m1"); 1 > 2 >^^^^ @@ -194,13 +196,13 @@ sourceFile:test.ts 5 > "ref/m1" 6 > ) 7 > ; -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 18) Source(1, 21) + SourceIndex(0) -5 >Emitted(1, 26) Source(1, 29) + SourceIndex(0) -6 >Emitted(1, 27) Source(1, 30) + SourceIndex(0) -7 >Emitted(1, 28) Source(1, 31) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0) +3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0) +4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0) +5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0) +6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0) +7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0) --- >>>exports.a1 = 10; 1 > @@ -215,24 +217,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 1) Source(2, 12) + SourceIndex(0) -2 >Emitted(2, 11) Source(2, 14) + SourceIndex(0) -3 >Emitted(2, 14) Source(2, 17) + SourceIndex(0) -4 >Emitted(2, 16) Source(2, 19) + SourceIndex(0) -5 >Emitted(2, 17) Source(2, 20) + SourceIndex(0) +1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0) +2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0) +3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0) +4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0) +5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0) --- >>>var c1 = (function () { 1-> 2 >^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 1) Source(3, 1) + SourceIndex(0) +1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) --- >>> function c1() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c1) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (c1) --- >>> } 1->^^^^ @@ -242,16 +244,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(5, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) -2 >Emitted(5, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) +1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1.constructor) +2 >Emitted(6, 6) Source(5, 2) + SourceIndex(0) name (c1.constructor) --- >>> return c1; 1->^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) name (c1) +1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) name (c1) --- >>>})(); 1 > @@ -265,10 +267,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) name (c1) -2 >Emitted(7, 2) Source(5, 2) + SourceIndex(0) name (c1) -3 >Emitted(7, 2) Source(3, 1) + SourceIndex(0) -4 >Emitted(7, 6) Source(5, 2) + SourceIndex(0) +1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (c1) +2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (c1) +3 >Emitted(8, 2) Source(3, 1) + SourceIndex(0) +4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0) --- >>>exports.c1 = c1; 1-> @@ -282,10 +284,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(8, 1) Source(3, 14) + SourceIndex(0) -2 >Emitted(8, 11) Source(3, 16) + SourceIndex(0) -3 >Emitted(8, 16) Source(5, 2) + SourceIndex(0) -4 >Emitted(8, 17) Source(5, 2) + SourceIndex(0) +1->Emitted(9, 1) Source(3, 14) + SourceIndex(0) +2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0) +3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0) +4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0) --- >>>exports.instance1 = new c1(); 1-> @@ -304,20 +306,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(9, 1) Source(7, 12) + SourceIndex(0) -2 >Emitted(9, 18) Source(7, 21) + SourceIndex(0) -3 >Emitted(9, 21) Source(7, 24) + SourceIndex(0) -4 >Emitted(9, 25) Source(7, 28) + SourceIndex(0) -5 >Emitted(9, 27) Source(7, 30) + SourceIndex(0) -6 >Emitted(9, 29) Source(7, 32) + SourceIndex(0) -7 >Emitted(9, 30) Source(7, 33) + SourceIndex(0) +1->Emitted(10, 1) Source(7, 12) + SourceIndex(0) +2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0) +3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0) +4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0) +5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0) +6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0) +7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0) --- >>>function f1() { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(11, 1) Source(8, 1) + SourceIndex(0) --- >>> return exports.instance1; 1->^^^^ @@ -331,11 +333,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(11, 5) Source(9, 5) + SourceIndex(0) name (f1) -2 >Emitted(11, 11) Source(9, 11) + SourceIndex(0) name (f1) -3 >Emitted(11, 12) Source(9, 12) + SourceIndex(0) name (f1) -4 >Emitted(11, 29) Source(9, 21) + SourceIndex(0) name (f1) -5 >Emitted(11, 30) Source(9, 22) + SourceIndex(0) name (f1) +1->Emitted(12, 5) Source(9, 5) + SourceIndex(0) name (f1) +2 >Emitted(12, 11) Source(9, 11) + SourceIndex(0) name (f1) +3 >Emitted(12, 12) Source(9, 12) + SourceIndex(0) name (f1) +4 >Emitted(12, 29) Source(9, 21) + SourceIndex(0) name (f1) +5 >Emitted(12, 30) Source(9, 22) + SourceIndex(0) name (f1) --- >>>} 1 > @@ -344,8 +346,8 @@ sourceFile:test.ts 1 > > 2 >} -1 >Emitted(12, 1) Source(10, 1) + SourceIndex(0) name (f1) -2 >Emitted(12, 2) Source(10, 2) + SourceIndex(0) name (f1) +1 >Emitted(13, 1) Source(10, 1) + SourceIndex(0) name (f1) +2 >Emitted(13, 2) Source(10, 2) + SourceIndex(0) name (f1) --- >>>exports.f1 = f1; 1-> @@ -359,10 +361,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(13, 1) Source(8, 17) + SourceIndex(0) -2 >Emitted(13, 11) Source(8, 19) + SourceIndex(0) -3 >Emitted(13, 16) Source(10, 2) + SourceIndex(0) -4 >Emitted(13, 17) Source(10, 2) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 17) + SourceIndex(0) +2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0) +3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0) +4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0) --- >>>exports.a2 = m1.m1_c1; 1-> @@ -382,12 +384,12 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(14, 1) Source(12, 12) + SourceIndex(0) -2 >Emitted(14, 11) Source(12, 14) + SourceIndex(0) -3 >Emitted(14, 14) Source(12, 17) + SourceIndex(0) -4 >Emitted(14, 16) Source(12, 19) + SourceIndex(0) -5 >Emitted(14, 17) Source(12, 20) + SourceIndex(0) -6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0) -7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0) +1->Emitted(15, 1) Source(12, 12) + SourceIndex(0) +2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0) +3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0) +4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0) +5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0) +6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0) +7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0) --- >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts deleted file mode 100644 index 18eee0fd4df67..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module "ref/m1" { - export var m1_a1: number; - export class m1_c1 { - m1_c1_p1: number; - } - export var m1_instance1: m1_c1; - export function m1_f1(): m1_c1; -} -declare module "test" { - import m1 = require("ref/m1"); - export var a1: number; - export class c1 { - p1: number; - } - export var instance1: c1; - export function f1(): c1; - export var a2: typeof m1.m1_c1; -} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js deleted file mode 100644 index 18d212c7e69ab..0000000000000 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ /dev/null @@ -1,30 +0,0 @@ -define("ref/m1", ["require", "exports"], function (require, exports) { - exports.m1_a1 = 10; - var m1_c1 = (function () { - function m1_c1() { - } - return m1_c1; - })(); - exports.m1_c1 = m1_c1; - exports.m1_instance1 = new m1_c1(); - function m1_f1() { - return exports.m1_instance1; - } - exports.m1_f1 = m1_f1; -}); -define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { - exports.a1 = 10; - var c1 = (function () { - function c1() { - } - return c1; - })(); - exports.c1 = c1; - exports.instance1 = new c1(); - function f1() { - return exports.instance1; - } - exports.f1 = f1; - exports.a2 = m1.m1_c1; -}); -//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map index 29e01bc0bc6d2..3e3afaaac13ee 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;ICPU,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"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_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;;;;ICPU,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 54624487a5772..21fc54a2dc48b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:bin/test.js sourceFile:ref/m1.ts ------------------------------------------------------------------- >>>define("ref/m1", ["require", "exports"], function (require, exports) { +>>> "use strict"; >>> exports.m1_a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^^^^ @@ -21,24 +22,24 @@ sourceFile:ref/m1.ts 3 > = 4 > 10 5 > ; -1 >Emitted(2, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(2, 18) Source(1, 17) + SourceIndex(0) -3 >Emitted(2, 21) Source(1, 20) + SourceIndex(0) -4 >Emitted(2, 23) Source(1, 22) + SourceIndex(0) -5 >Emitted(2, 24) Source(1, 23) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0) +3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0) +4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0) +5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0) --- >>> var m1_c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) +1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) --- >>> function m1_c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) +1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1) --- >>> } 1->^^^^^^^^ @@ -48,16 +49,16 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > 2 > } -1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor) -2 >Emitted(5, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor) +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) --- >>> return m1_c1; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(6, 21) Source(4, 2) + SourceIndex(0) name (m1_c1) +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 >^^^^ @@ -71,10 +72,10 @@ sourceFile:ref/m1.ts 4 > export class m1_c1 { > public m1_c1_p1: number; > } -1 >Emitted(7, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) -2 >Emitted(7, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) -3 >Emitted(7, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(7, 10) Source(4, 2) + SourceIndex(0) +1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1) +2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1) +3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_c1 = m1_c1; 1->^^^^ @@ -88,10 +89,10 @@ sourceFile:ref/m1.ts > public m1_c1_p1: number; > } 4 > -1->Emitted(8, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 26) Source(4, 2) + SourceIndex(0) -4 >Emitted(8, 27) Source(4, 2) + SourceIndex(0) +1->Emitted(9, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0) +3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0) +4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0) --- >>> exports.m1_instance1 = new m1_c1(); 1->^^^^ @@ -110,20 +111,20 @@ sourceFile:ref/m1.ts 5 > m1_c1 6 > () 7 > ; -1->Emitted(9, 5) Source(6, 12) + SourceIndex(0) -2 >Emitted(9, 25) Source(6, 24) + SourceIndex(0) -3 >Emitted(9, 28) Source(6, 27) + SourceIndex(0) -4 >Emitted(9, 32) Source(6, 31) + SourceIndex(0) -5 >Emitted(9, 37) Source(6, 36) + SourceIndex(0) -6 >Emitted(9, 39) Source(6, 38) + SourceIndex(0) -7 >Emitted(9, 40) Source(6, 39) + SourceIndex(0) +1->Emitted(10, 5) Source(6, 12) + SourceIndex(0) +2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0) +3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0) +4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0) +5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0) +6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0) +7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0) --- >>> function m1_f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(10, 5) Source(7, 1) + SourceIndex(0) +1 >Emitted(11, 5) Source(7, 1) + SourceIndex(0) --- >>> return exports.m1_instance1; 1->^^^^^^^^ @@ -137,11 +138,11 @@ sourceFile:ref/m1.ts 3 > 4 > m1_instance1 5 > ; -1->Emitted(11, 9) Source(8, 5) + SourceIndex(0) name (m1_f1) -2 >Emitted(11, 15) Source(8, 11) + SourceIndex(0) name (m1_f1) -3 >Emitted(11, 16) Source(8, 12) + SourceIndex(0) name (m1_f1) -4 >Emitted(11, 36) Source(8, 24) + SourceIndex(0) name (m1_f1) -5 >Emitted(11, 37) Source(8, 25) + SourceIndex(0) name (m1_f1) +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 >^^^^ @@ -150,8 +151,8 @@ sourceFile:ref/m1.ts 1 > > 2 > } -1 >Emitted(12, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) -2 >Emitted(12, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) +1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1) +2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1) --- >>> exports.m1_f1 = m1_f1; 1->^^^^ @@ -164,10 +165,10 @@ sourceFile:ref/m1.ts > return m1_instance1; > } 4 > -1->Emitted(13, 5) Source(7, 17) + SourceIndex(0) -2 >Emitted(13, 18) Source(7, 22) + SourceIndex(0) -3 >Emitted(13, 26) Source(9, 2) + SourceIndex(0) -4 >Emitted(13, 27) Source(9, 2) + SourceIndex(0) +1->Emitted(14, 5) Source(7, 17) + SourceIndex(0) +2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0) +3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0) +4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:bin/test.js @@ -175,6 +176,7 @@ sourceFile:test.ts ------------------------------------------------------------------- >>>}); >>>define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { +>>> "use strict"; >>> exports.a1 = 10; 1 >^^^^ 2 > ^^^^^^^^^^ @@ -188,24 +190,24 @@ sourceFile:test.ts 3 > = 4 > 10 5 > ; -1 >Emitted(16, 5) Source(2, 12) + SourceIndex(1) -2 >Emitted(16, 15) Source(2, 14) + SourceIndex(1) -3 >Emitted(16, 18) Source(2, 17) + SourceIndex(1) -4 >Emitted(16, 20) Source(2, 19) + SourceIndex(1) -5 >Emitted(16, 21) Source(2, 20) + SourceIndex(1) +1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1) +2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1) +3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1) +4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1) +5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1) --- >>> var c1 = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(17, 5) Source(3, 1) + SourceIndex(1) +1->Emitted(19, 5) Source(3, 1) + SourceIndex(1) --- >>> function c1() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(18, 9) Source(3, 1) + SourceIndex(1) name (c1) +1->Emitted(20, 9) Source(3, 1) + SourceIndex(1) name (c1) --- >>> } 1->^^^^^^^^ @@ -215,16 +217,16 @@ sourceFile:test.ts > public p1: number; > 2 > } -1->Emitted(19, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) -2 >Emitted(19, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) +1->Emitted(21, 9) Source(5, 1) + SourceIndex(1) name (c1.constructor) +2 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) name (c1.constructor) --- >>> return c1; 1->^^^^^^^^ 2 > ^^^^^^^^^ 1-> 2 > } -1->Emitted(20, 9) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(20, 18) Source(5, 2) + SourceIndex(1) name (c1) +1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) name (c1) --- >>> })(); 1 >^^^^ @@ -238,10 +240,10 @@ sourceFile:test.ts 4 > export class c1 { > public p1: number; > } -1 >Emitted(21, 5) Source(5, 1) + SourceIndex(1) name (c1) -2 >Emitted(21, 6) Source(5, 2) + SourceIndex(1) name (c1) -3 >Emitted(21, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(21, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(23, 5) Source(5, 1) + SourceIndex(1) name (c1) +2 >Emitted(23, 6) Source(5, 2) + SourceIndex(1) name (c1) +3 >Emitted(23, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.c1 = c1; 1->^^^^ @@ -255,10 +257,10 @@ sourceFile:test.ts > public p1: number; > } 4 > -1->Emitted(22, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(22, 15) Source(3, 16) + SourceIndex(1) -3 >Emitted(22, 20) Source(5, 2) + SourceIndex(1) -4 >Emitted(22, 21) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1) +3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1) +4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1) --- >>> exports.instance1 = new c1(); 1->^^^^ @@ -277,20 +279,20 @@ sourceFile:test.ts 5 > c1 6 > () 7 > ; -1->Emitted(23, 5) Source(7, 12) + SourceIndex(1) -2 >Emitted(23, 22) Source(7, 21) + SourceIndex(1) -3 >Emitted(23, 25) Source(7, 24) + SourceIndex(1) -4 >Emitted(23, 29) Source(7, 28) + SourceIndex(1) -5 >Emitted(23, 31) Source(7, 30) + SourceIndex(1) -6 >Emitted(23, 33) Source(7, 32) + SourceIndex(1) -7 >Emitted(23, 34) Source(7, 33) + SourceIndex(1) +1->Emitted(25, 5) Source(7, 12) + SourceIndex(1) +2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1) +3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1) +4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1) +5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1) +6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1) +7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1) --- >>> function f1() { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(24, 5) Source(8, 1) + SourceIndex(1) +1 >Emitted(26, 5) Source(8, 1) + SourceIndex(1) --- >>> return exports.instance1; 1->^^^^^^^^ @@ -304,11 +306,11 @@ sourceFile:test.ts 3 > 4 > instance1 5 > ; -1->Emitted(25, 9) Source(9, 5) + SourceIndex(1) name (f1) -2 >Emitted(25, 15) Source(9, 11) + SourceIndex(1) name (f1) -3 >Emitted(25, 16) Source(9, 12) + SourceIndex(1) name (f1) -4 >Emitted(25, 33) Source(9, 21) + SourceIndex(1) name (f1) -5 >Emitted(25, 34) Source(9, 22) + SourceIndex(1) name (f1) +1->Emitted(27, 9) Source(9, 5) + SourceIndex(1) name (f1) +2 >Emitted(27, 15) Source(9, 11) + SourceIndex(1) name (f1) +3 >Emitted(27, 16) Source(9, 12) + SourceIndex(1) name (f1) +4 >Emitted(27, 33) Source(9, 21) + SourceIndex(1) name (f1) +5 >Emitted(27, 34) Source(9, 22) + SourceIndex(1) name (f1) --- >>> } 1 >^^^^ @@ -317,8 +319,8 @@ sourceFile:test.ts 1 > > 2 > } -1 >Emitted(26, 5) Source(10, 1) + SourceIndex(1) name (f1) -2 >Emitted(26, 6) Source(10, 2) + SourceIndex(1) name (f1) +1 >Emitted(28, 5) Source(10, 1) + SourceIndex(1) name (f1) +2 >Emitted(28, 6) Source(10, 2) + SourceIndex(1) name (f1) --- >>> exports.f1 = f1; 1->^^^^ @@ -332,10 +334,10 @@ sourceFile:test.ts > return instance1; > } 4 > -1->Emitted(27, 5) Source(8, 17) + SourceIndex(1) -2 >Emitted(27, 15) Source(8, 19) + SourceIndex(1) -3 >Emitted(27, 20) Source(10, 2) + SourceIndex(1) -4 >Emitted(27, 21) Source(10, 2) + SourceIndex(1) +1->Emitted(29, 5) Source(8, 17) + SourceIndex(1) +2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1) +3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1) +4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1) --- >>> exports.a2 = m1.m1_c1; 1->^^^^ @@ -354,13 +356,13 @@ sourceFile:test.ts 5 > . 6 > m1_c1 7 > ; -1->Emitted(28, 5) Source(12, 12) + SourceIndex(1) -2 >Emitted(28, 15) Source(12, 14) + SourceIndex(1) -3 >Emitted(28, 18) Source(12, 17) + SourceIndex(1) -4 >Emitted(28, 20) Source(12, 19) + SourceIndex(1) -5 >Emitted(28, 21) Source(12, 20) + SourceIndex(1) -6 >Emitted(28, 26) Source(12, 25) + SourceIndex(1) -7 >Emitted(28, 27) Source(12, 26) + SourceIndex(1) +1->Emitted(30, 5) Source(12, 12) + SourceIndex(1) +2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1) +3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1) +4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1) +5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1) +6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1) +7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1) --- >>>}); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js deleted file mode 100644 index 8b04a1c9092c3..0000000000000 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js +++ /dev/null @@ -1,2 +0,0 @@ -define(["require", "exports"], function (require, exports) { -}); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js index d0451fe5a0836..63344d14b5464 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { + "use strict"; var RM = (function () { function RM() { } diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js deleted file mode 100644 index 8b04a1c9092c3..0000000000000 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js +++ /dev/null @@ -1,2 +0,0 @@ -define(["require", "exports"], function (require, exports) { -}); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js index 8f38a87b72929..b238334b7be59 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js @@ -1,3 +1,4 @@ +"use strict"; var RM = (function () { function RM() { } diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js index 04720741d2fb3..b87147d11cea0 100644 --- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js +++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js @@ -30,6 +30,7 @@ var y: Foo2; //// [propertyIdentityWithPrivacyMismatch_0.js] //// [propertyIdentityWithPrivacyMismatch_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x; var x; // Should be error (mod1.Foo !== mod2.Foo) var Foo1 = (function () { diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js index a003c70468ee1..715ac2c1007d2 100644 --- a/tests/baselines/reference/protoAsIndexInIndexExpression.js +++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js @@ -20,6 +20,7 @@ class C { } //// [protoAsIndexInIndexExpression_0.js] +"use strict"; //// [protoAsIndexInIndexExpression_1.js] /// var EntityPrototype = undefined; diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js index dbe3dfdbbaea7..da50a3a711580 100644 --- a/tests/baselines/reference/reExportDefaultExport.js +++ b/tests/baselines/reference/reExportDefaultExport.js @@ -15,12 +15,14 @@ f(); foo(); //// [m1.js] +"use strict"; function f() { } Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; exports.f = f; //// [m2.js] +"use strict"; var m1_1 = require("./m1"); var m1_2 = require("./m1"); m1_2.f(); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js index 866a54e964f7f..2cc10db27c0e1 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js @@ -18,6 +18,7 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType1_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -27,4 +28,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js index 8398d252c87f1..f1e5753360f97 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js @@ -22,6 +22,7 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType2_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -31,4 +32,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js index 9d992596f40da..c195f13a5edbe 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js @@ -26,6 +26,7 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType3_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -35,4 +36,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js index 109950d030187..59726c68c258b 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js @@ -15,9 +15,11 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType4_moduleC.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -27,4 +29,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js index 2b5353f279605..7bd4b7dce4a41 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js @@ -19,12 +19,15 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType5_moduleD.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -34,4 +37,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js index 6ae03f9c9b807..268352c001ab6 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js @@ -23,15 +23,19 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType6_moduleE.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -41,4 +45,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js index 8e87b0bc3a0df..be43b42e75f19 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js @@ -24,19 +24,23 @@ export var b: ClassB; // This should result in type ClassB //// [recursiveExportAssignmentAndFindAliasedType7_moduleE.js] define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleC"], function (require, exports, self) { + "use strict"; return self; }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleD.js] define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleE"], function (require, exports, self) { + "use strict"; return self; }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleC.js] define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleD"], function (require, exports, self) { + "use strict"; var selfVar = self; return selfVar; }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js] define(["require", "exports"], function (require, exports) { + "use strict"; var ClassB = (function () { function ClassB() { } @@ -46,4 +50,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index f913ddec012be..b25daa169cae6 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -25,6 +25,7 @@ export module Foo { //// [recursiveMods.js] +"use strict"; var Foo; (function (Foo) { var C = (function () { diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js index 5d534f1e3a32e..7c836e056e447 100644 --- a/tests/baselines/reference/reexportClassDefinition.js +++ b/tests/baselines/reference/reexportClassDefinition.js @@ -18,6 +18,7 @@ class x extends foo2.x {} //// [foo1.js] +"use strict"; var x = (function () { function x() { } @@ -25,11 +26,13 @@ var x = (function () { })(); module.exports = x; //// [foo2.js] +"use strict"; var foo1 = require('./foo1'); module.exports = { x: foo1 }; //// [foo3.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js index e149d382df665..c25ffd4ab65d8 100644 --- a/tests/baselines/reference/relativePathMustResolve.js +++ b/tests/baselines/reference/relativePathMustResolve.js @@ -9,5 +9,6 @@ var z = foo.x + 10; //// [foo_1.js] +"use strict"; var foo = require('./test/foo'); var z = foo.x + 10; diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js index e50db2be92685..75d6539cb3cf4 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.js +++ b/tests/baselines/reference/relativePathToDeclarationFile.js @@ -27,6 +27,7 @@ if(foo.M2.x){ //// [file1.js] +"use strict"; var foo = require('foo'); var other = require('./other'); var relMod = require('./sub/relMod'); diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index 9fc2f8a8ad83a..ea0b4243ff483 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -21,6 +21,7 @@ export module Database { //// [requireEmitSemicolon_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var Models; (function (Models) { var Person = (function () { @@ -33,6 +34,7 @@ define(["require", "exports"], function (require, exports) { }); //// [requireEmitSemicolon_1.js] define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) { + "use strict"; var Database; (function (Database) { var DB = (function () { diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.js b/tests/baselines/reference/requireOfAnEmptyFile1.js index b2079afa6ef56..5364227219191 100644 --- a/tests/baselines/reference/requireOfAnEmptyFile1.js +++ b/tests/baselines/reference/requireOfAnEmptyFile1.js @@ -11,3 +11,4 @@ import fs = require('./requireOfAnEmptyFile1_b'); //// [requireOfAnEmptyFile1_b.js] //// [requireOfAnEmptyFile1_a.js] //requireOfAnEmptyFile1 +"use strict"; diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index fb90a718ec350..69b071c911584 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -14,6 +14,7 @@ enum void {} //// [reservedWords2.js] +"use strict"; require(); while ( = require("dfdf")) ; diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js index a15ec5e39a255..a8d254f56c18e 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.js +++ b/tests/baselines/reference/reuseInnerModuleMember.js @@ -16,7 +16,9 @@ module bar { //// [reuseInnerModuleMember_0.js] +"use strict"; //// [reuseInnerModuleMember_1.js] +"use strict"; /// var bar; (function (bar) { diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js index 88dd9919f9c40..0838df4d19f65 100644 --- a/tests/baselines/reference/scannerClass2.js +++ b/tests/baselines/reference/scannerClass2.js @@ -8,6 +8,7 @@ } //// [scannerClass2.js] +"use strict"; var LoggerAdapter = (function () { function LoggerAdapter(logger) { this.logger = logger; diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js index b503de2c2b0df..e785a07ace2f6 100644 --- a/tests/baselines/reference/scannerEnum1.js +++ b/tests/baselines/reference/scannerEnum1.js @@ -5,6 +5,7 @@ } //// [scannerEnum1.js] +"use strict"; (function (CodeGenTarget) { CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3"; CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5"; diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index 1cb7fc677cdcd..cab16b96bc305 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -16,8 +16,10 @@ use(x); use(foo); //// [existingModule.js] +"use strict"; exports.x = 1; //// [test.js] +"use strict"; var existingModule_1 = require('./existingModule'); var missingModule_1 = require('./missingModule'); const test = { x: existingModule_1.x, foo: missingModule_1.foo }; diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js b/tests/baselines/reference/sourceMapValidationExportAssignment.js index a1b0c1e167a36..635692ef81af0 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.js +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js @@ -6,6 +6,7 @@ export = a; //// [sourceMapValidationExportAssignment.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = (function () { function a() { } diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map index 9ec681ced5284..f70139c2d5461 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignment.js.map] -{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":["a","a.constructor"],"mappings":";IAAA;QAAAA;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IACD,OAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignment.js","sourceRoot":"","sources":["sourceMapValidationExportAssignment.ts"],"names":["a","a.constructor"],"mappings":";;IAAA;QAAAA;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IACD,OAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt index cf4adb6d5eaf3..69fb22abf42ef 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt @@ -9,17 +9,18 @@ emittedFile:tests/cases/compiler/sourceMapValidationExportAssignment.js sourceFile:sourceMapValidationExportAssignment.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> var a = (function () { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(2, 5) Source(1, 1) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 1) + SourceIndex(0) --- >>> function a() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(3, 9) Source(1, 1) + SourceIndex(0) name (a) +1->Emitted(4, 9) Source(1, 1) + SourceIndex(0) name (a) --- >>> } 1->^^^^^^^^ @@ -29,16 +30,16 @@ sourceFile:sourceMapValidationExportAssignment.ts > public c; > 2 > } -1->Emitted(4, 9) Source(3, 1) + SourceIndex(0) name (a.constructor) -2 >Emitted(4, 10) Source(3, 2) + SourceIndex(0) name (a.constructor) +1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (a.constructor) +2 >Emitted(5, 10) Source(3, 2) + SourceIndex(0) name (a.constructor) --- >>> return a; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(5, 9) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(5, 17) Source(3, 2) + SourceIndex(0) name (a) +1->Emitted(6, 9) Source(3, 1) + SourceIndex(0) name (a) +2 >Emitted(6, 17) Source(3, 2) + SourceIndex(0) name (a) --- >>> })(); 1 >^^^^ @@ -52,10 +53,10 @@ sourceFile:sourceMapValidationExportAssignment.ts 4 > class a { > public c; > } -1 >Emitted(6, 5) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(6, 6) Source(3, 2) + SourceIndex(0) name (a) -3 >Emitted(6, 6) Source(1, 1) + SourceIndex(0) -4 >Emitted(6, 10) Source(3, 2) + SourceIndex(0) +1 >Emitted(7, 5) Source(3, 1) + SourceIndex(0) name (a) +2 >Emitted(7, 6) Source(3, 2) + SourceIndex(0) name (a) +3 >Emitted(7, 6) Source(1, 1) + SourceIndex(0) +4 >Emitted(7, 10) Source(3, 2) + SourceIndex(0) --- >>> return a; 1->^^^^ @@ -67,10 +68,10 @@ sourceFile:sourceMapValidationExportAssignment.ts 2 > export = 3 > a 4 > ; -1->Emitted(7, 5) Source(4, 1) + SourceIndex(0) -2 >Emitted(7, 12) Source(4, 10) + SourceIndex(0) -3 >Emitted(7, 13) Source(4, 11) + SourceIndex(0) -4 >Emitted(7, 14) Source(4, 12) + SourceIndex(0) +1->Emitted(8, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(8, 12) Source(4, 10) + SourceIndex(0) +3 >Emitted(8, 13) Source(4, 11) + SourceIndex(0) +4 >Emitted(8, 14) Source(4, 12) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=sourceMapValidationExportAssignment.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js index 0a0b3feda5ff4..daa9391533f68 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js @@ -5,6 +5,7 @@ class a { export = a; //// [sourceMapValidationExportAssignmentCommonjs.js] +"use strict"; var a = (function () { function a() { } diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map index 6da5d0f075ea1..30f8ce495df9f 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationExportAssignmentCommonjs.js.map] -{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACD,iBAAS,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":";AAAA;IAAAA;IAEAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACD,iBAAS,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt index fc7862c8ad439..1e29378fe7ce9 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt @@ -8,17 +8,18 @@ sources: sourceMapValidationExportAssignmentCommonjs.ts emittedFile:tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.js sourceFile:sourceMapValidationExportAssignmentCommonjs.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var a = (function () { 1 > 2 >^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) --- >>> function a() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (a) +1->Emitted(3, 5) Source(1, 1) + SourceIndex(0) name (a) --- >>> } 1->^^^^ @@ -28,16 +29,16 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts > public c; > 2 > } -1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor) -2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (a.constructor) +1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (a.constructor) +2 >Emitted(4, 6) Source(3, 2) + SourceIndex(0) name (a.constructor) --- >>> return a; 1->^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (a) +1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) name (a) +2 >Emitted(5, 13) Source(3, 2) + SourceIndex(0) name (a) --- >>>})(); 1 > @@ -51,10 +52,10 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts 4 > class a { > public c; > } -1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (a) -2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (a) -3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0) -4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0) +1 >Emitted(6, 1) Source(3, 1) + SourceIndex(0) name (a) +2 >Emitted(6, 2) Source(3, 2) + SourceIndex(0) name (a) +3 >Emitted(6, 2) Source(1, 1) + SourceIndex(0) +4 >Emitted(6, 6) Source(3, 2) + SourceIndex(0) --- >>>module.exports = a; 1-> @@ -67,9 +68,9 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts 2 >export = 3 > a 4 > ; -1->Emitted(6, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(6, 18) Source(4, 10) + SourceIndex(0) -3 >Emitted(6, 19) Source(4, 11) + SourceIndex(0) -4 >Emitted(6, 20) Source(4, 12) + SourceIndex(0) +1->Emitted(7, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(7, 18) Source(4, 10) + SourceIndex(0) +3 >Emitted(7, 19) Source(4, 11) + SourceIndex(0) +4 >Emitted(7, 20) Source(4, 12) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index 140846abbcbfc..5f829c4ba13d9 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -9,6 +9,7 @@ var x = new a(); var y = new b(); //// [sourceMapValidationImport.js] +"use strict"; var m; (function (m) { var c = (function () { diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index a5b9c2b03176a..ccf30382f3b27 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":["m","m.c","m.c.constructor"],"mappings":"AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACbA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,GAACA,IACbA,CAAAA;AACLA,CAACA,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":["m","m.c","m.c.constructor"],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACbA;QAAAC;QACAC,CAACA;QAADD,QAACA;IAADA,CAACA,AADDD,IACCA;IADYA,GAACA,IACbA,CAAAA;AACLA,CAACA,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 73d7e48fb2877..84ccc68a1135a 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -8,6 +8,7 @@ sources: sourceMapValidationImport.ts emittedFile:tests/cases/compiler/sourceMapValidationImport.js sourceFile:sourceMapValidationImport.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var m; 1 > 2 >^^^^ @@ -21,10 +22,10 @@ sourceFile:sourceMapValidationImport.ts > export class c { > } > } -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 15) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 16) + SourceIndex(0) -4 >Emitted(1, 7) Source(4, 2) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(1, 15) + SourceIndex(0) +3 >Emitted(2, 6) Source(1, 16) + SourceIndex(0) +4 >Emitted(2, 7) Source(4, 2) + SourceIndex(0) --- >>>(function (m) { 1-> @@ -38,24 +39,24 @@ sourceFile:sourceMapValidationImport.ts 3 > m 4 > 5 > { -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 15) + SourceIndex(0) -3 >Emitted(2, 13) Source(1, 16) + SourceIndex(0) -4 >Emitted(2, 15) Source(1, 17) + SourceIndex(0) -5 >Emitted(2, 16) Source(1, 18) + SourceIndex(0) +1->Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 13) Source(1, 16) + SourceIndex(0) +4 >Emitted(3, 15) Source(1, 17) + SourceIndex(0) +5 >Emitted(3, 16) Source(1, 18) + SourceIndex(0) --- >>> var c = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (m) +1->Emitted(4, 5) Source(2, 5) + SourceIndex(0) name (m) --- >>> function c() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(4, 9) Source(2, 5) + SourceIndex(0) name (m.c) +1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (m.c) --- >>> } 1->^^^^^^^^ @@ -64,16 +65,16 @@ sourceFile:sourceMapValidationImport.ts 1->export class c { > 2 > } -1->Emitted(5, 9) Source(3, 5) + SourceIndex(0) name (m.c.constructor) -2 >Emitted(5, 10) Source(3, 6) + SourceIndex(0) name (m.c.constructor) +1->Emitted(6, 9) Source(3, 5) + SourceIndex(0) name (m.c.constructor) +2 >Emitted(6, 10) Source(3, 6) + SourceIndex(0) name (m.c.constructor) --- >>> return c; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(6, 9) Source(3, 5) + SourceIndex(0) name (m.c) -2 >Emitted(6, 17) Source(3, 6) + SourceIndex(0) name (m.c) +1->Emitted(7, 9) Source(3, 5) + SourceIndex(0) name (m.c) +2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0) name (m.c) --- >>> })(); 1 >^^^^ @@ -86,10 +87,10 @@ sourceFile:sourceMapValidationImport.ts 3 > 4 > export class c { > } -1 >Emitted(7, 5) Source(3, 5) + SourceIndex(0) name (m.c) -2 >Emitted(7, 6) Source(3, 6) + SourceIndex(0) name (m.c) -3 >Emitted(7, 6) Source(2, 5) + SourceIndex(0) name (m) -4 >Emitted(7, 10) Source(3, 6) + SourceIndex(0) name (m) +1 >Emitted(8, 5) Source(3, 5) + SourceIndex(0) name (m.c) +2 >Emitted(8, 6) Source(3, 6) + SourceIndex(0) name (m.c) +3 >Emitted(8, 6) Source(2, 5) + SourceIndex(0) name (m) +4 >Emitted(8, 10) Source(3, 6) + SourceIndex(0) name (m) --- >>> m.c = c; 1->^^^^ @@ -102,10 +103,10 @@ sourceFile:sourceMapValidationImport.ts 3 > { > } 4 > -1->Emitted(8, 5) Source(2, 18) + SourceIndex(0) name (m) -2 >Emitted(8, 8) Source(2, 19) + SourceIndex(0) name (m) -3 >Emitted(8, 12) Source(3, 6) + SourceIndex(0) name (m) -4 >Emitted(8, 13) Source(3, 6) + SourceIndex(0) name (m) +1->Emitted(9, 5) Source(2, 18) + SourceIndex(0) name (m) +2 >Emitted(9, 8) Source(2, 19) + SourceIndex(0) name (m) +3 >Emitted(9, 12) Source(3, 6) + SourceIndex(0) name (m) +4 >Emitted(9, 13) Source(3, 6) + SourceIndex(0) name (m) --- >>>})(m = exports.m || (exports.m = {})); 1-> @@ -130,15 +131,15 @@ sourceFile:sourceMapValidationImport.ts > export class c { > } > } -1->Emitted(9, 1) Source(4, 1) + SourceIndex(0) name (m) -2 >Emitted(9, 2) Source(4, 2) + SourceIndex(0) name (m) -3 >Emitted(9, 4) Source(1, 15) + SourceIndex(0) -4 >Emitted(9, 5) Source(1, 16) + SourceIndex(0) -5 >Emitted(9, 8) Source(1, 15) + SourceIndex(0) -6 >Emitted(9, 17) Source(1, 16) + SourceIndex(0) -7 >Emitted(9, 22) Source(1, 15) + SourceIndex(0) -8 >Emitted(9, 31) Source(1, 16) + SourceIndex(0) -9 >Emitted(9, 39) Source(4, 2) + SourceIndex(0) +1->Emitted(10, 1) Source(4, 1) + SourceIndex(0) name (m) +2 >Emitted(10, 2) Source(4, 2) + SourceIndex(0) name (m) +3 >Emitted(10, 4) Source(1, 15) + SourceIndex(0) +4 >Emitted(10, 5) Source(1, 16) + SourceIndex(0) +5 >Emitted(10, 8) Source(1, 15) + SourceIndex(0) +6 >Emitted(10, 17) Source(1, 16) + SourceIndex(0) +7 >Emitted(10, 22) Source(1, 15) + SourceIndex(0) +8 >Emitted(10, 31) Source(1, 16) + SourceIndex(0) +9 >Emitted(10, 39) Source(4, 2) + SourceIndex(0) --- >>>var a = m.c; 1 > @@ -159,14 +160,14 @@ sourceFile:sourceMapValidationImport.ts 6 > . 7 > c 8 > ; -1 >Emitted(10, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(10, 5) Source(5, 8) + SourceIndex(0) -3 >Emitted(10, 6) Source(5, 9) + SourceIndex(0) -4 >Emitted(10, 9) Source(5, 12) + SourceIndex(0) -5 >Emitted(10, 10) Source(5, 13) + SourceIndex(0) -6 >Emitted(10, 11) Source(5, 14) + SourceIndex(0) -7 >Emitted(10, 12) Source(5, 15) + SourceIndex(0) -8 >Emitted(10, 13) Source(5, 16) + SourceIndex(0) +1 >Emitted(11, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(11, 5) Source(5, 8) + SourceIndex(0) +3 >Emitted(11, 6) Source(5, 9) + SourceIndex(0) +4 >Emitted(11, 9) Source(5, 12) + SourceIndex(0) +5 >Emitted(11, 10) Source(5, 13) + SourceIndex(0) +6 >Emitted(11, 11) Source(5, 14) + SourceIndex(0) +7 >Emitted(11, 12) Source(5, 15) + SourceIndex(0) +8 >Emitted(11, 13) Source(5, 16) + SourceIndex(0) --- >>>exports.b = m.c; 1-> @@ -185,13 +186,13 @@ sourceFile:sourceMapValidationImport.ts 5 > . 6 > c 7 > ; -1->Emitted(11, 1) Source(6, 15) + SourceIndex(0) -2 >Emitted(11, 10) Source(6, 16) + SourceIndex(0) -3 >Emitted(11, 13) Source(6, 19) + SourceIndex(0) -4 >Emitted(11, 14) Source(6, 20) + SourceIndex(0) -5 >Emitted(11, 15) Source(6, 21) + SourceIndex(0) -6 >Emitted(11, 16) Source(6, 22) + SourceIndex(0) -7 >Emitted(11, 17) Source(6, 23) + SourceIndex(0) +1->Emitted(12, 1) Source(6, 15) + SourceIndex(0) +2 >Emitted(12, 10) Source(6, 16) + SourceIndex(0) +3 >Emitted(12, 13) Source(6, 19) + SourceIndex(0) +4 >Emitted(12, 14) Source(6, 20) + SourceIndex(0) +5 >Emitted(12, 15) Source(6, 21) + SourceIndex(0) +6 >Emitted(12, 16) Source(6, 22) + SourceIndex(0) +7 >Emitted(12, 17) Source(6, 23) + SourceIndex(0) --- >>>var x = new a(); 1-> @@ -212,14 +213,14 @@ sourceFile:sourceMapValidationImport.ts 6 > a 7 > () 8 > ; -1->Emitted(12, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(12, 5) Source(7, 5) + SourceIndex(0) -3 >Emitted(12, 6) Source(7, 6) + SourceIndex(0) -4 >Emitted(12, 9) Source(7, 9) + SourceIndex(0) -5 >Emitted(12, 13) Source(7, 13) + SourceIndex(0) -6 >Emitted(12, 14) Source(7, 14) + SourceIndex(0) -7 >Emitted(12, 16) Source(7, 16) + SourceIndex(0) -8 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) +1->Emitted(13, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(13, 5) Source(7, 5) + SourceIndex(0) +3 >Emitted(13, 6) Source(7, 6) + SourceIndex(0) +4 >Emitted(13, 9) Source(7, 9) + SourceIndex(0) +5 >Emitted(13, 13) Source(7, 13) + SourceIndex(0) +6 >Emitted(13, 14) Source(7, 14) + SourceIndex(0) +7 >Emitted(13, 16) Source(7, 16) + SourceIndex(0) +8 >Emitted(13, 17) Source(7, 17) + SourceIndex(0) --- >>>var y = new exports.b(); 1-> @@ -240,13 +241,13 @@ sourceFile:sourceMapValidationImport.ts 6 > b 7 > () 8 > ; -1->Emitted(13, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(13, 5) Source(8, 5) + SourceIndex(0) -3 >Emitted(13, 6) Source(8, 6) + SourceIndex(0) -4 >Emitted(13, 9) Source(8, 9) + SourceIndex(0) -5 >Emitted(13, 13) Source(8, 13) + SourceIndex(0) -6 >Emitted(13, 22) Source(8, 14) + SourceIndex(0) -7 >Emitted(13, 24) Source(8, 16) + SourceIndex(0) -8 >Emitted(13, 25) Source(8, 17) + SourceIndex(0) +1->Emitted(14, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(14, 5) Source(8, 5) + SourceIndex(0) +3 >Emitted(14, 6) Source(8, 6) + SourceIndex(0) +4 >Emitted(14, 9) Source(8, 9) + SourceIndex(0) +5 >Emitted(14, 13) Source(8, 13) + SourceIndex(0) +6 >Emitted(14, 22) Source(8, 14) + SourceIndex(0) +7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0) +8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationImport.js.map \ No newline at end of file diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js index 0a41cd7790941..265d3e5b3e608 100644 --- a/tests/baselines/reference/staticInstanceResolution3.js +++ b/tests/baselines/reference/staticInstanceResolution3.js @@ -13,6 +13,7 @@ import WinJS = require('./staticInstanceResolution3_0'); WinJS.Promise.timeout(10); //// [staticInstanceResolution3_0.js] +"use strict"; var Promise = (function () { function Promise() { } @@ -23,6 +24,7 @@ var Promise = (function () { })(); exports.Promise = Promise; //// [staticInstanceResolution3_1.js] +"use strict"; /// var WinJS = require('./staticInstanceResolution3_0'); WinJS.Promise.timeout(10); diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index 843b79ec6f1c9..58def522978b3 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -18,6 +18,7 @@ function z(w3: WinJS) { } //// [staticInstanceResolution5_1.js] define(["require", "exports"], function (require, exports) { + "use strict"; // these 3 should be errors var x = function (w1) { }; var y = function (w2) { }; diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js index ba2ca1ae758a9..3a14dde64478d 100644 --- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js +++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js @@ -22,6 +22,7 @@ export class publicClassWithWithPrivateTypeParameters { //// [staticMethodWithTypeParameterExtendsClauseDeclFile.js] +"use strict"; var privateClass = (function () { function privateClass() { } diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js index 50ed1b4d755ad..7044d4a61b137 100644 --- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js +++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js @@ -4,4 +4,4 @@ import public = require("1"); //// [strictModeReservedWordInImportEqualDeclaration.js] -"use strict"; +"use strict";"use strict"; diff --git a/tests/baselines/reference/systemExportAssignment.js b/tests/baselines/reference/systemExportAssignment.js index bae5f6129ea60..72962cf835cd1 100644 --- a/tests/baselines/reference/systemExportAssignment.js +++ b/tests/baselines/reference/systemExportAssignment.js @@ -11,6 +11,7 @@ import * as a from "a"; //// [b.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemExportAssignment2.js b/tests/baselines/reference/systemExportAssignment2.js index 1ee0f4ff9b872..0f4dd71249336 100644 --- a/tests/baselines/reference/systemExportAssignment2.js +++ b/tests/baselines/reference/systemExportAssignment2.js @@ -11,6 +11,7 @@ import * as a from "a"; //// [a.js] System.register([], function(exports_1) { + "use strict"; var a; return { setters:[], @@ -21,6 +22,7 @@ System.register([], function(exports_1) { }); //// [b.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemExportAssignment3.js b/tests/baselines/reference/systemExportAssignment3.js index 46fcfd1b0ee02..ca2492a54e106 100644 --- a/tests/baselines/reference/systemExportAssignment3.js +++ b/tests/baselines/reference/systemExportAssignment3.js @@ -13,6 +13,7 @@ import * as a from "a"; //// [b.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModule1.js b/tests/baselines/reference/systemModule1.js index 8d99e84ae9f43..52f3b48206913 100644 --- a/tests/baselines/reference/systemModule1.js +++ b/tests/baselines/reference/systemModule1.js @@ -4,6 +4,7 @@ export var x = 1; //// [systemModule1.js] System.register([], function(exports_1) { + "use strict"; var x; return { setters:[], diff --git a/tests/baselines/reference/systemModule10.js b/tests/baselines/reference/systemModule10.js index fcecfc9b0f87d..ac32c4948e7b9 100644 --- a/tests/baselines/reference/systemModule10.js +++ b/tests/baselines/reference/systemModule10.js @@ -11,6 +11,7 @@ export {n2 as n3} //// [systemModule10.js] System.register(['file1', 'file2'], function(exports_1) { + "use strict"; var file1_1, n2; return { setters:[ diff --git a/tests/baselines/reference/systemModule10_ES5.js b/tests/baselines/reference/systemModule10_ES5.js index a86088a3463fb..0c98df6ba99bf 100644 --- a/tests/baselines/reference/systemModule10_ES5.js +++ b/tests/baselines/reference/systemModule10_ES5.js @@ -11,6 +11,7 @@ export {n2 as n3} //// [systemModule10_ES5.js] System.register(['file1', 'file2'], function(exports_1) { + "use strict"; var file1_1, n2; return { setters:[ diff --git a/tests/baselines/reference/systemModule11.js b/tests/baselines/reference/systemModule11.js index bf9b57c511cc2..92b0576b91907 100644 --- a/tests/baselines/reference/systemModule11.js +++ b/tests/baselines/reference/systemModule11.js @@ -43,6 +43,7 @@ export * from 'a'; //// [file1.js] // set of tests cases that checks generation of local storage for exported names System.register(['bar'], function(exports_1) { + "use strict"; var x; function foo() { } exports_1("foo", foo); @@ -68,6 +69,7 @@ System.register(['bar'], function(exports_1) { }); //// [file2.js] System.register(['bar'], function(exports_1) { + "use strict"; var x, y; var exportedNames_1 = { 'x': true, @@ -93,6 +95,7 @@ System.register(['bar'], function(exports_1) { }); //// [file3.js] System.register(['a', 'bar'], function(exports_1) { + "use strict"; function foo() { } exports_1("default", foo); var exportedNames_1 = { @@ -123,6 +126,7 @@ System.register(['a', 'bar'], function(exports_1) { }); //// [file4.js] System.register(['a'], function(exports_1) { + "use strict"; var x, z, z1; function foo() { } exports_1("foo", foo); @@ -144,6 +148,7 @@ System.register(['a'], function(exports_1) { }); //// [file5.js] System.register(['a'], function(exports_1) { + "use strict"; function foo() { } function exportStar_1(m) { var exports = {}; diff --git a/tests/baselines/reference/systemModule12.js b/tests/baselines/reference/systemModule12.js index 0b5f5a3e8500f..d8961c3b0017c 100644 --- a/tests/baselines/reference/systemModule12.js +++ b/tests/baselines/reference/systemModule12.js @@ -6,6 +6,7 @@ import n from 'file1' //// [systemModule12.js] System.register("NamedModule", [], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModule13.js b/tests/baselines/reference/systemModule13.js index c66e123c738f2..0b81a946de4cb 100644 --- a/tests/baselines/reference/systemModule13.js +++ b/tests/baselines/reference/systemModule13.js @@ -6,6 +6,7 @@ for ([x] of [[1]]) {} //// [systemModule13.js] System.register([], function(exports_1) { + "use strict"; var x, y, z, z0, z1; return { setters:[], diff --git a/tests/baselines/reference/systemModule14.js b/tests/baselines/reference/systemModule14.js index 76906db5980fc..2ec8fc600f42c 100644 --- a/tests/baselines/reference/systemModule14.js +++ b/tests/baselines/reference/systemModule14.js @@ -12,6 +12,7 @@ export {foo as b} //// [systemModule14.js] System.register(["foo"], function(exports_1) { + "use strict"; var foo_1; var x; function foo() { diff --git a/tests/baselines/reference/systemModule15.js b/tests/baselines/reference/systemModule15.js index 4d5536cbaa101..f8dc11b0ac7c7 100644 --- a/tests/baselines/reference/systemModule15.js +++ b/tests/baselines/reference/systemModule15.js @@ -35,6 +35,7 @@ export var value2 = "v"; //// [file3.js] System.register([], function(exports_1) { + "use strict"; var value; return { setters:[], @@ -46,6 +47,7 @@ System.register([], function(exports_1) { }); //// [file4.js] System.register([], function(exports_1) { + "use strict"; var value2; return { setters:[], @@ -56,6 +58,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register(["./file3"], function(exports_1) { + "use strict"; var moduleCStar, file3_1, file3_2; return { setters:[ @@ -73,6 +76,7 @@ System.register(["./file3"], function(exports_1) { }); //// [file1.js] System.register(["./file2"], function(exports_1) { + "use strict"; var moduleB; return { setters:[ diff --git a/tests/baselines/reference/systemModule16.js b/tests/baselines/reference/systemModule16.js index 851b941492a4e..76fb85cd3aead 100644 --- a/tests/baselines/reference/systemModule16.js +++ b/tests/baselines/reference/systemModule16.js @@ -14,6 +14,7 @@ x,y,a1,b1,d1; //// [systemModule16.js] System.register(["foo", "bar"], function(exports_1) { + "use strict"; var x, y, foo_1; var exportedNames_1 = { 'x': true, diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js index 90efdc8872a32..7ef4d441823c0 100644 --- a/tests/baselines/reference/systemModule17.js +++ b/tests/baselines/reference/systemModule17.js @@ -43,6 +43,7 @@ export {II as II1}; //// [f1.js] System.register([], function(exports_1) { + "use strict"; var A; return { setters:[], @@ -58,6 +59,7 @@ System.register([], function(exports_1) { }); //// [f2.js] System.register(["f1"], function(exports_1) { + "use strict"; var f1_1; var x, N, IX; return { diff --git a/tests/baselines/reference/systemModule2.js b/tests/baselines/reference/systemModule2.js index cc0a3cc291685..ee3dfd327ec71 100644 --- a/tests/baselines/reference/systemModule2.js +++ b/tests/baselines/reference/systemModule2.js @@ -5,6 +5,7 @@ export = x; //// [systemModule2.js] System.register([], function(exports_1) { + "use strict"; var x; return { setters:[], diff --git a/tests/baselines/reference/systemModule3.js b/tests/baselines/reference/systemModule3.js index 885e86e442a22..c7aeb7f508c31 100644 --- a/tests/baselines/reference/systemModule3.js +++ b/tests/baselines/reference/systemModule3.js @@ -19,6 +19,7 @@ export default class {} //// [file1.js] System.register([], function(exports_1) { + "use strict"; function default_1() { } exports_1("default", default_1); return { @@ -29,6 +30,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register([], function(exports_1) { + "use strict"; function f() { } exports_1("default", f); return { @@ -39,6 +41,7 @@ System.register([], function(exports_1) { }); //// [file3.js] System.register([], function(exports_1) { + "use strict"; var C; return { setters:[], @@ -54,6 +57,7 @@ System.register([], function(exports_1) { }); //// [file4.js] System.register([], function(exports_1) { + "use strict"; var default_1; return { setters:[], diff --git a/tests/baselines/reference/systemModule4.js b/tests/baselines/reference/systemModule4.js index 2b06d04e06f56..192c87d49eab8 100644 --- a/tests/baselines/reference/systemModule4.js +++ b/tests/baselines/reference/systemModule4.js @@ -5,6 +5,7 @@ export var y; //// [systemModule4.js] System.register([], function(exports_1) { + "use strict"; var x, y; return { setters:[], diff --git a/tests/baselines/reference/systemModule5.js b/tests/baselines/reference/systemModule5.js index 4d9aadb3566c9..4a455f25b1395 100644 --- a/tests/baselines/reference/systemModule5.js +++ b/tests/baselines/reference/systemModule5.js @@ -5,6 +5,7 @@ export function foo() {} //// [systemModule5.js] System.register([], function(exports_1) { + "use strict"; function foo() { } exports_1("foo", foo); return { diff --git a/tests/baselines/reference/systemModule6.js b/tests/baselines/reference/systemModule6.js index d36535f676131..7d93ee1df032a 100644 --- a/tests/baselines/reference/systemModule6.js +++ b/tests/baselines/reference/systemModule6.js @@ -8,6 +8,7 @@ function foo() { //// [systemModule6.js] System.register([], function(exports_1) { + "use strict"; var C; function foo() { new C(); diff --git a/tests/baselines/reference/systemModule7.js b/tests/baselines/reference/systemModule7.js index 0c396ddbe55f0..d76d86a3b0f51 100644 --- a/tests/baselines/reference/systemModule7.js +++ b/tests/baselines/reference/systemModule7.js @@ -12,6 +12,7 @@ export module M { //// [systemModule7.js] System.register([], function(exports_1) { + "use strict"; var M; return { setters:[], diff --git a/tests/baselines/reference/systemModule8.js b/tests/baselines/reference/systemModule8.js index be4f8c05374f5..b6cdd677f007c 100644 --- a/tests/baselines/reference/systemModule8.js +++ b/tests/baselines/reference/systemModule8.js @@ -32,6 +32,7 @@ for ([x] of [[1]]) {} //// [systemModule8.js] System.register([], function(exports_1) { + "use strict"; var x, y, z0, z1; function foo() { exports_1("x", x = 100); diff --git a/tests/baselines/reference/systemModule9.js b/tests/baselines/reference/systemModule9.js index d7913f2f8b73e..137dd019a023a 100644 --- a/tests/baselines/reference/systemModule9.js +++ b/tests/baselines/reference/systemModule9.js @@ -23,6 +23,7 @@ export {y as z}; //// [systemModule9.js] System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'], function(exports_1) { + "use strict"; var ns, file2_1, file3_1, file5_1, ns3; var x, y; var exportedNames_1 = { diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.js b/tests/baselines/reference/systemModuleAmbientDeclarations.js index 82c18cd798165..9bdde23a8427a 100644 --- a/tests/baselines/reference/systemModuleAmbientDeclarations.js +++ b/tests/baselines/reference/systemModuleAmbientDeclarations.js @@ -30,6 +30,7 @@ export declare module M { var v: number; } //// [file1.js] System.register([], function(exports_1) { + "use strict"; var promise, foo, c, e; return { setters:[], @@ -44,6 +45,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -52,6 +54,7 @@ System.register([], function(exports_1) { }); //// [file3.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -60,6 +63,7 @@ System.register([], function(exports_1) { }); //// [file4.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -68,6 +72,7 @@ System.register([], function(exports_1) { }); //// [file5.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -76,6 +81,7 @@ System.register([], function(exports_1) { }); //// [file6.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModuleConstEnums.js b/tests/baselines/reference/systemModuleConstEnums.js index 126e6266b2c70..8b8707768d9cd 100644 --- a/tests/baselines/reference/systemModuleConstEnums.js +++ b/tests/baselines/reference/systemModuleConstEnums.js @@ -14,6 +14,7 @@ module M { //// [systemModuleConstEnums.js] System.register([], function(exports_1) { + "use strict"; function foo() { use(0 /* X */); use(0 /* X */); diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js index 381331a84dbde..8466d399ac976 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js @@ -14,6 +14,7 @@ module M { //// [systemModuleConstEnumsSeparateCompilation.js] System.register([], function(exports_1) { + "use strict"; var TopLevelConstEnum, M; function foo() { use(TopLevelConstEnum.X); diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js index 06577c401a091..f11c5d9a360cd 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.js +++ b/tests/baselines/reference/systemModuleDeclarationMerging.js @@ -11,6 +11,7 @@ export module E { var x; } //// [systemModuleDeclarationMerging.js] System.register([], function(exports_1) { + "use strict"; var F, C, E; function F() { } exports_1("F", F); diff --git a/tests/baselines/reference/systemModuleExportDefault.js b/tests/baselines/reference/systemModuleExportDefault.js index 4df3ec828c148..6befe63b26766 100644 --- a/tests/baselines/reference/systemModuleExportDefault.js +++ b/tests/baselines/reference/systemModuleExportDefault.js @@ -17,6 +17,7 @@ export default class C {} //// [file1.js] System.register([], function(exports_1) { + "use strict"; function default_1() { } exports_1("default", default_1); return { @@ -27,6 +28,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register([], function(exports_1) { + "use strict"; function foo() { } exports_1("default", foo); return { @@ -37,6 +39,7 @@ System.register([], function(exports_1) { }); //// [file3.js] System.register([], function(exports_1) { + "use strict"; var default_1; return { setters:[], @@ -52,6 +55,7 @@ System.register([], function(exports_1) { }); //// [file4.js] System.register([], function(exports_1) { + "use strict"; var C; return { setters:[], diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index 39a957ed698a1..b7ec776e483bf 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -14,6 +14,7 @@ export module TopLevelModule2 { //// [systemModuleNonTopLevelModuleMembers.js] System.register([], function(exports_1) { + "use strict"; var TopLevelClass, TopLevelModule, TopLevelEnum, TopLevelModule2; function TopLevelFunction() { } exports_1("TopLevelFunction", TopLevelFunction); diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js index 9d1e87fbc662d..8b528f281ed10 100644 --- a/tests/baselines/reference/systemModuleWithSuperClass.js +++ b/tests/baselines/reference/systemModuleWithSuperClass.js @@ -14,6 +14,7 @@ export class Bar extends Foo { //// [foo.js] System.register([], function(exports_1) { + "use strict"; var Foo; return { setters:[], @@ -29,6 +30,7 @@ System.register([], function(exports_1) { }); //// [bar.js] System.register(['./foo'], function(exports_1) { + "use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index 7c19596494798..31a2e995a18b4 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -49,6 +49,7 @@ enum SomeEnum { export = this; // Should be an error //// [thisInInvalidContextsExternalModule.js] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js index 086f46cf7ce49..da5885fafabaa 100644 --- a/tests/baselines/reference/topLevelAmbientModule.js +++ b/tests/baselines/reference/topLevelAmbientModule.js @@ -13,6 +13,7 @@ var z = foo.x + 10; //// [foo_0.js] //// [foo_1.js] +"use strict"; /// var foo = require("foo"); var z = foo.x + 10; diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js index 91e28b6a97674..bf274fcf5584d 100644 --- a/tests/baselines/reference/topLevelExports.js +++ b/tests/baselines/reference/topLevelExports.js @@ -7,6 +7,7 @@ void log(foo).toString(); //// [topLevelExports.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.foo = 3; function log(n) { return n; } void log(exports.foo).toString(); diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js index a6e7a151eb98a..c893a9b467593 100644 --- a/tests/baselines/reference/topLevelFileModule.js +++ b/tests/baselines/reference/topLevelFileModule.js @@ -13,7 +13,9 @@ var z = foo.x + fum.y; //// [foo_0.js] +"use strict"; //// [foo_1.js] +"use strict"; var foo = require("./vs/foo_0"); var fum = require("./vs/fum"); var z = foo.x + fum.y; diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js index f6b9e3d68344a..edd090d49ccd1 100644 --- a/tests/baselines/reference/topLevelFileModuleMissing.js +++ b/tests/baselines/reference/topLevelFileModuleMissing.js @@ -9,5 +9,6 @@ var z = foo.x + 10; //// [foo_1.js] +"use strict"; var foo = require("vs/foo"); var z = foo.x + 10; diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js index 863a0e9a103ae..81d3c4a1e4f05 100644 --- a/tests/baselines/reference/topLevelLambda4.js +++ b/tests/baselines/reference/topLevelLambda4.js @@ -3,6 +3,7 @@ export var x = () => this.window; //// [topLevelLambda4.js] define(["require", "exports"], function (require, exports) { + "use strict"; var _this = this; exports.x = function () { return _this.window; }; }); diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js index e223a293d7c61..cb32901441272 100644 --- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js +++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js @@ -18,6 +18,7 @@ var z2 = foo.y() + 10; // Should resolve //// [foo_1.js] //// [foo_2.js] +"use strict"; /// var foo = require("vs/foo_0"); var z1 = foo.x + 10; // Should error, as declaration should win diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js index 35e5b3074b07b..e0bb6d8efc18b 100644 --- a/tests/baselines/reference/tsxAttributeResolution10.js +++ b/tests/baselines/reference/tsxAttributeResolution10.js @@ -33,6 +33,7 @@ export class MyComponent { //// [file.jsx] define(["require", "exports"], function (require, exports) { + "use strict"; var MyComponent = (function () { function MyComponent() { } diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js index bfc19a7ba4f4c..3879372a6728d 100644 --- a/tests/baselines/reference/tsxAttributeResolution9.js +++ b/tests/baselines/reference/tsxAttributeResolution9.js @@ -29,6 +29,7 @@ export class MyComponent { //// [file.jsx] define(["require", "exports"], function (require, exports) { + "use strict"; var MyComponent = (function () { function MyComponent() { } diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js index cd8d7e13beb2f..270c9254cbbbe 100644 --- a/tests/baselines/reference/tsxElementResolution17.js +++ b/tests/baselines/reference/tsxElementResolution17.js @@ -30,5 +30,6 @@ import s2 = require('elements2'); //// [file.jsx] //// [consumer.jsx] define(["require", "exports", 'elements1'], function (require, exports, s1) { + "use strict"; ; }); diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js index 72612e8ce54fd..cb1a61dd59ffa 100644 --- a/tests/baselines/reference/tsxElementResolution19.js +++ b/tests/baselines/reference/tsxElementResolution19.js @@ -23,6 +23,7 @@ import {MyClass} from './file1'; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; var MyClass = (function () { function MyClass() { } @@ -32,5 +33,6 @@ define(["require", "exports"], function (require, exports) { }); //// [file2.js] define(["require", "exports", 'react', './file1'], function (require, exports, React, file1_1) { + "use strict"; React.createElement(file1_1.MyClass, null); }); diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js index 3e486eacef866..2830137f3b07b 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.js +++ b/tests/baselines/reference/tsxExternalModuleEmit1.js @@ -32,6 +32,7 @@ export class Button extends React.Component { } //// [button.jsx] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -50,6 +51,7 @@ var Button = (function (_super) { })(React.Component); exports.Button = Button; //// [app.jsx] +"use strict"; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js index 9968fa8d708e6..2233c5181cbff 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.js +++ b/tests/baselines/reference/tsxExternalModuleEmit2.js @@ -18,6 +18,7 @@ declare var Foo, React; //// [app.js] +"use strict"; var mod_1 = require('mod'); // Should see mod_1['default'] in emit here React.createElement(Foo, {handler: mod_1["default"]}); diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js index 80aeef6b29794..894d0c3d6981d 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.js +++ b/tests/baselines/reference/tsxPreserveEmit1.js @@ -27,6 +27,7 @@ var routes = ; //// [test.jsx] define(["require", "exports", 'react-router'], function (require, exports, ReactRouter) { + "use strict"; var Route = ReactRouter.Route; var routes = ; }); diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js index f6a7eeb72a16b..06b05f67d636e 100644 --- a/tests/baselines/reference/tsxReactEmit5.js +++ b/tests/baselines/reference/tsxReactEmit5.js @@ -22,6 +22,7 @@ var spread1 =
; //// [file.js] //// [react-consumer.js] +"use strict"; var test_1 = require("./test"); // Should emit test_1.React.createElement // and React.__spread diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js index 6e82fe4b07da3..1f72e1d1b008f 100644 --- a/tests/baselines/reference/typeAliasDeclarationEmit.js +++ b/tests/baselines/reference/typeAliasDeclarationEmit.js @@ -6,6 +6,7 @@ export type CallbackArray = () => T; //// [typeAliasDeclarationEmit.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js index 4bb1bd3efd9d7..b94eb56a2a288 100644 --- a/tests/baselines/reference/typeAliasDeclarationEmit2.js +++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js @@ -4,6 +4,7 @@ export type A = { value: a }; //// [typeAliasDeclarationEmit2.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js index e75fa63c4b7ec..90470f58124fc 100644 --- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js +++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js @@ -12,12 +12,14 @@ f.foo(); //// [file1.js] +"use strict"; function foo() { var classes = undefined; return new classes(null); } exports.foo = foo; //// [file2.js] +"use strict"; var f = require('./file1'); f.foo(); diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js index 88423e65ca1ee..76624440d248a 100644 --- a/tests/baselines/reference/typeGuardsInExternalModule.js +++ b/tests/baselines/reference/typeGuardsInExternalModule.js @@ -26,6 +26,7 @@ else { //// [typeGuardsInExternalModule.js] // Note that type guards affect types of variables and parameters only and // have no effect on members of objects such as properties. +"use strict"; // local variable in external module var num; var var1; diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js index 7e92394138627..87e0075a9428e 100644 --- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js +++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js @@ -24,6 +24,7 @@ i2 = a2; // no error //// [typeParameterCompatibilityAccrossDeclarations.js] define(["require", "exports"], function (require, exports) { + "use strict"; var a = { x: function (y) { return null; } }; diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index 55a6beeceba25..ed5ae95f23cde 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -112,6 +112,7 @@ module TopLevelModule2 { //// [typeResolution.js] define(["require", "exports"], function (require, exports) { + "use strict"; var TopLevelModule1; (function (TopLevelModule1) { var SubModule1; diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index e05b5d65d10bb..5fd1e175fa7da 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,2 +1,2 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.ClassA.AisIn1","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor","TopLevelModule2.SubModule3.ClassA.AisIn2_3"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBACIE,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAE/CA,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAEzDA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BACIC,uCAAuCA;4BACvCA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAEDA,0EAA0EA;YAC1EA;gBACIW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,6DAA6DA;gBAC7DA;oBAAAC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAI;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CJ,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAO;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CP,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;YAGnDA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;QAGLA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAA0B;YAEAC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBE,CAACA;YACvBF,aAACA;QAADA,CAACA,AAFD1B,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtB6B;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFM7B,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpBgC,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBE,CAACA;gBACzBF,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.ClassA.AisIn1","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor","TopLevelModule2.SubModule3.ClassA.AisIn2_3"],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC;oBAAAC;oBAmBAC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBACIE,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,SAmBlBA,CAAAA;gBACDA;oBAAAI;oBAsBAC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAE/CA,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAEzDA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,SAsBlBA,CAAAA;gBAEDA;oBACIO;wBACIC;4BACIC,uCAAuCA;4BACvCA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAEDA,0EAA0EA;YAC1EA;gBACIW;oBACIC;wBACIC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,6DAA6DA;gBAC7DA;oBAAAC;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAI;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CJ,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;gBAC/CA;oBAAAO;oBAA8CC,CAACA;oBAAlBD,2BAAUA,GAAjBA,cAAsBE,CAACA;oBAACF,aAACA;gBAADA,CAACA,AAA/CP,IAA+CA;gBAAlCA,oBAAMA,SAA4BA,CAAAA;YAGnDA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;QAGLA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA;YAAA0B;YAEAC,CAACA;YADUD,uBAAMA,GAAbA,cAAkBE,CAACA;YACvBF,aAACA;QAADA,CAACA,AAFD1B,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtB6B;gBAAAC;gBAAsBC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,SAAIA,CAAAA;QAC3BA,CAACA,EAFM7B,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpBgC,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC;gBAAAC;gBAEAC,CAACA;gBADUD,yBAAQA,GAAfA,cAAoBE,CAACA;gBACzBF,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,SAElBA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 244dbed0b9261..e58487a7850a5 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/typeResolution.js sourceFile:typeResolution.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { +>>> "use strict"; >>> var TopLevelModule1; 1 >^^^^ 2 > ^^^^ @@ -118,10 +119,10 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -1 >Emitted(2, 5) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 9) Source(1, 15) + SourceIndex(0) -3 >Emitted(2, 24) Source(1, 30) + SourceIndex(0) -4 >Emitted(2, 25) Source(100, 2) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 24) Source(1, 30) + SourceIndex(0) +4 >Emitted(3, 25) Source(100, 2) + SourceIndex(0) --- >>> (function (TopLevelModule1) { 1->^^^^ @@ -134,11 +135,11 @@ sourceFile:typeResolution.ts 3 > TopLevelModule1 4 > 5 > { -1->Emitted(3, 5) Source(1, 1) + SourceIndex(0) -2 >Emitted(3, 16) Source(1, 15) + SourceIndex(0) -3 >Emitted(3, 31) Source(1, 30) + SourceIndex(0) -4 >Emitted(3, 33) Source(1, 31) + SourceIndex(0) -5 >Emitted(3, 34) Source(1, 32) + SourceIndex(0) +1->Emitted(4, 5) Source(1, 1) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 31) Source(1, 30) + SourceIndex(0) +4 >Emitted(4, 33) Source(1, 31) + SourceIndex(0) +5 >Emitted(4, 34) Source(1, 32) + SourceIndex(0) --- >>> var SubModule1; 1 >^^^^^^^^ @@ -223,10 +224,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(4, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(4, 13) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(4, 23) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(4, 24) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(5, 13) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(5, 23) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(5, 24) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> (function (SubModule1) { 1->^^^^^^^^ @@ -239,11 +240,11 @@ sourceFile:typeResolution.ts 3 > SubModule1 4 > 5 > { -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(5, 20) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(5, 30) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(5, 32) Source(2, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(5, 33) Source(2, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(6, 9) Source(2, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(6, 20) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(6, 30) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(6, 32) Source(2, 30) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(6, 33) Source(2, 31) + SourceIndex(0) name (TopLevelModule1) --- >>> var SubSubModule1; 1 >^^^^^^^^^^^^ @@ -312,10 +313,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(6, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(6, 17) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(6, 30) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(6, 31) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(7, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +2 >Emitted(7, 17) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) +3 >Emitted(7, 30) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) +4 >Emitted(7, 31) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> (function (SubSubModule1) { 1->^^^^^^^^^^^^ @@ -329,24 +330,24 @@ sourceFile:typeResolution.ts 3 > SubSubModule1 4 > 5 > { -1->Emitted(7, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(7, 24) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(7, 37) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(7, 39) Source(3, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1) -5 >Emitted(7, 40) Source(3, 38) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1->Emitted(8, 13) Source(3, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +2 >Emitted(8, 24) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) +3 >Emitted(8, 37) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) +4 >Emitted(8, 39) Source(3, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1) +5 >Emitted(8, 40) Source(3, 38) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(8, 17) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(9, 17) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(9, 21) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(10, 21) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -373,8 +374,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(10, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) -2 >Emitted(10, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) +1->Emitted(11, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) +2 >Emitted(11, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor) --- >>> ClassA.prototype.AisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -384,9 +385,9 @@ sourceFile:typeResolution.ts 1-> 2 > AisIn1_1_1 3 > -1->Emitted(11, 21) Source(5, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(11, 48) Source(5, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -3 >Emitted(11, 51) Source(5, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(12, 21) Source(5, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +2 >Emitted(12, 48) Source(5, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +3 >Emitted(12, 51) Source(5, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) --- >>> // Try all qualified names of this type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -394,8 +395,8 @@ sourceFile:typeResolution.ts 1->public AisIn1_1_1() { > 2 > // Try all qualified names of this type -1->Emitted(12, 25) Source(6, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(12, 64) Source(6, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(13, 25) Source(6, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(13, 64) Source(6, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -408,10 +409,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(13, 25) Source(7, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(13, 29) Source(7, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(13, 31) Source(7, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(13, 32) Source(7, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(14, 25) Source(7, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(14, 29) Source(7, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(14, 31) Source(7, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(14, 32) Source(7, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -426,12 +427,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(14, 25) Source(7, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(14, 27) Source(7, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(14, 28) Source(7, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(14, 38) Source(7, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(14, 40) Source(7, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(14, 41) Source(7, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(15, 25) Source(7, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(15, 27) Source(7, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(15, 28) Source(7, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(15, 38) Source(7, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(15, 40) Source(7, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(15, 41) Source(7, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -444,10 +445,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(15, 25) Source(8, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(15, 29) Source(8, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(15, 31) Source(8, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(15, 32) Source(8, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(16, 25) Source(8, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(16, 29) Source(8, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(16, 31) Source(8, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(16, 32) Source(8, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -462,12 +463,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(16, 25) Source(8, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(16, 27) Source(8, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(16, 28) Source(8, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(16, 38) Source(8, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(16, 40) Source(8, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(16, 41) Source(8, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(17, 25) Source(8, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(17, 27) Source(8, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(17, 28) Source(8, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(17, 38) Source(8, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(17, 40) Source(8, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(17, 41) Source(8, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -480,10 +481,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(17, 25) Source(9, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(17, 29) Source(9, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(17, 31) Source(9, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(17, 32) Source(9, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(18, 25) Source(9, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(18, 29) Source(9, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(18, 31) Source(9, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(18, 32) Source(9, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -498,12 +499,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(18, 25) Source(9, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(18, 27) Source(9, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(18, 28) Source(9, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(18, 38) Source(9, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(18, 40) Source(9, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(18, 41) Source(9, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(19, 25) Source(9, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(19, 27) Source(9, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(19, 28) Source(9, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(19, 38) Source(9, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(19, 40) Source(9, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(19, 41) Source(9, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -516,10 +517,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(19, 25) Source(10, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(19, 29) Source(10, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(19, 31) Source(10, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(19, 32) Source(10, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(20, 25) Source(10, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(20, 29) Source(10, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(20, 31) Source(10, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(20, 32) Source(10, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -535,12 +536,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(20, 25) Source(10, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(20, 27) Source(10, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(20, 28) Source(10, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(20, 38) Source(10, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(20, 40) Source(10, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(20, 41) Source(10, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(21, 25) Source(10, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(21, 27) Source(10, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(21, 28) Source(10, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(21, 38) Source(10, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(21, 40) Source(10, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(21, 41) Source(10, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -549,8 +550,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(21, 25) Source(12, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(21, 66) Source(12, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(22, 25) Source(12, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(22, 66) Source(12, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -563,10 +564,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(22, 25) Source(13, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(22, 29) Source(13, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(22, 31) Source(13, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(22, 32) Source(13, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(23, 25) Source(13, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(23, 29) Source(13, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(23, 31) Source(13, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(23, 32) Source(13, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -581,12 +582,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(23, 25) Source(13, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(23, 27) Source(13, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(23, 28) Source(13, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(23, 38) Source(13, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(23, 40) Source(13, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(23, 41) Source(13, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(24, 25) Source(13, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(24, 27) Source(13, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(24, 28) Source(13, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(24, 38) Source(13, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(24, 40) Source(13, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(24, 41) Source(13, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -599,10 +600,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(24, 25) Source(14, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(24, 29) Source(14, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(24, 31) Source(14, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(24, 32) Source(14, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(25, 25) Source(14, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(25, 29) Source(14, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(25, 31) Source(14, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(25, 32) Source(14, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -618,12 +619,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(25, 25) Source(14, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(25, 27) Source(14, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(25, 28) Source(14, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(25, 38) Source(14, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(25, 40) Source(14, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(25, 41) Source(14, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(26, 25) Source(14, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(26, 27) Source(14, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(26, 28) Source(14, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(26, 38) Source(14, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(26, 40) Source(14, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(26, 41) Source(14, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -632,8 +633,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(26, 25) Source(16, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(26, 62) Source(16, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(27, 25) Source(16, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(27, 62) Source(16, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -646,10 +647,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(27, 25) Source(17, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(27, 29) Source(17, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(27, 31) Source(17, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(27, 32) Source(17, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(28, 25) Source(17, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(28, 29) Source(17, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(28, 31) Source(17, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(28, 32) Source(17, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -665,12 +666,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(28, 25) Source(17, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(28, 27) Source(17, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(28, 28) Source(17, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(28, 38) Source(17, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(28, 40) Source(17, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(28, 41) Source(17, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(29, 25) Source(17, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(29, 27) Source(17, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(29, 28) Source(17, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(29, 38) Source(17, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(29, 40) Source(17, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(29, 41) Source(17, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -679,8 +680,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(29, 25) Source(19, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(29, 47) Source(19, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(30, 25) Source(19, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(30, 47) Source(19, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -693,10 +694,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(30, 25) Source(20, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(30, 29) Source(20, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(30, 31) Source(20, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(30, 32) Source(20, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(31, 25) Source(20, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(31, 29) Source(20, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(31, 31) Source(20, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(31, 32) Source(20, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -711,12 +712,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(31, 25) Source(20, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(31, 27) Source(20, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(31, 28) Source(20, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(31, 38) Source(20, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(31, 40) Source(20, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(31, 41) Source(20, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(32, 25) Source(20, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(32, 27) Source(20, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(32, 28) Source(20, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(32, 38) Source(20, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(32, 40) Source(20, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(32, 41) Source(20, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -729,10 +730,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(32, 25) Source(21, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(32, 29) Source(21, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(32, 31) Source(21, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(32, 32) Source(21, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(33, 25) Source(21, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(33, 29) Source(21, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(33, 31) Source(21, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(33, 32) Source(21, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -747,12 +748,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(33, 25) Source(21, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(33, 27) Source(21, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -3 >Emitted(33, 28) Source(21, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -4 >Emitted(33, 38) Source(21, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -5 >Emitted(33, 40) Source(21, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -6 >Emitted(33, 41) Source(21, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1->Emitted(34, 25) Source(21, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(34, 27) Source(21, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +3 >Emitted(34, 28) Source(21, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +4 >Emitted(34, 38) Source(21, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +5 >Emitted(34, 40) Source(21, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +6 >Emitted(34, 41) Source(21, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -761,8 +762,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(34, 21) Source(22, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) -2 >Emitted(34, 22) Source(22, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +1 >Emitted(35, 21) Source(22, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) +2 >Emitted(35, 22) Source(22, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^^^^^ @@ -770,8 +771,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(35, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(35, 34) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +1->Emitted(36, 21) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -802,10 +803,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(36, 17) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -2 >Emitted(36, 18) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) -3 >Emitted(36, 18) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(36, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(37, 17) Source(23, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +2 >Emitted(37, 18) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA) +3 >Emitted(37, 18) Source(4, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(37, 22) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> SubSubModule1.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -835,23 +836,23 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(37, 17) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(37, 37) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(37, 46) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(37, 47) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(38, 17) Source(4, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +2 >Emitted(38, 37) Source(4, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +3 >Emitted(38, 46) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(38, 47) Source(23, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(38, 17) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(39, 17) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(39, 21) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(40, 21) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -881,8 +882,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(40, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) -2 >Emitted(40, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) +1->Emitted(41, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) +2 >Emitted(41, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor) --- >>> ClassB.prototype.BisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -892,9 +893,9 @@ sourceFile:typeResolution.ts 1-> 2 > BisIn1_1_1 3 > -1->Emitted(41, 21) Source(25, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(41, 48) Source(25, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -3 >Emitted(41, 51) Source(25, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(42, 21) Source(25, 24) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +2 >Emitted(42, 48) Source(25, 34) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +3 >Emitted(42, 51) Source(25, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) --- >>> /** Exactly the same as above in AisIn1_1_1 **/ 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -902,8 +903,8 @@ sourceFile:typeResolution.ts 1->public BisIn1_1_1() { > 2 > /** Exactly the same as above in AisIn1_1_1 **/ -1->Emitted(42, 25) Source(26, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(42, 72) Source(26, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(43, 25) Source(26, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(43, 72) Source(26, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> // Try all qualified names of this type 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -912,8 +913,8 @@ sourceFile:typeResolution.ts > > 2 > // Try all qualified names of this type -1 >Emitted(43, 25) Source(28, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(43, 64) Source(28, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(44, 25) Source(28, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(44, 64) Source(28, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -926,10 +927,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(44, 25) Source(29, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(44, 29) Source(29, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(44, 31) Source(29, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(44, 32) Source(29, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(45, 25) Source(29, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(45, 29) Source(29, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(45, 31) Source(29, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(45, 32) Source(29, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -944,12 +945,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(45, 25) Source(29, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(45, 27) Source(29, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(45, 28) Source(29, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(45, 38) Source(29, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(45, 40) Source(29, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(45, 41) Source(29, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(46, 25) Source(29, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(46, 27) Source(29, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(46, 28) Source(29, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(46, 38) Source(29, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(46, 40) Source(29, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(46, 41) Source(29, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -962,10 +963,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(46, 25) Source(30, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(46, 29) Source(30, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(46, 31) Source(30, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(46, 32) Source(30, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(47, 25) Source(30, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(47, 29) Source(30, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(47, 31) Source(30, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(47, 32) Source(30, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -980,12 +981,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(47, 25) Source(30, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(47, 27) Source(30, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(47, 28) Source(30, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(47, 38) Source(30, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(47, 40) Source(30, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(47, 41) Source(30, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(48, 25) Source(30, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(48, 27) Source(30, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(48, 28) Source(30, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(48, 38) Source(30, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(48, 40) Source(30, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(48, 41) Source(30, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -998,10 +999,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(48, 25) Source(31, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(48, 29) Source(31, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(48, 31) Source(31, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(48, 32) Source(31, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(49, 25) Source(31, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(49, 29) Source(31, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(49, 31) Source(31, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(49, 32) Source(31, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1016,12 +1017,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(49, 25) Source(31, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(49, 27) Source(31, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(49, 28) Source(31, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(49, 38) Source(31, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(49, 40) Source(31, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(49, 41) Source(31, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(50, 25) Source(31, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(50, 27) Source(31, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(50, 28) Source(31, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(50, 38) Source(31, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(50, 40) Source(31, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(50, 41) Source(31, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1034,10 +1035,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(50, 25) Source(32, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(50, 29) Source(32, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(50, 31) Source(32, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(50, 32) Source(32, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(51, 25) Source(32, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(51, 29) Source(32, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(51, 31) Source(32, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(51, 32) Source(32, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1053,12 +1054,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(51, 25) Source(32, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(51, 27) Source(32, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(51, 28) Source(32, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(51, 38) Source(32, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(51, 40) Source(32, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(51, 41) Source(32, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(52, 25) Source(32, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(52, 27) Source(32, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(52, 28) Source(32, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(52, 38) Source(32, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(52, 40) Source(32, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(52, 41) Source(32, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1067,8 +1068,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(52, 25) Source(34, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(52, 66) Source(34, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(53, 25) Source(34, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(53, 66) Source(34, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1081,10 +1082,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(53, 25) Source(35, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(53, 29) Source(35, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(53, 31) Source(35, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(53, 32) Source(35, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(54, 25) Source(35, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(54, 29) Source(35, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(54, 31) Source(35, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(54, 32) Source(35, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1099,12 +1100,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(54, 25) Source(35, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(54, 27) Source(35, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(54, 28) Source(35, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(54, 38) Source(35, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(54, 40) Source(35, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(54, 41) Source(35, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(55, 25) Source(35, 37) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(55, 27) Source(35, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(55, 28) Source(35, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(55, 38) Source(35, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(55, 40) Source(35, 52) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(55, 41) Source(35, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1117,10 +1118,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(55, 25) Source(36, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(55, 29) Source(36, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(55, 31) Source(36, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(55, 32) Source(36, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(56, 25) Source(36, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(56, 29) Source(36, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(56, 31) Source(36, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(56, 32) Source(36, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1136,12 +1137,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(56, 25) Source(36, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(56, 27) Source(36, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(56, 28) Source(36, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(56, 38) Source(36, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(56, 40) Source(36, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(56, 41) Source(36, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(57, 25) Source(36, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(57, 27) Source(36, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(57, 28) Source(36, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(57, 38) Source(36, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(57, 40) Source(36, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(57, 41) Source(36, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1150,8 +1151,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(57, 25) Source(38, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(57, 62) Source(38, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(58, 25) Source(38, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(58, 62) Source(38, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1164,10 +1165,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(58, 25) Source(39, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(58, 29) Source(39, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(58, 31) Source(39, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(58, 32) Source(39, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(59, 25) Source(39, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(59, 29) Source(39, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(59, 31) Source(39, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(59, 32) Source(39, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1182,12 +1183,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(59, 25) Source(39, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(59, 27) Source(39, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(59, 28) Source(39, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(59, 38) Source(39, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(59, 40) Source(39, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(59, 41) Source(39, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(60, 25) Source(39, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(60, 27) Source(39, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(60, 28) Source(39, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(60, 38) Source(39, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(60, 40) Source(39, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(60, 41) Source(39, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1200,10 +1201,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(60, 25) Source(40, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(60, 29) Source(40, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(60, 31) Source(40, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(60, 32) Source(40, 63) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(61, 25) Source(40, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(61, 29) Source(40, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(61, 31) Source(40, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(61, 32) Source(40, 63) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1219,12 +1220,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(61, 25) Source(40, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(61, 27) Source(40, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(61, 28) Source(40, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(61, 36) Source(40, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(61, 38) Source(40, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(61, 39) Source(40, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(62, 25) Source(40, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(62, 27) Source(40, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(62, 28) Source(40, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(62, 36) Source(40, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(62, 38) Source(40, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(62, 39) Source(40, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1233,8 +1234,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(62, 25) Source(42, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(62, 47) Source(42, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(63, 25) Source(42, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(63, 47) Source(42, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1247,10 +1248,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(63, 25) Source(43, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(63, 29) Source(43, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(63, 31) Source(43, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(63, 32) Source(43, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(64, 25) Source(43, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(64, 29) Source(43, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(64, 31) Source(43, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(64, 32) Source(43, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1265,12 +1266,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(64, 25) Source(43, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(64, 27) Source(43, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(64, 28) Source(43, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(64, 38) Source(43, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(64, 40) Source(43, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(64, 41) Source(43, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(65, 25) Source(43, 41) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(65, 27) Source(43, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(65, 28) Source(43, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(65, 38) Source(43, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(65, 40) Source(43, 56) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(65, 41) Source(43, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1283,10 +1284,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(65, 25) Source(44, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(65, 29) Source(44, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(65, 31) Source(44, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(65, 32) Source(44, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(66, 25) Source(44, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(66, 29) Source(44, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(66, 31) Source(44, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(66, 32) Source(44, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1301,12 +1302,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(66, 25) Source(44, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(66, 27) Source(44, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -3 >Emitted(66, 28) Source(44, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -4 >Emitted(66, 38) Source(44, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -5 >Emitted(66, 40) Source(44, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -6 >Emitted(66, 41) Source(44, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1->Emitted(67, 25) Source(44, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(67, 27) Source(44, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +3 >Emitted(67, 28) Source(44, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +4 >Emitted(67, 38) Source(44, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +5 >Emitted(67, 40) Source(44, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +6 >Emitted(67, 41) Source(44, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1315,8 +1316,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(67, 21) Source(45, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) -2 >Emitted(67, 22) Source(45, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +1 >Emitted(68, 21) Source(45, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) +2 >Emitted(68, 22) Source(45, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1) --- >>> return ClassB; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1324,8 +1325,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(68, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(68, 34) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +1->Emitted(69, 21) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1359,10 +1360,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(69, 17) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -2 >Emitted(69, 18) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) -3 >Emitted(69, 18) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(69, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(70, 17) Source(46, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +2 >Emitted(70, 18) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB) +3 >Emitted(70, 18) Source(24, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(70, 22) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> SubSubModule1.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -1396,10 +1397,10 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(70, 17) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(70, 37) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(70, 46) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(70, 47) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(71, 17) Source(24, 26) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +2 >Emitted(71, 37) Source(24, 32) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +3 >Emitted(71, 46) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(71, 47) Source(46, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> var NonExportedClassQ = (function () { 1->^^^^^^^^^^^^^^^^ @@ -1407,21 +1408,21 @@ sourceFile:typeResolution.ts 1-> > export interface InterfaceX { XisIn1_1_1(); } > -1->Emitted(71, 17) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1->Emitted(72, 17) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> function NonExportedClassQ() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class NonExportedClassQ { > -1->Emitted(72, 21) Source(49, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +1->Emitted(73, 21) Source(49, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) --- >>> function QQ() { 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(73, 25) Source(50, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +1->Emitted(74, 25) Source(50, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) --- >>> /* Sampling of stuff from AisIn1_1_1 */ 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1429,8 +1430,8 @@ sourceFile:typeResolution.ts 1->function QQ() { > 2 > /* Sampling of stuff from AisIn1_1_1 */ -1->Emitted(74, 29) Source(51, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(74, 68) Source(51, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(75, 29) Source(51, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(75, 68) Source(51, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1443,10 +1444,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(75, 29) Source(52, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(75, 33) Source(52, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(75, 35) Source(52, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(75, 36) Source(52, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(76, 29) Source(52, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(76, 33) Source(52, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(76, 35) Source(52, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(76, 36) Source(52, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1461,12 +1462,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(76, 29) Source(52, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(76, 31) Source(52, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(76, 32) Source(52, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(76, 42) Source(52, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(76, 44) Source(52, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(76, 45) Source(52, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(77, 29) Source(52, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(77, 31) Source(52, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(77, 32) Source(52, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(77, 42) Source(52, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +5 >Emitted(77, 44) Source(52, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +6 >Emitted(77, 45) Source(52, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1479,10 +1480,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(77, 29) Source(53, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(77, 33) Source(53, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(77, 35) Source(53, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(77, 36) Source(53, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(78, 29) Source(53, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(78, 33) Source(53, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(78, 35) Source(53, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(78, 36) Source(53, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1497,12 +1498,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(78, 29) Source(53, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(78, 31) Source(53, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(78, 32) Source(53, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(78, 42) Source(53, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(78, 44) Source(53, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(78, 45) Source(53, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(79, 29) Source(53, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(79, 31) Source(53, 84) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(79, 32) Source(53, 85) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(79, 42) Source(53, 95) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +5 >Emitted(79, 44) Source(53, 97) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +6 >Emitted(79, 45) Source(53, 98) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1515,10 +1516,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(79, 29) Source(54, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(79, 33) Source(54, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(79, 35) Source(54, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(79, 36) Source(54, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(80, 29) Source(54, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(80, 33) Source(54, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(80, 35) Source(54, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(80, 36) Source(54, 44) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1533,12 +1534,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(80, 29) Source(54, 45) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(80, 31) Source(54, 47) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(80, 32) Source(54, 48) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(80, 42) Source(54, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(80, 44) Source(54, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(80, 45) Source(54, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(81, 29) Source(54, 45) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(81, 31) Source(54, 47) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(81, 32) Source(54, 48) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(81, 42) Source(54, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +5 >Emitted(81, 44) Source(54, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +6 >Emitted(81, 45) Source(54, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1551,10 +1552,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(81, 29) Source(55, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(81, 33) Source(55, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(81, 35) Source(55, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(81, 36) Source(55, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(82, 29) Source(55, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(82, 33) Source(55, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(82, 35) Source(55, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(82, 36) Source(55, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1569,12 +1570,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(82, 29) Source(55, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(82, 31) Source(55, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -3 >Emitted(82, 32) Source(55, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -4 >Emitted(82, 40) Source(55, 79) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -5 >Emitted(82, 42) Source(55, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -6 >Emitted(82, 43) Source(55, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1->Emitted(83, 29) Source(55, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(83, 31) Source(55, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +3 >Emitted(83, 32) Source(55, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +4 >Emitted(83, 40) Source(55, 79) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +5 >Emitted(83, 42) Source(55, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +6 >Emitted(83, 43) Source(55, 82) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1582,8 +1583,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(83, 25) Source(56, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) -2 >Emitted(83, 26) Source(56, 22) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +1 >Emitted(84, 25) Source(56, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) +2 >Emitted(84, 26) Source(56, 22) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1592,8 +1593,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(84, 21) Source(57, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) -2 >Emitted(84, 22) Source(57, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +1 >Emitted(85, 21) Source(57, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) +2 >Emitted(85, 22) Source(57, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor) --- >>> return NonExportedClassQ; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1601,8 +1602,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(85, 21) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -2 >Emitted(85, 45) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +1->Emitted(86, 21) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -1624,10 +1625,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(86, 17) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -2 >Emitted(86, 18) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) -3 >Emitted(86, 18) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -4 >Emitted(86, 22) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +1 >Emitted(87, 17) Source(58, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +2 >Emitted(87, 18) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ) +3 >Emitted(87, 18) Source(48, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +4 >Emitted(87, 22) Source(58, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) --- >>> })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); 1->^^^^^^^^^^^^ @@ -1705,15 +1706,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(87, 13) Source(59, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -2 >Emitted(87, 14) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) -3 >Emitted(87, 16) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(87, 29) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -5 >Emitted(87, 32) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -6 >Emitted(87, 56) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -7 >Emitted(87, 61) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) -8 >Emitted(87, 85) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) -9 >Emitted(87, 93) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1->Emitted(88, 13) Source(59, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +2 >Emitted(88, 14) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1) +3 >Emitted(88, 16) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) +4 >Emitted(88, 29) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) +5 >Emitted(88, 32) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) +6 >Emitted(88, 56) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) +7 >Emitted(88, 61) Source(3, 23) + SourceIndex(0) name (TopLevelModule1.SubModule1) +8 >Emitted(88, 85) Source(3, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1) +9 >Emitted(88, 93) Source(59, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> // Should have no effect on S1.SS1.ClassA above because it is not exported 1 >^^^^^^^^^^^^ @@ -1722,29 +1723,29 @@ sourceFile:typeResolution.ts > > 2 > // Should have no effect on S1.SS1.ClassA above because it is not exported -1 >Emitted(88, 13) Source(61, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(89, 13) Source(61, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +2 >Emitted(89, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(89, 13) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(90, 13) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class ClassA { > -1->Emitted(90, 17) Source(63, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +1->Emitted(91, 17) Source(63, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) --- >>> function AA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(91, 21) Source(64, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) +1->Emitted(92, 21) Source(64, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) --- >>> var a2; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1757,10 +1758,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1->Emitted(92, 25) Source(65, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(92, 29) Source(65, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(92, 31) Source(65, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(92, 32) Source(65, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(93, 25) Source(65, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(93, 29) Source(65, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(93, 31) Source(65, 49) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(93, 32) Source(65, 50) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1775,12 +1776,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(93, 25) Source(65, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(93, 27) Source(65, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(93, 28) Source(65, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(93, 38) Source(65, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(93, 40) Source(65, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(93, 41) Source(65, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(94, 25) Source(65, 51) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(94, 27) Source(65, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(94, 28) Source(65, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(94, 38) Source(65, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +5 >Emitted(94, 40) Source(65, 66) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +6 >Emitted(94, 41) Source(65, 67) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1793,10 +1794,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(94, 25) Source(66, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(94, 29) Source(66, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(94, 31) Source(66, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(94, 32) Source(66, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(95, 25) Source(66, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(95, 29) Source(66, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(95, 31) Source(66, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(95, 32) Source(66, 61) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1811,12 +1812,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(95, 25) Source(66, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(95, 27) Source(66, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(95, 28) Source(66, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(95, 38) Source(66, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(95, 40) Source(66, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(95, 41) Source(66, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(96, 25) Source(66, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(96, 27) Source(66, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(96, 28) Source(66, 65) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(96, 38) Source(66, 75) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +5 >Emitted(96, 40) Source(66, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +6 >Emitted(96, 41) Source(66, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1829,10 +1830,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(96, 25) Source(67, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(96, 29) Source(67, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(96, 31) Source(67, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(96, 32) Source(67, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(97, 25) Source(67, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(97, 29) Source(67, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(97, 31) Source(67, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(97, 32) Source(67, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1848,12 +1849,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(97, 25) Source(67, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(97, 27) Source(67, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(97, 28) Source(67, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(97, 38) Source(67, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(97, 40) Source(67, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(97, 41) Source(67, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(98, 25) Source(67, 78) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(98, 27) Source(67, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(98, 28) Source(67, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(98, 38) Source(67, 91) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +5 >Emitted(98, 40) Source(67, 93) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +6 >Emitted(98, 41) Source(67, 94) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1862,8 +1863,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(98, 25) Source(69, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(98, 47) Source(69, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(99, 25) Source(69, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(99, 47) Source(69, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1876,10 +1877,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(99, 25) Source(70, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(99, 29) Source(70, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(99, 31) Source(70, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(99, 32) Source(70, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(100, 25) Source(70, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(100, 29) Source(70, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(100, 31) Source(70, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(100, 32) Source(70, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1894,12 +1895,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(100, 25) Source(70, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(100, 27) Source(70, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -3 >Emitted(100, 28) Source(70, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -4 >Emitted(100, 38) Source(70, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -5 >Emitted(100, 40) Source(70, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -6 >Emitted(100, 41) Source(70, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1->Emitted(101, 25) Source(70, 55) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(101, 27) Source(70, 57) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +3 >Emitted(101, 28) Source(70, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +4 >Emitted(101, 38) Source(70, 68) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +5 >Emitted(101, 40) Source(70, 70) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +6 >Emitted(101, 41) Source(70, 71) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1907,8 +1908,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(101, 21) Source(71, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) -2 >Emitted(101, 22) Source(71, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +1 >Emitted(102, 21) Source(71, 17) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) +2 >Emitted(102, 22) Source(71, 18) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -1917,8 +1918,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(102, 17) Source(72, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) -2 >Emitted(102, 18) Source(72, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) +1 >Emitted(103, 17) Source(72, 13) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) +2 >Emitted(103, 18) Source(72, 14) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ @@ -1926,8 +1927,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(103, 17) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -2 >Emitted(103, 30) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +1->Emitted(104, 17) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -1950,10 +1951,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(104, 13) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -2 >Emitted(104, 14) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) -3 >Emitted(104, 14) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) -4 >Emitted(104, 18) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) +1 >Emitted(105, 13) Source(73, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +2 >Emitted(105, 14) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA) +3 >Emitted(105, 14) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1) +4 >Emitted(105, 18) Source(73, 10) + SourceIndex(0) name (TopLevelModule1.SubModule1) --- >>> })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); 1->^^^^^^^^ @@ -2047,15 +2048,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(105, 9) Source(74, 5) + SourceIndex(0) name (TopLevelModule1.SubModule1) -2 >Emitted(105, 10) Source(74, 6) + SourceIndex(0) name (TopLevelModule1.SubModule1) -3 >Emitted(105, 12) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(105, 22) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(105, 25) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(105, 51) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(105, 56) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) -8 >Emitted(105, 82) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) -9 >Emitted(105, 90) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(106, 9) Source(74, 5) + SourceIndex(0) name (TopLevelModule1.SubModule1) +2 >Emitted(106, 10) Source(74, 6) + SourceIndex(0) name (TopLevelModule1.SubModule1) +3 >Emitted(106, 12) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(106, 22) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(106, 25) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) +6 >Emitted(106, 51) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) +7 >Emitted(106, 56) Source(2, 19) + SourceIndex(0) name (TopLevelModule1) +8 >Emitted(106, 82) Source(2, 29) + SourceIndex(0) name (TopLevelModule1) +9 >Emitted(106, 90) Source(74, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> var SubModule2; 1 >^^^^^^^^ @@ -2080,10 +2081,10 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(106, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(106, 13) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(106, 23) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(106, 24) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(107, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(107, 13) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(107, 23) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(107, 24) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> (function (SubModule2) { 1->^^^^^^^^ @@ -2096,11 +2097,11 @@ sourceFile:typeResolution.ts 3 > SubModule2 4 > 5 > { -1->Emitted(107, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(107, 20) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(107, 30) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(107, 32) Source(76, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(107, 33) Source(76, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(108, 9) Source(76, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(108, 20) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(108, 30) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(108, 32) Source(76, 30) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(108, 33) Source(76, 31) + SourceIndex(0) name (TopLevelModule1) --- >>> var SubSubModule2; 1 >^^^^^^^^^^^^ @@ -2120,10 +2121,10 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1 >Emitted(108, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(108, 17) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(108, 30) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(108, 31) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1 >Emitted(109, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) +2 >Emitted(109, 17) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +3 >Emitted(109, 30) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +4 >Emitted(109, 31) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) --- >>> (function (SubSubModule2) { 1->^^^^^^^^^^^^ @@ -2137,11 +2138,11 @@ sourceFile:typeResolution.ts 3 > SubSubModule2 4 > 5 > { -1->Emitted(109, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(109, 24) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(109, 37) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(109, 39) Source(77, 37) + SourceIndex(0) name (TopLevelModule1.SubModule2) -5 >Emitted(109, 40) Source(77, 38) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1->Emitted(110, 13) Source(77, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2) +2 >Emitted(110, 24) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +3 >Emitted(110, 37) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +4 >Emitted(110, 39) Source(77, 37) + SourceIndex(0) name (TopLevelModule1.SubModule2) +5 >Emitted(110, 40) Source(77, 38) + SourceIndex(0) name (TopLevelModule1.SubModule2) --- >>> // No code here since these are the mirror of the above calls 1->^^^^^^^^^^^^^^^^ @@ -2149,21 +2150,21 @@ sourceFile:typeResolution.ts 1-> > 2 > // No code here since these are the mirror of the above calls -1->Emitted(110, 17) Source(78, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(111, 17) Source(78, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(111, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(111, 17) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(112, 17) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(112, 21) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1->Emitted(113, 21) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2171,8 +2172,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassA { public AisIn1_2_2() { } 2 > } -1->Emitted(113, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) -2 >Emitted(113, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) +1->Emitted(114, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) +2 >Emitted(114, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor) --- >>> ClassA.prototype.AisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2185,19 +2186,19 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1_2_2() { 5 > } -1->Emitted(114, 21) Source(79, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(114, 48) Source(79, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(114, 51) Source(79, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -4 >Emitted(114, 65) Source(79, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) -5 >Emitted(114, 66) Source(79, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) +1->Emitted(115, 21) Source(79, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +2 >Emitted(115, 48) Source(79, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +3 >Emitted(115, 51) Source(79, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +4 >Emitted(115, 65) Source(79, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) +5 >Emitted(115, 66) Source(79, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA.AisIn1_2_2) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(115, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(115, 34) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2209,10 +2210,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { public AisIn1_2_2() { } } -1 >Emitted(116, 17) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -2 >Emitted(116, 18) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) -3 >Emitted(116, 18) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(116, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(117, 17) Source(79, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +2 >Emitted(117, 18) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassA) +3 >Emitted(117, 18) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(117, 22) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -2223,23 +2224,23 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { public AisIn1_2_2() { } } 4 > -1->Emitted(117, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(117, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(117, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(117, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(118, 17) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(118, 37) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(118, 46) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(118, 47) Source(79, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(118, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(119, 17) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(119, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1->Emitted(120, 21) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2247,8 +2248,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassB { public BisIn1_2_2() { } 2 > } -1->Emitted(120, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) -2 >Emitted(120, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +1->Emitted(121, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) +2 >Emitted(121, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor) --- >>> ClassB.prototype.BisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2261,19 +2262,19 @@ sourceFile:typeResolution.ts 3 > 4 > public BisIn1_2_2() { 5 > } -1->Emitted(121, 21) Source(80, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(121, 48) Source(80, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(121, 51) Source(80, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -4 >Emitted(121, 65) Source(80, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) -5 >Emitted(121, 66) Source(80, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) +1->Emitted(122, 21) Source(80, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(122, 48) Source(80, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +3 >Emitted(122, 51) Source(80, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +4 >Emitted(122, 65) Source(80, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) +5 >Emitted(122, 66) Source(80, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB.BisIn1_2_2) --- >>> return ClassB; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(122, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(122, 34) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2285,10 +2286,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassB { public BisIn1_2_2() { } } -1 >Emitted(123, 17) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -2 >Emitted(123, 18) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) -3 >Emitted(123, 18) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(123, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(124, 17) Source(80, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +2 >Emitted(124, 18) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassB) +3 >Emitted(124, 18) Source(80, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(124, 22) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -2299,23 +2300,23 @@ sourceFile:typeResolution.ts 2 > ClassB 3 > { public BisIn1_2_2() { } } 4 > -1->Emitted(124, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(124, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(124, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(124, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(125, 17) Source(80, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(125, 37) Source(80, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(125, 46) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(125, 47) Source(80, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> var ClassC = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(125, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(126, 17) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> function ClassC() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(126, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1->Emitted(127, 21) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2323,8 +2324,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassC { public CisIn1_2_2() { } 2 > } -1->Emitted(127, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) -2 >Emitted(127, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +1->Emitted(128, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) +2 >Emitted(128, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor) --- >>> ClassC.prototype.CisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2337,19 +2338,19 @@ sourceFile:typeResolution.ts 3 > 4 > public CisIn1_2_2() { 5 > } -1->Emitted(128, 21) Source(81, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(128, 48) Source(81, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(128, 51) Source(81, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -4 >Emitted(128, 65) Source(81, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) -5 >Emitted(128, 66) Source(81, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) +1->Emitted(129, 21) Source(81, 42) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(129, 48) Source(81, 52) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +3 >Emitted(129, 51) Source(81, 35) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +4 >Emitted(129, 65) Source(81, 57) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) +5 >Emitted(129, 66) Source(81, 58) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC.CisIn1_2_2) --- >>> return ClassC; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(129, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(129, 34) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) --- >>> })(); 1 >^^^^^^^^^^^^^^^^ @@ -2361,10 +2362,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassC { public CisIn1_2_2() { } } -1 >Emitted(130, 17) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -2 >Emitted(130, 18) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) -3 >Emitted(130, 18) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(130, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1 >Emitted(131, 17) Source(81, 59) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +2 >Emitted(131, 18) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2.ClassC) +3 >Emitted(131, 18) Source(81, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(131, 22) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> SubSubModule2.ClassC = ClassC; 1->^^^^^^^^^^^^^^^^ @@ -2376,10 +2377,10 @@ sourceFile:typeResolution.ts 2 > ClassC 3 > { public CisIn1_2_2() { } } 4 > -1->Emitted(131, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(131, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(131, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -4 >Emitted(131, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +1->Emitted(132, 17) Source(81, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(132, 37) Source(81, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(132, 46) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +4 >Emitted(132, 47) Source(81, 60) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) --- >>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); 1->^^^^^^^^^^^^ @@ -2410,15 +2411,15 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1->Emitted(132, 13) Source(84, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -2 >Emitted(132, 14) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) -3 >Emitted(132, 16) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -4 >Emitted(132, 29) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -5 >Emitted(132, 32) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -6 >Emitted(132, 56) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -7 >Emitted(132, 61) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) -8 >Emitted(132, 85) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) -9 >Emitted(132, 93) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) +1->Emitted(133, 13) Source(84, 9) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +2 >Emitted(133, 14) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2) +3 >Emitted(133, 16) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +4 >Emitted(133, 29) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +5 >Emitted(133, 32) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +6 >Emitted(133, 56) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +7 >Emitted(133, 61) Source(77, 23) + SourceIndex(0) name (TopLevelModule1.SubModule2) +8 >Emitted(133, 85) Source(77, 36) + SourceIndex(0) name (TopLevelModule1.SubModule2) +9 >Emitted(133, 93) Source(84, 10) + SourceIndex(0) name (TopLevelModule1.SubModule2) --- >>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); 1 >^^^^^^^^ @@ -2453,15 +2454,15 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(133, 9) Source(87, 5) + SourceIndex(0) name (TopLevelModule1.SubModule2) -2 >Emitted(133, 10) Source(87, 6) + SourceIndex(0) name (TopLevelModule1.SubModule2) -3 >Emitted(133, 12) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(133, 22) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(133, 25) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(133, 51) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(133, 56) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) -8 >Emitted(133, 82) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) -9 >Emitted(133, 90) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(134, 9) Source(87, 5) + SourceIndex(0) name (TopLevelModule1.SubModule2) +2 >Emitted(134, 10) Source(87, 6) + SourceIndex(0) name (TopLevelModule1.SubModule2) +3 >Emitted(134, 12) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(134, 22) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(134, 25) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +6 >Emitted(134, 51) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +7 >Emitted(134, 56) Source(76, 19) + SourceIndex(0) name (TopLevelModule1) +8 >Emitted(134, 82) Source(76, 29) + SourceIndex(0) name (TopLevelModule1) +9 >Emitted(134, 90) Source(87, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> var ClassA = (function () { 1 >^^^^^^^^ @@ -2469,13 +2470,13 @@ sourceFile:typeResolution.ts 1 > > > -1 >Emitted(134, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(135, 9) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) --- >>> function ClassA() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(135, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +1->Emitted(136, 13) Source(89, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) --- >>> } 1->^^^^^^^^^^^^ @@ -2485,8 +2486,8 @@ sourceFile:typeResolution.ts > public AisIn1() { } > 2 > } -1->Emitted(136, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) -2 >Emitted(136, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +1->Emitted(137, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) +2 >Emitted(137, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA.constructor) --- >>> ClassA.prototype.AisIn1 = function () { }; 1->^^^^^^^^^^^^ @@ -2499,11 +2500,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1() { 5 > } -1->Emitted(137, 13) Source(90, 16) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(137, 36) Source(90, 22) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(137, 39) Source(90, 9) + SourceIndex(0) name (TopLevelModule1.ClassA) -4 >Emitted(137, 53) Source(90, 27) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) -5 >Emitted(137, 54) Source(90, 28) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) +1->Emitted(138, 13) Source(90, 16) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(138, 36) Source(90, 22) + SourceIndex(0) name (TopLevelModule1.ClassA) +3 >Emitted(138, 39) Source(90, 9) + SourceIndex(0) name (TopLevelModule1.ClassA) +4 >Emitted(138, 53) Source(90, 27) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) +5 >Emitted(138, 54) Source(90, 28) + SourceIndex(0) name (TopLevelModule1.ClassA.AisIn1) --- >>> return ClassA; 1 >^^^^^^^^^^^^ @@ -2511,8 +2512,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(138, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(138, 26) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) +1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) --- >>> })(); 1 >^^^^^^^^ @@ -2526,10 +2527,10 @@ sourceFile:typeResolution.ts 4 > class ClassA { > public AisIn1() { } > } -1 >Emitted(139, 9) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) -2 >Emitted(139, 10) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) -3 >Emitted(139, 10) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(139, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1) +1 >Emitted(140, 9) Source(91, 5) + SourceIndex(0) name (TopLevelModule1.ClassA) +2 >Emitted(140, 10) Source(91, 6) + SourceIndex(0) name (TopLevelModule1.ClassA) +3 >Emitted(140, 10) Source(89, 5) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(140, 14) Source(91, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> var NotExportedModule; 1->^^^^^^^^ @@ -2549,10 +2550,10 @@ sourceFile:typeResolution.ts 4 > { > export class ClassA { } > } -1->Emitted(140, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(140, 13) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(140, 30) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(140, 31) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(141, 13) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(141, 30) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(141, 31) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> (function (NotExportedModule) { 1->^^^^^^^^ @@ -2566,24 +2567,24 @@ sourceFile:typeResolution.ts 3 > NotExportedModule 4 > 5 > { -1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(141, 20) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(141, 37) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(141, 39) Source(97, 30) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(141, 40) Source(97, 31) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(142, 9) Source(97, 5) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(142, 20) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(142, 37) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(142, 39) Source(97, 30) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(142, 40) Source(97, 31) + SourceIndex(0) name (TopLevelModule1) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(142, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(143, 13) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(143, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(144, 17) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2591,16 +2592,16 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^-> 1->export class ClassA { 2 > } -1->Emitted(144, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) -2 >Emitted(144, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) +2 >Emitted(145, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA.constructor) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(145, 30) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +1->Emitted(146, 17) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2612,10 +2613,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { } -1 >Emitted(146, 13) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -2 >Emitted(146, 14) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) -3 >Emitted(146, 14) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(146, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1 >Emitted(147, 13) Source(98, 31) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +2 >Emitted(147, 14) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule.ClassA) +3 >Emitted(147, 14) Source(98, 9) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +4 >Emitted(147, 18) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> NotExportedModule.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2627,10 +2628,10 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { } 4 > -1->Emitted(147, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(147, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(147, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -4 >Emitted(147, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +1->Emitted(148, 13) Source(98, 22) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +2 >Emitted(148, 37) Source(98, 28) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +3 >Emitted(148, 46) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +4 >Emitted(148, 47) Source(98, 32) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) --- >>> })(NotExportedModule || (NotExportedModule = {})); 1->^^^^^^^^ @@ -2651,13 +2652,13 @@ sourceFile:typeResolution.ts 7 > { > export class ClassA { } > } -1->Emitted(148, 9) Source(99, 5) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -2 >Emitted(148, 10) Source(99, 6) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) -3 >Emitted(148, 12) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -4 >Emitted(148, 29) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -5 >Emitted(148, 34) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) -6 >Emitted(148, 51) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) -7 >Emitted(148, 59) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) +1->Emitted(149, 9) Source(99, 5) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +2 >Emitted(149, 10) Source(99, 6) + SourceIndex(0) name (TopLevelModule1.NotExportedModule) +3 >Emitted(149, 12) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +4 >Emitted(149, 29) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +5 >Emitted(149, 34) Source(97, 12) + SourceIndex(0) name (TopLevelModule1) +6 >Emitted(149, 51) Source(97, 29) + SourceIndex(0) name (TopLevelModule1) +7 >Emitted(149, 59) Source(99, 6) + SourceIndex(0) name (TopLevelModule1) --- >>> })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); 1->^^^^ @@ -2778,15 +2779,15 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -1->Emitted(149, 5) Source(100, 1) + SourceIndex(0) name (TopLevelModule1) -2 >Emitted(149, 6) Source(100, 2) + SourceIndex(0) name (TopLevelModule1) -3 >Emitted(149, 8) Source(1, 15) + SourceIndex(0) -4 >Emitted(149, 23) Source(1, 30) + SourceIndex(0) -5 >Emitted(149, 26) Source(1, 15) + SourceIndex(0) -6 >Emitted(149, 49) Source(1, 30) + SourceIndex(0) -7 >Emitted(149, 54) Source(1, 15) + SourceIndex(0) -8 >Emitted(149, 77) Source(1, 30) + SourceIndex(0) -9 >Emitted(149, 85) Source(100, 2) + SourceIndex(0) +1->Emitted(150, 5) Source(100, 1) + SourceIndex(0) name (TopLevelModule1) +2 >Emitted(150, 6) Source(100, 2) + SourceIndex(0) name (TopLevelModule1) +3 >Emitted(150, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(150, 23) Source(1, 30) + SourceIndex(0) +5 >Emitted(150, 26) Source(1, 15) + SourceIndex(0) +6 >Emitted(150, 49) Source(1, 30) + SourceIndex(0) +7 >Emitted(150, 54) Source(1, 15) + SourceIndex(0) +8 >Emitted(150, 77) Source(1, 30) + SourceIndex(0) +9 >Emitted(150, 85) Source(100, 2) + SourceIndex(0) --- >>> var TopLevelModule2; 1 >^^^^ @@ -2806,10 +2807,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(150, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(150, 9) Source(102, 8) + SourceIndex(0) -3 >Emitted(150, 24) Source(102, 23) + SourceIndex(0) -4 >Emitted(150, 25) Source(108, 2) + SourceIndex(0) +1 >Emitted(151, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(151, 9) Source(102, 8) + SourceIndex(0) +3 >Emitted(151, 24) Source(102, 23) + SourceIndex(0) +4 >Emitted(151, 25) Source(108, 2) + SourceIndex(0) --- >>> (function (TopLevelModule2) { 1->^^^^ @@ -2822,11 +2823,11 @@ sourceFile:typeResolution.ts 3 > TopLevelModule2 4 > 5 > { -1->Emitted(151, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(151, 16) Source(102, 8) + SourceIndex(0) -3 >Emitted(151, 31) Source(102, 23) + SourceIndex(0) -4 >Emitted(151, 33) Source(102, 24) + SourceIndex(0) -5 >Emitted(151, 34) Source(102, 25) + SourceIndex(0) +1->Emitted(152, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(152, 16) Source(102, 8) + SourceIndex(0) +3 >Emitted(152, 31) Source(102, 23) + SourceIndex(0) +4 >Emitted(152, 33) Source(102, 24) + SourceIndex(0) +5 >Emitted(152, 34) Source(102, 25) + SourceIndex(0) --- >>> var SubModule3; 1 >^^^^^^^^ @@ -2843,10 +2844,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1 >Emitted(152, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(152, 13) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(152, 23) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(152, 24) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1 >Emitted(153, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(153, 13) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(153, 23) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(153, 24) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) --- >>> (function (SubModule3) { 1->^^^^^^^^ @@ -2860,24 +2861,24 @@ sourceFile:typeResolution.ts 3 > SubModule3 4 > 5 > { -1->Emitted(153, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(153, 20) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(153, 30) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(153, 32) Source(103, 30) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(153, 33) Source(103, 31) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(154, 9) Source(103, 5) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(154, 20) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(154, 30) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(154, 32) Source(103, 30) + SourceIndex(0) name (TopLevelModule2) +5 >Emitted(154, 33) Source(103, 31) + SourceIndex(0) name (TopLevelModule2) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > -1->Emitted(154, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(155, 13) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(155, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1->Emitted(156, 17) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2887,8 +2888,8 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > 2 > } -1->Emitted(156, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) -2 >Emitted(156, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +1->Emitted(157, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) +2 >Emitted(157, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.constructor) --- >>> ClassA.prototype.AisIn2_3 = function () { }; 1->^^^^^^^^^^^^^^^^ @@ -2901,11 +2902,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn2_3() { 5 > } -1->Emitted(157, 17) Source(105, 20) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(157, 42) Source(105, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(157, 45) Source(105, 13) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -4 >Emitted(157, 59) Source(105, 33) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) -5 >Emitted(157, 60) Source(105, 34) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) +1->Emitted(158, 17) Source(105, 20) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(158, 42) Source(105, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +3 >Emitted(158, 45) Source(105, 13) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +4 >Emitted(158, 59) Source(105, 33) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) +5 >Emitted(158, 60) Source(105, 34) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA.AisIn2_3) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^ @@ -2913,8 +2914,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(158, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(158, 30) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) --- >>> })(); 1 >^^^^^^^^^^^^ @@ -2928,10 +2929,10 @@ sourceFile:typeResolution.ts 4 > export class ClassA { > public AisIn2_3() { } > } -1 >Emitted(159, 13) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -2 >Emitted(159, 14) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) -3 >Emitted(159, 14) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(159, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1 >Emitted(160, 13) Source(106, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +2 >Emitted(160, 14) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3.ClassA) +3 >Emitted(160, 14) Source(104, 9) + SourceIndex(0) name (TopLevelModule2.SubModule3) +4 >Emitted(160, 18) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> SubModule3.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2945,10 +2946,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } 4 > -1->Emitted(160, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(160, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(160, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) -4 >Emitted(160, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +1->Emitted(161, 13) Source(104, 22) + SourceIndex(0) name (TopLevelModule2.SubModule3) +2 >Emitted(161, 30) Source(104, 28) + SourceIndex(0) name (TopLevelModule2.SubModule3) +3 >Emitted(161, 39) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) +4 >Emitted(161, 40) Source(106, 10) + SourceIndex(0) name (TopLevelModule2.SubModule3) --- >>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); 1->^^^^^^^^ @@ -2974,15 +2975,15 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1->Emitted(161, 9) Source(107, 5) + SourceIndex(0) name (TopLevelModule2.SubModule3) -2 >Emitted(161, 10) Source(107, 6) + SourceIndex(0) name (TopLevelModule2.SubModule3) -3 >Emitted(161, 12) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -4 >Emitted(161, 22) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -5 >Emitted(161, 25) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -6 >Emitted(161, 51) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -7 >Emitted(161, 56) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) -8 >Emitted(161, 82) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) -9 >Emitted(161, 90) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) +1->Emitted(162, 9) Source(107, 5) + SourceIndex(0) name (TopLevelModule2.SubModule3) +2 >Emitted(162, 10) Source(107, 6) + SourceIndex(0) name (TopLevelModule2.SubModule3) +3 >Emitted(162, 12) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +4 >Emitted(162, 22) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +5 >Emitted(162, 25) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +6 >Emitted(162, 51) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +7 >Emitted(162, 56) Source(103, 19) + SourceIndex(0) name (TopLevelModule2) +8 >Emitted(162, 82) Source(103, 29) + SourceIndex(0) name (TopLevelModule2) +9 >Emitted(162, 90) Source(107, 6) + SourceIndex(0) name (TopLevelModule2) --- >>> })(TopLevelModule2 || (TopLevelModule2 = {})); 1 >^^^^ @@ -3006,13 +3007,13 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(162, 5) Source(108, 1) + SourceIndex(0) name (TopLevelModule2) -2 >Emitted(162, 6) Source(108, 2) + SourceIndex(0) name (TopLevelModule2) -3 >Emitted(162, 8) Source(102, 8) + SourceIndex(0) -4 >Emitted(162, 23) Source(102, 23) + SourceIndex(0) -5 >Emitted(162, 28) Source(102, 8) + SourceIndex(0) -6 >Emitted(162, 43) Source(102, 23) + SourceIndex(0) -7 >Emitted(162, 51) Source(108, 2) + SourceIndex(0) +1 >Emitted(163, 5) Source(108, 1) + SourceIndex(0) name (TopLevelModule2) +2 >Emitted(163, 6) Source(108, 2) + SourceIndex(0) name (TopLevelModule2) +3 >Emitted(163, 8) Source(102, 8) + SourceIndex(0) +4 >Emitted(163, 23) Source(102, 23) + SourceIndex(0) +5 >Emitted(163, 28) Source(102, 8) + SourceIndex(0) +6 >Emitted(163, 43) Source(102, 23) + SourceIndex(0) +7 >Emitted(163, 51) Source(108, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index 5b24d9bc102cf..b575d4f8d4bcb 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -52,6 +52,7 @@ module foo { export var r13: typeof foo; //// [typeofANonExportedType.js] +"use strict"; var x = 1; var y = { foo: '' }; var C = (function () { diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js index 66e6d7d45eae6..258ca3fdc2ee6 100644 --- a/tests/baselines/reference/typeofAmbientExternalModules.js +++ b/tests/baselines/reference/typeofAmbientExternalModules.js @@ -19,6 +19,7 @@ var y2: typeof exp = exp; y2 = ext; //// [typeofAmbientExternalModules_0.js] +"use strict"; var C = (function () { function C() { } @@ -26,6 +27,7 @@ var C = (function () { })(); exports.C = C; //// [typeofAmbientExternalModules_1.js] +"use strict"; var D = (function () { function D() { } @@ -33,6 +35,7 @@ var D = (function () { })(); module.exports = D; //// [typeofAmbientExternalModules_2.js] +"use strict"; /// /// var ext = require('./typeofAmbientExternalModules_0'); diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index 54de4f7566bdb..83c928fd40a14 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -52,6 +52,7 @@ export module foo { export var r13: typeof foo; //// [typeofAnExportedType.js] +"use strict"; exports.x = 1; exports.y = { foo: '' }; var C = (function () { diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js index 676f6f10b9fc9..95c3202ed36c5 100644 --- a/tests/baselines/reference/typeofExternalModules.js +++ b/tests/baselines/reference/typeofExternalModules.js @@ -17,6 +17,7 @@ var y2: typeof exp = exp; y2 = ext; //// [typeofExternalModules_external.js] +"use strict"; var C = (function () { function C() { } @@ -24,6 +25,7 @@ var C = (function () { })(); exports.C = C; //// [typeofExternalModules_exportAssign.js] +"use strict"; var D = (function () { function D() { } @@ -31,6 +33,7 @@ var D = (function () { })(); module.exports = D; //// [typeofExternalModules_core.js] +"use strict"; var ext = require('./typeofExternalModules_external'); var exp = require('./typeofExternalModules_exportAssign'); var y1 = ext; diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js index 866478114d6d3..a90cf63bac41c 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js @@ -21,7 +21,9 @@ var y: {M2: Object} = foo0; //// [foo_0.js] +"use strict"; //// [foo_1.js] +"use strict"; var foo0 = require('./foo_0'); // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members var x = {}; diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js index f063df77308f4..e73a5350d7930 100644 --- a/tests/baselines/reference/umdDependencyComment2.js +++ b/tests/baselines/reference/umdDependencyComment2.js @@ -15,6 +15,7 @@ m1.f(); define(["require", "exports", "bar", "m2"], factory); } })(function (require, exports) { + "use strict"; var m1 = require("m2"); m1.f(); }); diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js index 763e052327269..7716ca949a3a6 100644 --- a/tests/baselines/reference/umdDependencyCommentName1.js +++ b/tests/baselines/reference/umdDependencyCommentName1.js @@ -15,6 +15,7 @@ m1.f(); define(["require", "exports", "bar", "m2"], factory); } })(function (require, exports, b) { + "use strict"; var m1 = require("m2"); m1.f(); }); diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js index f749e4cc22d85..4650a8408e1f1 100644 --- a/tests/baselines/reference/umdDependencyCommentName2.js +++ b/tests/baselines/reference/umdDependencyCommentName2.js @@ -19,6 +19,7 @@ m1.f(); define(["require", "exports", "bar", "goo", "foo", "m2"], factory); } })(function (require, exports, b, c) { + "use strict"; var m1 = require("m2"); m1.f(); }); diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js index a683f8d987d99..53b63e59b594a 100644 --- a/tests/baselines/reference/unclosedExportClause01.js +++ b/tests/baselines/reference/unclosedExportClause01.js @@ -17,14 +17,19 @@ export { x as a from "./t1" export { x as a, from "./t1" //// [t1.js] +"use strict"; exports.x = "x"; //// [t2.js] +"use strict"; var t1_1 = require("./t1"); exports.x = t1_1.x; //// [t3.js] +"use strict"; //// [t4.js] +"use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; //// [t5.js] +"use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js index 964cc29899c7d..188c8e9d18e7b 100644 --- a/tests/baselines/reference/unclosedExportClause02.js +++ b/tests/baselines/reference/unclosedExportClause02.js @@ -21,12 +21,17 @@ export { x as a, from "./t1"; //// [t1.js] +"use strict"; exports.x = "x"; //// [t2.js] +"use strict"; "./t1"; //// [t3.js] +"use strict"; "./t1"; //// [t4.js] +"use strict"; "./t1"; //// [t5.js] +"use strict"; "./t1"; diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js index 0764840cadfed..b768b0d91140c 100644 --- a/tests/baselines/reference/undeclaredModuleError.js +++ b/tests/baselines/reference/undeclaredModuleError.js @@ -17,6 +17,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat //// [undeclaredModuleError.js] define(["require", "exports", 'fs'], function (require, exports, fs) { + "use strict"; function readdir(path, accept, callback) { } function join() { var paths = []; diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js index 04e897c081a3e..7ed19f775f677 100644 --- a/tests/baselines/reference/unusedImportDeclaration.js +++ b/tests/baselines/reference/unusedImportDeclaration.js @@ -16,6 +16,7 @@ foo("IN " + thingy.me + "!"); //// [unusedImportDeclaration_testerB.js] +"use strict"; var TesterB = (function () { function TesterB() { } @@ -23,6 +24,7 @@ var TesterB = (function () { })(); module.exports = TesterB; //// [unusedImportDeclaration_testerA.js] +"use strict"; var thingy = { me: "A" }; diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js index c3daf0c1004eb..eb9571c97f5ed 100644 --- a/tests/baselines/reference/varArgsOnConstructorTypes.js +++ b/tests/baselines/reference/varArgsOnConstructorTypes.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || function (d, b) { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A(ctor) { } diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js index 660a4017a7fae..c80d65158dcf2 100644 --- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js +++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js @@ -26,9 +26,12 @@ function run(configuration: commands.IConfiguration) { } //// [visibilityOfCrossModuleTypeUsage_server.js] +"use strict"; //// [visibilityOfCrossModuleTypeUsage_commands.js] //visibilityOfCrossModuleTypeUsage +"use strict"; //// [visibilityOfCrossModuleTypeUsage_fs.js] +"use strict"; function run(configuration) { var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server); } diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js index 2cb006737b28c..170a8ef5d3778 100644 --- a/tests/baselines/reference/visibilityOfTypeParameters.js +++ b/tests/baselines/reference/visibilityOfTypeParameters.js @@ -7,6 +7,7 @@ export class MyClass { } //// [visibilityOfTypeParameters.js] +"use strict"; var MyClass = (function () { function MyClass() { } diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js index 0ab15304493c3..7a31dcb97d0f3 100644 --- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js +++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js @@ -14,9 +14,11 @@ function main() { //// [voidAsNonAmbiguousReturnType_0.js] +"use strict"; function mkdirSync(path, mode) { } exports.mkdirSync = mkdirSync; //// [voidAsNonAmbiguousReturnType_1.js] +"use strict"; /// var fs = require("./voidAsNonAmbiguousReturnType_0"); function main() { diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 085458717ec35..efb5454c261a2 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -60,6 +60,7 @@ export var eVar3 = 10, eVar4, eVar5; //// [withExportDecl.js] define(["require", "exports"], function (require, exports) { + "use strict"; var simpleVar; var anotherVar; var varWithSimpleType; diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index 2f2abb0bcb0ae..275d5fcadcc21 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -45,6 +45,7 @@ b.foo; //// [withImportDecl_0.js] define(["require", "exports"], function (require, exports) { + "use strict"; var A = (function () { function A() { } @@ -54,6 +55,7 @@ define(["require", "exports"], function (require, exports) { }); //// [withImportDecl_1.js] define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) { + "use strict"; /// var simpleVar; var anotherVar; From 044ff46ed80afe08791fe1fa9acd7066415656b4 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 15:16:10 -0800 Subject: [PATCH 313/353] fix transpile unit tests --- tests/cases/unittests/transpile.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index 1d688f091a467..4781182224bae 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -120,7 +120,7 @@ var x = 0;`, test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.AMD } }, - expectedOutput: `define(["require", "exports"], function (require, exports) {\r\n var x = 0;\r\n});\r\n` + expectedOutput: `define(["require", "exports"], function (require, exports) {\r\n "use strict";\r\n var x = 0;\r\n});\r\n` }); }); @@ -128,13 +128,13 @@ var x = 0;`, test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS, newLine: NewLineKind.LineFeed } }, - expectedOutput: `var x = 0;\n` + expectedOutput: `"use strict";\nvar x = 0;\n` }); }); it("Sets module name", () => { let output = - `System.register("NamedModule", [], function(exports_1) {\n var x;\n` + + `System.register("NamedModule", [], function(exports_1) {\n "use strict";\n var x;\n` + ` return {\n` + ` setters:[],\n` + ` execute: function() {\n` + @@ -150,7 +150,7 @@ var x = 0;`, }); it("No extra errors for file without extension", () => { - test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS }, fileName: "file" } }); + test(`"use strict";\r\nvar x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS }, fileName: "file" } }); }); it("Rename dependencies - System", () => { @@ -160,6 +160,7 @@ var x = 0;`, `use(foo);` let output = `System.register(["SomeOtherName"], function(exports_1) {\n` + + ` "use strict";\n` + ` var SomeName_1;\n` + ` return {\n` + ` setters:[\n` + @@ -186,6 +187,7 @@ var x = 0;`, `use(foo);` let output = `define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {\n` + + ` "use strict";\n` + ` use(SomeName_1.foo);\n` + `});\n`; @@ -210,6 +212,7 @@ var x = 0;`, ` define(["require", "exports", "SomeOtherName"], factory);\n` + ` }\n` + `})(function (require, exports) {\n` + + ` "use strict";\n` + ` var SomeName_1 = require("SomeOtherName");\n` + ` use(SomeName_1.foo);\n` + `});\n`; @@ -237,6 +240,7 @@ var x = 0;`, `}\n` + `export {MyClass}; \n` let output = + `"use strict";\n` + `var db_1 = require(\'./db\');\n` + `function someDecorator(target) {\n` + ` return target;\n` + @@ -272,12 +276,12 @@ var x = 0;`, }); it("Supports backslashes in file name", () => { - test("var x", { expectedOutput: "var x;\r\n", options: { fileName: "a\\b.ts" }}); + test("var x", { expectedOutput: `"use strict";\r\nvar x;\r\n`, options: { fileName: "a\\b.ts" }}); }); it("transpile file as 'tsx' if 'jsx' is specified", () => { let input = `var x =
`; - let output = `var x = React.createElement("div", null);\n`; + let output = `"use strict";\nvar x = React.createElement("div", null);\n`; test(input, { expectedOutput: output, options: { compilerOptions: { jsx: JsxEmit.React, newLine: NewLineKind.LineFeed } } From f2a1beda8fcc8e60fd90fd4fd7a191c94596cbb7 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 15:18:19 -0800 Subject: [PATCH 314/353] accept new projects baselines --- .../reference/project/baseline/amd/emit.js | 4 ++ .../reference/project/baseline/node/emit.js | 3 ++ .../project/baseline2/amd/dont_emit.js | 4 ++ .../project/baseline2/node/dont_emit.js | 2 + .../declarationsCascadingImports/amd/m4.d.ts | 4 ++ .../declarationsCascadingImports/node/m4.d.ts | 4 ++ .../declarationsGlobalImport/amd/glo_m4.d.ts | 4 ++ .../declarationsGlobalImport/node/glo_m4.d.ts | 4 ++ .../amd/private_m4.d.ts | 4 ++ .../node/private_m4.d.ts | 4 ++ .../amd/fncOnly_m4.d.ts | 4 ++ .../node/fncOnly_m4.d.ts | 4 ++ .../amd/m5.js | 7 +++ .../node/m5.js | 6 +++ .../amd/m4.d.ts | 4 ++ .../node/m4.d.ts | 4 ++ .../amd/m4.d.ts | 4 ++ .../node/m4.d.ts | 4 ++ .../declarationsSimpleImport/amd/m4.d.ts | 4 ++ .../declarationsSimpleImport/node/m4.d.ts | 4 ++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../maprootUrlModuleSimpleNoOutdir/amd/m1.js | 16 +++++++ .../maprootUrlModuleSimpleNoOutdir/node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../project/nonRelative/amd/lib/foo/b.js | 5 ++ .../project/nonRelative/node/lib/foo/b.js | 3 ++ .../outMixedSubfolderNoOutdir/amd/ref/m2.d.ts | 6 +++ .../node/ref/m2.d.ts | 6 +++ .../amd/outdir/simple/ref/m2.d.ts | 6 +++ .../node/outdir/simple/ref/m2.d.ts | 6 +++ .../amd/bin/test.d.ts | 20 ++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 ++++++++ .../amd/ref/m1.d.ts | 6 +++ .../node/ref/m1.d.ts | 6 +++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 +++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 +++ .../amd/bin/test.d.ts | 28 +++++++++++ .../outModuleSimpleNoOutdir/amd/m1.d.ts | 6 +++ .../outModuleSimpleNoOutdir/node/m1.d.ts | 6 +++ .../amd/outdir/simple/m1.d.ts | 6 +++ .../node/outdir/simple/m1.d.ts | 6 +++ .../amd/bin/test.d.ts | 18 +++++++ .../amd/ref/m1.d.ts | 6 +++ .../node/ref/m1.d.ts | 6 +++ .../amd/outdir/simple/ref/m1.d.ts | 6 +++ .../node/outdir/simple/ref/m1.d.ts | 6 +++ .../amd/bin/test.d.ts | 18 +++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../sourcemapModuleSimpleNoOutdir/amd/m1.js | 16 +++++++ .../sourcemapModuleSimpleNoOutdir/node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m2.js | 16 +++++++ .../node/ref/m2.js | 14 ++++++ .../amd/outdir/simple/ref/m2.js | 16 +++++++ .../node/outdir/simple/ref/m2.js | 14 ++++++ .../amd/bin/test.js | 38 +++++++++++++++ .../amd/bin/outAndOutDirFile.js | 38 +++++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../outputdir_module_multifolder/ref/m1.js | 16 +++++++ .../outputdir_module_multifolder/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 48 +++++++++++++++++++ .../amd/m1.js | 16 +++++++ .../node/m1.js | 14 ++++++ .../amd/outdir/simple/m1.js | 16 +++++++ .../node/outdir/simple/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/ref/m1.js | 16 +++++++ .../node/ref/m1.js | 14 ++++++ .../amd/outdir/simple/ref/m1.js | 16 +++++++ .../node/outdir/simple/ref/m1.js | 14 ++++++ .../amd/bin/test.js | 32 +++++++++++++ .../amd/server.js | 3 ++ .../node/server.js | 1 + 213 files changed, 3718 insertions(+) create mode 100644 tests/baselines/reference/project/baseline/amd/emit.js create mode 100644 tests/baselines/reference/project/baseline/node/emit.js create mode 100644 tests/baselines/reference/project/baseline2/amd/dont_emit.js create mode 100644 tests/baselines/reference/project/baseline2/node/dont_emit.js create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js create mode 100644 tests/baselines/reference/project/nonRelative/node/lib/foo/b.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js new file mode 100644 index 0000000000000..b66e5b6e6bad7 --- /dev/null +++ b/tests/baselines/reference/project/baseline/amd/emit.js @@ -0,0 +1,4 @@ +define(["require", "exports", "./decl"], function (require, exports, g) { + "use strict"; + var p = g.point(10, 20); +}); diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js new file mode 100644 index 0000000000000..b33f5d1b198bb --- /dev/null +++ b/tests/baselines/reference/project/baseline/node/emit.js @@ -0,0 +1,3 @@ +"use strict"; +var g = require("./decl"); +var p = g.point(10, 20); diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js new file mode 100644 index 0000000000000..523d596dca16a --- /dev/null +++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + var p = { x: 10, y: 20 }; +}); diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js new file mode 100644 index 0000000000000..e5a1637efb1ae --- /dev/null +++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js @@ -0,0 +1,2 @@ +"use strict"; +var p = { x: 10, y: 20 }; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js new file mode 100644 index 0000000000000..9e8ba0f7ade3e --- /dev/null +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js @@ -0,0 +1,7 @@ +define(["require", "exports", "m4"], function (require, exports, m4) { + "use strict"; + function foo2() { + return new m4.d(); + } + exports.foo2 = foo2; +}); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js new file mode 100644 index 0000000000000..a7e34c60fe39b --- /dev/null +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js @@ -0,0 +1,6 @@ +"use strict"; +var m4 = require("m4"); // Emit used +function foo2() { + return new m4.d(); +} +exports.foo2 = foo2; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts new file mode 100644 index 0000000000000..6cb9280b837dd --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.d.ts @@ -0,0 +1,4 @@ +export declare class d { +} +export declare var x: d; +export declare function foo(): d; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..fa0eb43e98e72 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..991554b2cb336 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..fa0eb43e98e72 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..991554b2cb336 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..75f7b767aeabe --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..67d1060440510 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..2285204e0bdb9 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..31565374f87a1 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..2285204e0bdb9 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..31565374f87a1 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..6b8c22a03b8d8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..684b6e489f78b --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..284d58acdad3e --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..684b6e489f78b --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..284d58acdad3e --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..3dc74b12b3d77 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..24ff184b236b5 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..277943cc80d60 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..24ff184b236b5 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..277943cc80d60 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..44b0801e558e9 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..22446a6202151 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..83c26797422c6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..8135743efbb29 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..dd1d86b133613 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=../../../../mapFiles/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..75131b5063047 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..52e051d7ba0ac --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../../mapFiles/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..0a11d7abb9c1b --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..6b59fb6f79c13 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..57f346647510a --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..69476c5b6ca0e --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..59da8e01e6c6e --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..d34c484207f52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..bf342f3a0376b --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..119c0d64430b8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..dcf1e846993f8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..a682a1f510dd9 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..8d3bff9f961e3 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..c9c1fc5a6d1a2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..769504a9af899 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..34294f368ff54 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..88f1db4f33e63 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..2f22bba7566da --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..e542958a41055 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..2f22bba7566da --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..e542958a41055 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..03d1c2fc75073 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..04fd25336f1a7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..0014eb3163c56 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..e50be801bbf7b --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..0014eb3163c56 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..e50be801bbf7b --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..2b606c4d42a07 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..b2136c5cb5ed8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..c8cf74001a865 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..b2136c5cb5ed8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..c8cf74001a865 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..b04aa2d4d46f5 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..1819603381c8d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..b594cf79eb2d6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..1819603381c8d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..b594cf79eb2d6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..37aaeb4ecdacb --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..2f22bba7566da --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..e542958a41055 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..2f22bba7566da --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..e542958a41055 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..03d1c2fc75073 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..04fd25336f1a7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..0014eb3163c56 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..e50be801bbf7b --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..0014eb3163c56 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..e50be801bbf7b --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..2b606c4d42a07 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..b2136c5cb5ed8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..c8cf74001a865 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..b2136c5cb5ed8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..c8cf74001a865 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..b04aa2d4d46f5 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..1819603381c8d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..b594cf79eb2d6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..1819603381c8d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..b594cf79eb2d6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..37aaeb4ecdacb --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js new file mode 100644 index 0000000000000..a8619f8826017 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js @@ -0,0 +1,5 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + function hello() { } + exports.hello = hello; +}); diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js new file mode 100644 index 0000000000000..182e381bcdec8 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js @@ -0,0 +1,3 @@ +"use strict"; +function hello() { } +exports.hello = hello; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..a480aa83e80bf --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..1ebe03468c72e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..bbc1d035f3632 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..cc73ea698fe63 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..93a25f7ef19cc --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..a480aa83e80bf --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..1ebe03468c72e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..bbc1d035f3632 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..cc73ea698fe63 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..93a25f7ef19cc --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..a480aa83e80bf --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..1ebe03468c72e --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..bbc1d035f3632 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..cc73ea698fe63 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..93a25f7ef19cc --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..a480aa83e80bf --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js new file mode 100644 index 0000000000000..1ebe03468c72e --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -0,0 +1,38 @@ +var m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +var m1_instance1 = new m1_c1(); +function m1_f1() { + return m1_instance1; +} +define("ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=outAndOutDirFile.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..bbc1d035f3632 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,48 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("../outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +define("test", ["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..cc73ea698fe63 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..25001d63d84ce --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js new file mode 100644 index 0000000000000..3bc070839007f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m1_a1 = 10; +var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; +})(); +exports.m1_c1 = m1_c1; +exports.m1_instance1 = new m1_c1(); +function m1_f1() { + return exports.m1_instance1; +} +exports.m1_f1 = m1_f1; +//# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js new file mode 100644 index 0000000000000..93a25f7ef19cc --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -0,0 +1,32 @@ +define("ref/m1", ["require", "exports"], function (require, exports) { + "use strict"; + exports.m1_a1 = 10; + var m1_c1 = (function () { + function m1_c1() { + } + return m1_c1; + })(); + exports.m1_c1 = m1_c1; + exports.m1_instance1 = new m1_c1(); + function m1_f1() { + return exports.m1_instance1; + } + exports.m1_f1 = m1_f1; +}); +define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js new file mode 100644 index 0000000000000..3053eb35cb488 --- /dev/null +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js @@ -0,0 +1,3 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; +}); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js new file mode 100644 index 0000000000000..0c14aab22f752 --- /dev/null +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js @@ -0,0 +1 @@ +"use strict"; From 83ec5a97cb758dc49ad1ae0c1ebb5debd02770d8 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 15:32:58 -0800 Subject: [PATCH 315/353] projects teeests --- .../amd/useModule.js | 0 .../node/useModule.js | 0 .../declarationsGlobalImport/amd/useModule.js | 6 ++++ .../node/useModule.js | 5 ++++ .../amd/useModule.js | 9 ++++++ .../node/useModule.js | 9 ++++++ .../amd/useModule.js | 4 +++ .../node/useModule.js | 3 ++ .../amd/useModule.js | 9 ++++++ .../node/useModule.js | 9 ++++++ .../amd/useModule.js | 18 ++++++++++++ .../node/useModule.js | 19 +++++++++++++ .../amd/m5.js | 7 +++++ .../node/m5.js | 6 ++++ .../declarationsSimpleImport/amd/useModule.js | 15 ++++++++++ .../node/useModule.js | 14 ++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../project/nonRelative/amd/lib/foo/a.js | 5 ++++ .../project/nonRelative/node/lib/foo/a.js | 3 ++ .../outMixedSubfolderNoOutdir/amd/test.js | 12 ++++++++ .../outMixedSubfolderNoOutdir/node/test.js | 12 ++++++++ .../amd/outdir/simple/test.js | 12 ++++++++ .../node/outdir/simple/test.js | 12 ++++++++ .../amd/diskFile0.js | 15 ++++++++++ .../node/diskFile0.js | 13 +++++++++ .../outputdir_module_multifolder_ref/m2.js | 15 ++++++++++ .../outputdir_module_multifolder_ref/m2.js | 13 +++++++++ .../outModuleSimpleNoOutdir/amd/test.js | 16 +++++++++++ .../outModuleSimpleNoOutdir/node/test.js | 15 ++++++++++ .../amd/outdir/simple/test.js | 16 +++++++++++ .../node/outdir/simple/test.js | 15 ++++++++++ .../outModuleSubfolderNoOutdir/amd/test.js | 16 +++++++++++ .../outModuleSubfolderNoOutdir/node/test.js | 15 ++++++++++ .../amd/outdir/simple/test.js | 16 +++++++++++ .../node/outdir/simple/test.js | 15 ++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../sourcemapModuleSimpleNoOutdir/amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m2.d.ts | 6 ++++ .../node/ref/m2.d.ts | 6 ++++ .../amd/outdir/simple/ref/m2.d.ts | 6 ++++ .../node/outdir/simple/ref/m2.d.ts | 6 ++++ .../amd/bin/test.d.ts | 20 +++++++++++++ .../amd/bin/outAndOutDirFile.d.ts | 20 +++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../outputdir_module_multifolder/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/m1.d.ts | 6 ++++ .../node/m1.d.ts | 6 ++++ .../amd/outdir/simple/m1.d.ts | 6 ++++ .../node/outdir/simple/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/ref/m1.d.ts | 6 ++++ .../node/ref/m1.d.ts | 6 ++++ .../amd/outdir/simple/ref/m1.d.ts | 6 ++++ .../node/outdir/simple/ref/m1.d.ts | 6 ++++ .../amd/bin/test.d.ts | 18 ++++++++++++ .../amd/commands.js | 3 ++ .../node/commands.js | 1 + 204 files changed, 1973 insertions(+) create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js create mode 100644 tests/baselines/reference/project/nonRelative/node/lib/foo/a.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js new file mode 100644 index 0000000000000..b9390ddc2391f --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js @@ -0,0 +1,6 @@ +define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) { + "use strict"; + exports.useGlo_m4_x4 = glo_m4.x; + exports.useGlo_m4_d4 = glo_m4.d; + exports.useGlo_m4_f4 = glo_m4.foo(); +}); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js new file mode 100644 index 0000000000000..d9219f2014872 --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js @@ -0,0 +1,5 @@ +"use strict"; +var glo_m4 = require("glo_m4"); +exports.useGlo_m4_x4 = glo_m4.x; +exports.useGlo_m4_d4 = glo_m4.d; +exports.useGlo_m4_f4 = glo_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js new file mode 100644 index 0000000000000..a5da0ab931427 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js @@ -0,0 +1,9 @@ +define(["require", "exports", "private_m4"], function (require, exports, private_m4) { + "use strict"; + var usePrivate_m4_m1; + (function (usePrivate_m4_m1) { + var x3 = private_m4.x; + var d3 = private_m4.d; + var f3 = private_m4.foo(); + })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); +}); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js new file mode 100644 index 0000000000000..3cc7f82feb705 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js @@ -0,0 +1,9 @@ +"use strict"; +// only used privately no need to emit +var private_m4 = require("private_m4"); +var usePrivate_m4_m1; +(function (usePrivate_m4_m1) { + var x3 = private_m4.x; + var d3 = private_m4.d; + var f3 = private_m4.foo(); +})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js new file mode 100644 index 0000000000000..7485d0fb22933 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js @@ -0,0 +1,4 @@ +define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) { + "use strict"; + exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); +}); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js new file mode 100644 index 0000000000000..095acfb7fc983 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js @@ -0,0 +1,3 @@ +"use strict"; +var fncOnly_m4 = require("fncOnly_m4"); +exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js new file mode 100644 index 0000000000000..db9e68fbed929 --- /dev/null +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js @@ -0,0 +1,9 @@ +define(["require", "exports", "m5"], function (require, exports, m5) { + "use strict"; + exports.d = m5.foo2(); + exports.x = m5.foo2; + function n() { + return m5.foo2(); + } + exports.n = n; +}); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js new file mode 100644 index 0000000000000..2bde79432f7c8 --- /dev/null +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js @@ -0,0 +1,9 @@ +"use strict"; +// Do not emit unused import +var m5 = require("m5"); +exports.d = m5.foo2(); +exports.x = m5.foo2; +function n() { + return m5.foo2(); +} +exports.n = n; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js new file mode 100644 index 0000000000000..0ec3a0d833133 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js @@ -0,0 +1,18 @@ +define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) { + "use strict"; + exports.x4 = m4.x; + exports.d4 = m4.d; + exports.f4 = m4.foo(); + var m1; + (function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); + })(m1 = exports.m1 || (exports.m1 = {})); + exports.useMultiImport_m4_x4 = multiImport_m4.x; + exports.useMultiImport_m4_d4 = multiImport_m4.d; + exports.useMultiImport_m4_f4 = multiImport_m4.foo(); +}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js new file mode 100644 index 0000000000000..64b9438d96e43 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js @@ -0,0 +1,19 @@ +"use strict"; +var m4 = require("m4"); // Emit used +exports.x4 = m4.x; +exports.d4 = m4.d; +exports.f4 = m4.foo(); +var m1; +(function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); +})(m1 = exports.m1 || (exports.m1 = {})); +// Do not emit multiple used import statements +var multiImport_m4 = require("m4"); // Emit used +exports.useMultiImport_m4_x4 = multiImport_m4.x; +exports.useMultiImport_m4_d4 = multiImport_m4.d; +exports.useMultiImport_m4_f4 = multiImport_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js new file mode 100644 index 0000000000000..9e8ba0f7ade3e --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js @@ -0,0 +1,7 @@ +define(["require", "exports", "m4"], function (require, exports, m4) { + "use strict"; + function foo2() { + return new m4.d(); + } + exports.foo2 = foo2; +}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js new file mode 100644 index 0000000000000..a7e34c60fe39b --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js @@ -0,0 +1,6 @@ +"use strict"; +var m4 = require("m4"); // Emit used +function foo2() { + return new m4.d(); +} +exports.foo2 = foo2; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js new file mode 100644 index 0000000000000..634a988c1b800 --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js @@ -0,0 +1,15 @@ +define(["require", "exports", "m4"], function (require, exports, m4) { + "use strict"; + exports.x4 = m4.x; + exports.d4 = m4.d; + exports.f4 = m4.foo(); + var m1; + (function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); + })(m1 = exports.m1 || (exports.m1 = {})); +}); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js new file mode 100644 index 0000000000000..40df471507c8e --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js @@ -0,0 +1,14 @@ +"use strict"; +var m4 = require("m4"); // Emit used +exports.x4 = m4.x; +exports.d4 = m4.d; +exports.f4 = m4.foo(); +var m1; +(function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); +})(m1 = exports.m1 || (exports.m1 = {})); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js new file mode 100644 index 0000000000000..a8619f8826017 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js @@ -0,0 +1,5 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + function hello() { } + exports.hello = hello; +}); diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js new file mode 100644 index 0000000000000..182e381bcdec8 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js @@ -0,0 +1,3 @@ +"use strict"; +function hello() { } +exports.hello = hello; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..572002356018b --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,12 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..572002356018b --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,12 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..572002356018b --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,12 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..572002356018b --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,12 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js new file mode 100644 index 0000000000000..67db806ee95c9 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js @@ -0,0 +1,15 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js new file mode 100644 index 0000000000000..818f4c9dd06a5 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js @@ -0,0 +1,13 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..67db806ee95c9 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,15 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..818f4c9dd06a5 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,13 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..bc5eaec25e0ab --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,16 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..147125b61c102 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,15 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..bc5eaec25e0ab --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,16 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..147125b61c102 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,15 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..fca6f6bc91346 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,16 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..e4389a9467b9e --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,15 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..fca6f6bc91346 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,16 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..e4389a9467b9e --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,15 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts new file mode 100644 index 0000000000000..c3a64f5b6eb2f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts @@ -0,0 +1,20 @@ +declare var m1_a1: number; +declare class m1_c1 { + m1_c1_p1: number; +} +declare var m1_instance1: m1_c1; +declare function m1_f1(): m1_c1; +declare module "ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..9b6af66589aff --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "../outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + import m2 = require("../outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..df062274b3ed6 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts new file mode 100644 index 0000000000000..4a53b24b156e2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts @@ -0,0 +1,6 @@ +export declare var m1_a1: number; +export declare class m1_c1 { + m1_c1_p1: number; +} +export declare var m1_instance1: m1_c1; +export declare function m1_f1(): m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..18eee0fd4df67 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,18 @@ +declare module "ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "test" { + import m1 = require("ref/m1"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; +} diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js new file mode 100644 index 0000000000000..3053eb35cb488 --- /dev/null +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js @@ -0,0 +1,3 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; +}); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js new file mode 100644 index 0000000000000..0c14aab22f752 --- /dev/null +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js @@ -0,0 +1 @@ +"use strict"; From 1c0bdaffda9d91e757861ef4e45e21aaccb20d9b Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 15:42:02 -0800 Subject: [PATCH 316/353] projects tests are maddening --- .../declarationsCascadingImports/amd/useModule.d.ts | 10 ++++++++++ .../declarationsCascadingImports/node/useModule.d.ts | 10 ++++++++++ .../declarationsGlobalImport/amd/useModule.d.ts | 4 ++++ .../declarationsGlobalImport/node/useModule.d.ts | 4 ++++ .../declarationsImportedInPrivate/amd/useModule.d.ts | 3 +++ .../node/useModule.d.ts | 3 +++ .../amd/useModule.d.ts | 2 ++ .../node/useModule.d.ts | 2 ++ .../amd/useModule.d.ts | 12 ++++++++++++ .../node/useModule.d.ts | 12 ++++++++++++ .../amd/m5.d.ts | 2 ++ .../node/m5.d.ts | 2 ++ .../declarationsSimpleImport/amd/useModule.d.ts | 9 +++++++++ .../declarationsSimpleImport/node/useModule.d.ts | 9 +++++++++ .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../maprootUrlMixedSubfolderNoOutdir/amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../maprootUrlModuleSimpleNoOutdir/amd/test.js.map | 1 + .../maprootUrlModuleSimpleNoOutdir/node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../reference/project/nonRelative/amd/lib/bar/a.js | 5 +++++ .../reference/project/nonRelative/node/lib/bar/a.js | 3 +++ .../project/outMixedSubfolderNoOutdir/amd/test.d.ts | 8 ++++++++ .../project/outMixedSubfolderNoOutdir/node/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../outModuleMultifolderNoOutdir/amd/diskFile1.d.ts | 6 ++++++ .../outModuleMultifolderNoOutdir/node/diskFile1.d.ts | 6 ++++++ .../simple/outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../simple/outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../project/outModuleSimpleNoOutdir/amd/test.d.ts | 8 ++++++++ .../project/outModuleSimpleNoOutdir/node/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../project/outModuleSubfolderNoOutdir/amd/test.d.ts | 8 ++++++++ .../outModuleSubfolderNoOutdir/node/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../sourcemapMixedSubfolderNoOutdir/amd/test.js.map | 1 + .../sourcemapMixedSubfolderNoOutdir/node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../sourcemapModuleSimpleNoOutdir/amd/test.js.map | 1 + .../sourcemapModuleSimpleNoOutdir/node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../sourcemapModuleSubfolderNoOutdir/amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/diskFile0.js.map | 1 + .../node/diskFile0.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../outputdir_module_multifolder_ref/m2.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + .../amd/test.js.map | 1 + .../node/test.js.map | 1 + .../amd/outdir/simple/test.js.map | 1 + .../node/outdir/simple/test.js.map | 1 + 160 files changed, 340 insertions(+) create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js create mode 100644 tests/baselines/reference/project/nonRelative/node/lib/bar/a.js create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts new file mode 100644 index 0000000000000..c766ad8c44145 --- /dev/null +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts @@ -0,0 +1,10 @@ +declare module "quotedm1" { + import m4 = require("m4"); + class v { + c: m4.d; + } +} +declare module "quotedm2" { + import m1 = require("quotedm1"); + var c: m1.v; +} diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts new file mode 100644 index 0000000000000..c766ad8c44145 --- /dev/null +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts @@ -0,0 +1,10 @@ +declare module "quotedm1" { + import m4 = require("m4"); + class v { + c: m4.d; + } +} +declare module "quotedm2" { + import m1 = require("quotedm1"); + var c: m1.v; +} diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts new file mode 100644 index 0000000000000..f9388238202d2 --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts @@ -0,0 +1,4 @@ +import glo_m4 = require("glo_m4"); +export declare var useGlo_m4_x4: glo_m4.d; +export declare var useGlo_m4_d4: typeof glo_m4.d; +export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts new file mode 100644 index 0000000000000..f9388238202d2 --- /dev/null +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts @@ -0,0 +1,4 @@ +import glo_m4 = require("glo_m4"); +export declare var useGlo_m4_x4: glo_m4.d; +export declare var useGlo_m4_d4: typeof glo_m4.d; +export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts new file mode 100644 index 0000000000000..40f147141dea5 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts @@ -0,0 +1,3 @@ +export declare module usePrivate_m4_m1 { + var numberVar: number; +} diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts new file mode 100644 index 0000000000000..40f147141dea5 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts @@ -0,0 +1,3 @@ +export declare module usePrivate_m4_m1 { + var numberVar: number; +} diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts new file mode 100644 index 0000000000000..68bda5279ee29 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts @@ -0,0 +1,2 @@ +import fncOnly_m4 = require("fncOnly_m4"); +export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts new file mode 100644 index 0000000000000..68bda5279ee29 --- /dev/null +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts @@ -0,0 +1,2 @@ +import fncOnly_m4 = require("fncOnly_m4"); +export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts new file mode 100644 index 0000000000000..508c764d1537e --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts @@ -0,0 +1,12 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} +export declare var useMultiImport_m4_x4: m4.d; +export declare var useMultiImport_m4_d4: typeof m4.d; +export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts new file mode 100644 index 0000000000000..508c764d1537e --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts @@ -0,0 +1,12 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} +export declare var useMultiImport_m4_x4: m4.d; +export declare var useMultiImport_m4_d4: typeof m4.d; +export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts new file mode 100644 index 0000000000000..8f3e96bb9daf9 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts @@ -0,0 +1,2 @@ +import m4 = require("m4"); +export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts new file mode 100644 index 0000000000000..8f3e96bb9daf9 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts @@ -0,0 +1,2 @@ +import m4 = require("m4"); +export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts new file mode 100644 index 0000000000000..c5355f22ef5da --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts @@ -0,0 +1,9 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts new file mode 100644 index 0000000000000..c5355f22ef5da --- /dev/null +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts @@ -0,0 +1,9 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..1602fe4d4e088 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..1602fe4d4e088 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..1602fe4d4e088 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..1602fe4d4e088 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..84a82794ca83a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..dcaa1945336c0 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..84a82794ca83a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..dcaa1945336c0 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..6c402525e4e4a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..c29d3e522fa91 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..6c402525e4e4a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..c29d3e522fa91 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..6c402525e4e4a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..bc5165db0e208 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..6c402525e4e4a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..bc5165db0e208 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..3fcfc31e4d1be --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..3fcfc31e4d1be --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..3fcfc31e4d1be --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..3fcfc31e4d1be --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..aa8b2e410a9a8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..d0c4586fb0217 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..aa8b2e410a9a8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..d0c4586fb0217 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..ad60483d681ad --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..cc16e08f0ef35 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..ad60483d681ad --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..cc16e08f0ef35 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..7d421dd49d90c --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..599adcf6467a8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..7d421dd49d90c --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..599adcf6467a8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..767d260e0b828 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..767d260e0b828 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..767d260e0b828 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..767d260e0b828 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..03085b471f5b7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..fc01377571d0d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..03085b471f5b7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..fc01377571d0d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..062cb7a8c2e48 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..70225dcf91831 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..062cb7a8c2e48 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..70225dcf91831 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..ce10313e9f49c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..1f95d8892c29d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..ce10313e9f49c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..1f95d8892c29d --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..7ee88b5a860c2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..20f3ab6940046 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..7ee88b5a860c2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..20f3ab6940046 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..fa0024536d8db --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..fa0024536d8db --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..868219f88c1ea --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..868219f88c1ea --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js new file mode 100644 index 0000000000000..a8619f8826017 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js @@ -0,0 +1,5 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + function hello() { } + exports.hello = hello; +}); diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js new file mode 100644 index 0000000000000..182e381bcdec8 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js @@ -0,0 +1,3 @@ +"use strict"; +function hello() { } +exports.hello = hello; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile1.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile1.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..b5e6eec3623b3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..b5e6eec3623b3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..b5e6eec3623b3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..b5e6eec3623b3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..675e006596e9e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..b27838737a4a2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..675e006596e9e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..b27838737a4a2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..7f1ef33fb229f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..fefaceea6facc --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..7f1ef33fb229f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..fefaceea6facc --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..408e36ba6e35c --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..0fc1a3b2b97f2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..408e36ba6e35c --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..0fc1a3b2b97f2 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..6014ca9159858 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..6014ca9159858 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..6014ca9159858 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..6014ca9159858 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..e7cf3357f0ce4 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..5d29465b3a03f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..e7cf3357f0ce4 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..5d29465b3a03f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"../src/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..c69ed562a089e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..d0d53962b6c76 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..c69ed562a089e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..d0d53962b6c76 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..c69ed562a089e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..90432dd42b024 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..c69ed562a089e --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..90432dd42b024 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..c9a79b35d3c52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..c9a79b35d3c52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..bad31ecf8d2a4 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..bad31ecf8d2a4 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..37d9f97b2e6fe --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..a46677d1d0ff1 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"","sources":["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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..f447cf9c4dc5e --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..1972e164b05ed --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..22cda93f71d92 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..37c34d1d75f8e --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..a5b6833d47bc4 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..7c9dafaaf0d32 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..22cda93f71d92 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..af52ca8f3c64e --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..a5b6833d47bc4 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..2eb1e64288c88 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..e425f41290b8a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map new file mode 100644 index 0000000000000..7ee88b5a860c2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map new file mode 100644 index 0000000000000..20f3ab6940046 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..7ee88b5a860c2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map new file mode 100644 index 0000000000000..20f3ab6940046 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..fa0024536d8db --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..fa0024536d8db --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..868219f88c1ea --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map new file mode 100644 index 0000000000000..234f375dd72b2 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IACW,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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map new file mode 100644 index 0000000000000..868219f88c1ea --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,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"} \ No newline at end of file From 4e52ab4748198b6c1b44e1b9fd92a64022cb8a8b Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 16:41:56 -0800 Subject: [PATCH 317/353] ending the pain and suffering of the projects tests --- .../amd/useModule.d.ts | 10 ++++++++++ .../amd/useModule.js | 16 ++++++++++++++++ .../node/useModule.d.ts | 10 ++++++++++ .../node/useModule.js | 17 +++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../maprootUrlModuleSimpleNoOutdir/amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../project/nonRelative/amd/consume.js | 9 +++++++++ .../project/nonRelative/node/consume.js | 10 ++++++++++ .../outModuleMultifolderNoOutdir/amd/test.d.ts | 10 ++++++++++ .../outModuleMultifolderNoOutdir/amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 10 ++++++++++ .../outModuleMultifolderNoOutdir/node/test.js | 17 +++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 17 +++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 17 +++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../sourcemapModuleSimpleNoOutdir/amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../sourcemapModuleSimpleNoOutdir/node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 13 +++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 13 +++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 13 +++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 13 +++++++++++++ .../amd/diskFile1.js | 16 ++++++++++++++++ .../amd/diskFile2.d.ts | 6 ++++++ .../amd/test.d.ts | 10 ++++++++++ .../amd/test.js | 18 ++++++++++++++++++ .../amd/test.js.map | 1 + .../node/diskFile1.js | 14 ++++++++++++++ .../node/diskFile2.d.ts | 6 ++++++ .../node/test.d.ts | 10 ++++++++++ .../node/test.js | 18 ++++++++++++++++++ .../node/test.js.map | 1 + .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 16 ++++++++++++++++ .../outputdir_module_multifolder/test.d.ts | 10 ++++++++++ .../outputdir_module_multifolder/test.js | 18 ++++++++++++++++++ .../outputdir_module_multifolder/test.js.map | 1 + .../outputdir_module_multifolder_ref/m2.d.ts | 6 ++++++ .../outputdir_module_multifolder_ref/m2.js | 14 ++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ .../amd/test.d.ts | 8 ++++++++ .../amd/test.js | 17 +++++++++++++++++ .../node/test.d.ts | 8 ++++++++ .../node/test.js | 16 ++++++++++++++++ .../amd/outdir/simple/test.d.ts | 8 ++++++++ .../amd/outdir/simple/test.js | 17 +++++++++++++++++ .../node/outdir/simple/test.d.ts | 8 ++++++++ .../node/outdir/simple/test.js | 16 ++++++++++++++++ 366 files changed, 4020 insertions(+) create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/nonRelative/amd/consume.js create mode 100644 tests/baselines/reference/project/nonRelative/node/consume.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts new file mode 100644 index 0000000000000..f2ba92bca9e3b --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts @@ -0,0 +1,10 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} +export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js new file mode 100644 index 0000000000000..cc2eecd22087b --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js @@ -0,0 +1,16 @@ +define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { + "use strict"; + exports.x4 = m4.x; + exports.d4 = m4.d; + exports.f4 = m4.foo(); + var m1; + (function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); + })(m1 = exports.m1 || (exports.m1 = {})); + exports.d = m5.foo2(); +}); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts new file mode 100644 index 0000000000000..f2ba92bca9e3b --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts @@ -0,0 +1,10 @@ +import m4 = require("m4"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} +export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js new file mode 100644 index 0000000000000..b4132f79b1ff0 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js @@ -0,0 +1,17 @@ +"use strict"; +var m4 = require("m4"); // Emit used +exports.x4 = m4.x; +exports.d4 = m4.d; +exports.f4 = m4.foo(); +var m1; +(function (m1) { + m1.x2 = m4.x; + m1.d2 = m4.d; + m1.f2 = m4.foo(); + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); +})(m1 = exports.m1 || (exports.m1 = {})); +// Do not emit unused import +var m5 = require("m5"); +exports.d = m5.foo2(); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..c664292eca356 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..c664292eca356 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..c664292eca356 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..c664292eca356 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..b2d0711042a80 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..d046b77d327ea --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..0844c5018a438 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..bb70e1342a1cd --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..99285ad2e58ba --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..47b5bfb2a6278 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..d046b77d327ea --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..0844c5018a438 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..b2d0711042a80 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..99285ad2e58ba --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..47b5bfb2a6278 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..bb70e1342a1cd --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..44e408fb39b18 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..3a438f0255bc5 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..44e408fb39b18 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..3a438f0255bc5 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..f1d1c605eb430 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..884fc07b3414f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..f1d1c605eb430 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..884fc07b3414f --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..15ea98ef7edde --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..15ea98ef7edde --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..ce180d55323bd --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..ce180d55323bd --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..efc54df85c4c7 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..e368bc35b2415 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..8b4ca2668d2a4 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..d6279c6e1b899 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..fbdb77f2d2598 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..5deeb55929795 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..3431f8ce475a0 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..8b4ca2668d2a4 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..f6f3df3a777f9 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..27d8b15a593d2 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..5deeb55929795 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..971843479a5ff --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..8205a698b7255 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..a5faaf288bb28 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..0189f9ede6338 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..9264af81d3163 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..cc3fde39a754f --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..d2c56e1b16904 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..529760ec8956b --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..535ac2c9706df --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=../../../mapFiles/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..3a0f016c568cf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..40f17b7a6cc64 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..e7a34469cf3a3 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..94c4edd028979 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..866997ceee077 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..2735840bdd7f7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..40f17b7a6cc64 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..e7a34469cf3a3 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..3a0f016c568cf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..866997ceee077 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..2735840bdd7f7 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..94c4edd028979 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..e5120428e519c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..2e158a0284fcf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..e5120428e519c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..2e158a0284fcf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..9ff0c2c90ff00 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..1a8413b660194 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..9ff0c2c90ff00 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..1a8413b660194 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..d346b13ac18dc --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..3a0f016c568cf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..40f17b7a6cc64 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..cf581e3162e16 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..94c4edd028979 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..866997ceee077 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..40c202a4bd591 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..40f17b7a6cc64 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..cf581e3162e16 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..3a0f016c568cf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..866997ceee077 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..40c202a4bd591 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..94c4edd028979 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..e5120428e519c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..2e158a0284fcf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..e5120428e519c --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..2e158a0284fcf --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..9ff0c2c90ff00 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..1a8413b660194 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..9ff0c2c90ff00 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..1a8413b660194 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=http://www.typescriptlang.org/test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js new file mode 100644 index 0000000000000..08e0b38c7dfe9 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/amd/consume.js @@ -0,0 +1,9 @@ +define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) { + "use strict"; + x.hello(); + y.hello(); + var str = mod.call(); + if (str !== "success") { + fail(); + } +}); diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js new file mode 100644 index 0000000000000..35d658abb62d2 --- /dev/null +++ b/tests/baselines/reference/project/nonRelative/node/consume.js @@ -0,0 +1,10 @@ +"use strict"; +var mod = require("decl"); +var x = require("lib/foo/a"); +var y = require("lib/bar/a"); +x.hello(); +y.hello(); +var str = mod.call(); +if (str !== "success") { + fail(); +} diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..02ee3e86a3a70 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..f06fba8195527 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,17 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..02ee3e86a3a70 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..f06fba8195527 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,17 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..ffc9b194248bf --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..c6974f2fad4d6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..ffc9b194248bf --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..c6974f2fad4d6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..151c1f3d4b08a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..b3b2cf9c48cbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..151c1f3d4b08a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..b3b2cf9c48cbd --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..8208e52b6bb28 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..3d07465c89b39 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..52b252629f696 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..9c9a843619024 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..eac3af459682f --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +/// +/// +declare var a1: number; +declare class c1 { + p1: number; +} +declare var instance1: c1; +declare function f1(): c1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..8b8abfc1aedb1 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,13 @@ +/// +/// +var a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +var instance1 = new c1(); +function f1() { + return instance1; +} +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map new file mode 100644 index 0000000000000..cf581e3162e16 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map new file mode 100644 index 0000000000000..40c202a4bd591 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..bf3f6e482670a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; + exports.a3 = m2.m2_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..cf581e3162e16 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..dd1c532b6dfbd --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,16 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.m2_a1 = 10; + var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; + })(); + exports.m2_c1 = m2_c1; + exports.m2_instance1 = new m2_c1(); + function m2_f1() { + return exports.m2_instance1; + } + exports.m2_f1 = m2_f1; +}); +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts new file mode 100644 index 0000000000000..4afd4e69f2d52 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -0,0 +1,10 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js new file mode 100644 index 0000000000000..67406a9e410d5 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -0,0 +1,18 @@ +"use strict"; +var m1 = require("ref/m1"); +var m2 = require("../outputdir_module_multifolder_ref/m2"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +exports.a3 = m2.m2_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map new file mode 100644 index 0000000000000..40c202a4bd591 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map @@ -0,0 +1 @@ +{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/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"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts new file mode 100644 index 0000000000000..c09a3c0c32ae8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.d.ts @@ -0,0 +1,6 @@ +export declare var m2_a1: number; +export declare class m2_c1 { + m2_c1_p1: number; +} +export declare var m2_instance1: m2_c1; +export declare function m2_f1(): m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js new file mode 100644 index 0000000000000..1646fd608eaa3 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -0,0 +1,14 @@ +"use strict"; +exports.m2_a1 = 10; +var m2_c1 = (function () { + function m2_c1() { + } + return m2_c1; +})(); +exports.m2_c1 = m2_c1; +exports.m2_instance1 = new m2_c1(); +function m2_f1() { + return exports.m2_instance1; +} +exports.m2_f1 = m2_f1; +//# sourceMappingURL=m2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..4e5ad232cc3ab --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..250d2615a794a --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bbc39c2543192 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js new file mode 100644 index 0000000000000..081c888ee0234 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -0,0 +1,17 @@ +define(["require", "exports", "ref/m1"], function (require, exports, m1) { + "use strict"; + exports.a1 = 10; + var c1 = (function () { + function c1() { + } + return c1; + })(); + exports.c1 = c1; + exports.instance1 = new c1(); + function f1() { + return exports.instance1; + } + exports.f1 = f1; + exports.a2 = m1.m1_c1; +}); +//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts new file mode 100644 index 0000000000000..a61d8541048e6 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -0,0 +1,8 @@ +import m1 = require("ref/m1"); +export declare var a1: number; +export declare class c1 { + p1: number; +} +export declare var instance1: c1; +export declare function f1(): c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js new file mode 100644 index 0000000000000..bdc33590853f7 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -0,0 +1,16 @@ +"use strict"; +var m1 = require("ref/m1"); +exports.a1 = 10; +var c1 = (function () { + function c1() { + } + return c1; +})(); +exports.c1 = c1; +exports.instance1 = new c1(); +function f1() { + return exports.instance1; +} +exports.f1 = f1; +exports.a2 = m1.m1_c1; +//# sourceMappingURL=test.js.map \ No newline at end of file From b4d6081ca2881697dc3714fd20bf7b09ec7fa48e Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 23 Nov 2015 17:11:38 -0800 Subject: [PATCH 318/353] accpet new baseline --- tests/baselines/reference/bangInModuleName.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/baselines/reference/bangInModuleName.js b/tests/baselines/reference/bangInModuleName.js index 769ccbf1d42b0..2fe13e00cf047 100644 --- a/tests/baselines/reference/bangInModuleName.js +++ b/tests/baselines/reference/bangInModuleName.js @@ -20,4 +20,5 @@ import * as http from 'intern/dojo/node!http'; //// [a.js] /// define(["require", "exports"], function (require, exports) { + "use strict"; }); From 5c23a5f11e6669b1e6d33d4ceece69db8f434749 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 23 Nov 2015 22:38:05 -0800 Subject: [PATCH 319/353] Extract source map generation logic out of the emitter. --- Jakefile.js | 8 +- src/compiler/core.ts | 27 +++ src/compiler/emitter.ts | 481 +++++--------------------------------- src/compiler/scanner.ts | 10 +- src/compiler/sourcemap.ts | 416 +++++++++++++++++++++++++++++++++ src/compiler/utilities.ts | 21 ++ 6 files changed, 530 insertions(+), 433 deletions(-) create mode 100644 src/compiler/sourcemap.ts diff --git a/Jakefile.js b/Jakefile.js index 5dfbcc26d74cb..c76927b2b45db 100644 --- a/Jakefile.js +++ b/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", @@ -466,7 +468,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); @@ -875,7 +877,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() { @@ -937,7 +939,7 @@ function lintWatchFile(filename) { if (event !== "change") { return; } - + if (!lintSemaphores[filename]) { lintSemaphores[filename] = true; lintFileAsync(getLinterOptions(), filename, function(err, result) { diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 79f0251c5651f..7590f8c73cdc8 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -356,6 +356,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(map: Map, 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) : typeof value === "object" && value instanceof Array; + } + export function memoize(callback: () => T): () => T { let value: T; return () => { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d2f9abc7354f5..ac7aa0f00dcbe 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1,4 +1,5 @@ /// +/// /// /* @internal */ @@ -458,6 +459,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, pushScope: scopeEmitStart, popScope: scopeEmitEnd } = sourceMap; + let currentSourceFile: SourceFile; let currentText: string; let currentLineMap: number[]; @@ -492,38 +496,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; @@ -549,18 +523,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); @@ -570,9 +540,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; @@ -611,7 +588,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 { @@ -708,399 +686,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 = {}; - const sourceMapNameIndices: number[] = []; - function getSourceMapNameIndex() { - return sourceMapNameIndices.length ? lastOrUndefined(sourceMapNameIndices) : -1; - } - - // 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; - } - } - - 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 = (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 ((node).name) { - const name = (node).name; - // For computed property names, the text will include the brackets - scopeName = name.kind === SyntaxKind.ComputedPropertyName - ? getTextOfNode(name) - : ((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(node); - emitNodeWithoutSourceMap(node); - } - } + /** 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); } - function emitNodeWithCommentsAndWithSourcemap(node: Node) { - emitNodeConsideringCommentsOption(node, emitNodeWithSourceMap); + if (sourceMapDataList) { + sourceMapDataList.push(sourceMap.getSourceMapData()); } - 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); } @@ -1139,7 +734,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(); @@ -1147,7 +751,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) { @@ -7735,6 +7342,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); } @@ -7763,6 +7374,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); @@ -8155,6 +7774,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) { diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 4289d910608a9..022d63fbe9dc3 100644 --- a/src/compiler/scanner.ts +++ b/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 '/' 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. diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts new file mode 100644 index 0000000000000..ffb1a7001a965 --- /dev/null +++ b/src/compiler/sourcemap.ts @@ -0,0 +1,416 @@ +/// + +/* @internal */ +namespace ts { + export interface SourceMapWriter { + getSourceMapData(): SourceMapData; + setSourceFile(sourceFile: SourceFile): void; + emitPos(pos: number): void; + emitStart(range: TextRange): void; + emitEnd(range: TextRange): void; + pushScope(scopeDeclaration: Node, scopeName?: string): void; + popScope(): 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: nop, + setSourceFile: nop, + emitStart: nop, + emitEnd: nop, + emitPos: nop, + pushScope: nop, + popScope: nop, + getText: nop, + getSourceMappingURL: nop, + initialize: nop, + reset: nop, + }; + } + + 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; + + // Names and its index map + let sourceMapNameIndexMap: Map; + let sourceMapNameIndices: 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, + pushScope, + popScope, + 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; + + // Names and its index map + sourceMapNameIndexMap = {}; + sourceMapNameIndices = []; + + // 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; + sourceMapNameIndexMap = undefined; + sourceMapNameIndices = undefined; + lastRecordedSourceMapSpan = undefined; + lastEncodedSourceMapSpan = undefined; + lastEncodedNameIndex = undefined; + sourceMapData = undefined; + } + + function getSourceMapNameIndex() { + return sourceMapNameIndices.length ? lastOrUndefined(sourceMapNameIndices) : -1; + } + + // 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, + 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 emitStart(range: TextRange) { + emitPos(range.pos !== -1 ? skipTrivia(currentSourceFile.text, 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 recordScopeNameIndex(scopeNameIndex: number) { + sourceMapNameIndices.push(scopeNameIndex); + } + + function recordScopeNameStart(scopeDeclaration: Node, 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 = (scopeDeclaration).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); + } + + function pushScope(scopeDeclaration: Node, scopeName?: string) { + if (scopeName) { + // The scope was already given a name use it + recordScopeNameStart(scopeDeclaration, scopeName); + } + else if (scopeDeclaration.kind === SyntaxKind.FunctionDeclaration || + scopeDeclaration.kind === SyntaxKind.FunctionExpression || + scopeDeclaration.kind === SyntaxKind.MethodDeclaration || + scopeDeclaration.kind === SyntaxKind.MethodSignature || + scopeDeclaration.kind === SyntaxKind.GetAccessor || + scopeDeclaration.kind === SyntaxKind.SetAccessor || + scopeDeclaration.kind === SyntaxKind.ModuleDeclaration || + scopeDeclaration.kind === SyntaxKind.ClassDeclaration || + scopeDeclaration.kind === SyntaxKind.EnumDeclaration) { + // Declaration and has associated name use it + if ((scopeDeclaration).name) { + const name = (scopeDeclaration).name; + // For computed property names, the text will include the brackets + scopeName = name.kind === SyntaxKind.ComputedPropertyName + ? getTextOfNode(name) + : ((scopeDeclaration).name).text; + } + + recordScopeNameStart(scopeDeclaration, scopeName); + } + else { + // Block just use the name from upper level scope + recordScopeNameIndex(getSourceMapNameIndex()); + } + } + + function popScope() { + sourceMapNameIndices.pop(); + } + + 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; + } +} \ No newline at end of file diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 1884cee15161d..12b9c404c5d68 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2414,6 +2414,27 @@ namespace ts { return output; } + export const stringify: (value: any) => string = JSON && JSON.stringify ? JSON.stringify : function stringify(value: any): string { + /* tslint:disable:no-null */ + return value == null ? "null" + : typeof value === "string" ? `"${escapeString(value)}"` + : typeof value === "number" ? String(value) + : typeof value === "boolean" ? value ? "true" : "false" + : isArray(value) ? `[${reduceLeft(value, stringifyElement, "")}]` + : typeof value === "object" ? `{${reduceProperties(value, stringifyProperty, "")}}` + : "null"; + /* tslint:enable:no-null */ + }; + + function stringifyElement(memo: string, value: any) { + return (memo ? memo + "," : memo) + stringify(value); + } + + function stringifyProperty(memo: string, value: any, key: string) { + return value === undefined ? memo + : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringify(value)}`; + } + const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; /** From 880db386a43e24a3a39f77da8349a1b0371da627 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 24 Nov 2015 23:39:12 +0900 Subject: [PATCH 320/353] removing filename requirement --- src/compiler/diagnosticMessages.json | 4 ++-- src/compiler/tsc.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 4efb3e1181646..780f95d7f8cc3 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2068,11 +2068,11 @@ "category": "Error", "code": 5056 }, - "The project file name is not in 'tsconfig(-*).json' format: '{0}'": { + "Cannot find a tsconfig.json file at the specified directory: '{0}'": { "category": "Error", "code": 5057 }, - "Cannot find any project file in specified path: '{0}'": { + "The specified path does not exist: '{0}'": { "category": "Error", "code": 5058 }, diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 3b1b63aeae3f4..d064ec54c9ce6 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -301,19 +301,19 @@ namespace ts { } const fileOrDirectory = normalizePath(commandLine.options.project); - if (!fileOrDirectory /* current directory */ || sys.directoryExists(fileOrDirectory)) { + if (!fileOrDirectory /* current directory "." */ || sys.directoryExists(fileOrDirectory)) { configFileName = combinePaths(fileOrDirectory, "tsconfig.json"); + if (!sys.fileExists(configFileName)) { + reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0, commandLine.options.project), /* compilerHost */ undefined); + return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); + } } else { - if (!/^tsconfig(?:-.*)?\.json$/.test(getBaseFileName(fileOrDirectory))) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project), /* compilerHost */ undefined); + configFileName = fileOrDirectory; + if (!sys.fileExists(configFileName)) { + reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_specified_path_does_not_exist_Colon_0, commandLine.options.project), /* compilerHost */ undefined); return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } - configFileName = fileOrDirectory; - } - if (!sys.fileExists(configFileName)) { - reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project), /* compilerHost */ undefined); - return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); } } else if (commandLine.fileNames.length === 0 && isJSONSupported()) { From 27149f3c88969b18cfbc4d60d2e83a044517d98f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 24 Nov 2015 13:31:30 -0800 Subject: [PATCH 321/353] only emit use strict if a use strict prologue isnt found --- src/compiler/emitter.ts | 38 ++++++++++++------- .../reference/downlevelLetConst13.js | 2 +- .../baselines/reference/modulePrologueAMD.js | 1 - .../reference/modulePrologueCommonjs.js | 2 +- .../reference/modulePrologueSystem.js | 1 - .../baselines/reference/modulePrologueUmd.js | 1 - tests/baselines/reference/parser509546_2.js | 2 +- ...odeReservedWordInImportEqualDeclaration.js | 2 +- 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index e4d685597e76f..ca44be8bf7134 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -7383,8 +7383,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(`], function(${exportFunctionForFile}) {`); writeLine(); increaseIndent(); - emitUseStrictPrologueDirective(); - const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); + const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true); emitEmitHelpers(node); emitCaptureThisForNodeIfNecessary(node); emitSystemModuleBody(node, dependencyGroups, startIndex); @@ -7494,8 +7493,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeModuleName(node, emitRelativePathAsModuleName); emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName); increaseIndent(); - emitUseStrictPrologueDirective(); - const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); + const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true); emitExportStarHelper(); emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); @@ -7507,8 +7505,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitCommonJSModule(node: SourceFile) { - emitUseStrictPrologueDirective(); - const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false); + const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ true); emitEmitHelpers(node); collectExternalModuleInfo(node); emitExportStarHelper(); @@ -7518,11 +7515,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitExportEquals(/*emitAsReturn*/ false); } - function emitUseStrictPrologueDirective() { - writeLine(); - write("\"use strict\";"); - } - function emitUMDModule(node: SourceFile) { emitEmitHelpers(node); collectExternalModuleInfo(node); @@ -7542,8 +7534,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi })(`); emitAMDFactoryHeader(dependencyNames); increaseIndent(); - emitUseStrictPrologueDirective(); - const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true); + const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true); emitExportStarHelper(); emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); @@ -7685,19 +7676,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean): number { + function isUseStrictPrologue(node: ExpressionStatement): boolean { + return !!(node.expression as StringLiteral).text.match(/use strict/); + } + + function ensureUseStrictPrologue(startWithNewLine: boolean, writeUseStrict: boolean) { + if (writeUseStrict) { + if (startWithNewLine) { + writeLine(); + } + write("\"use strict\";"); + } + } + + function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean, ensureUseStrict?: boolean): number { + let foundUseStrict = false; for (let i = 0; i < statements.length; ++i) { if (isPrologueDirective(statements[i])) { + if (isUseStrictPrologue(statements[i] as ExpressionStatement)) { + foundUseStrict = true; + } if (startWithNewLine || i > 0) { writeLine(); } emit(statements[i]); } else { + ensureUseStrictPrologue(startWithNewLine || i > 0, !foundUseStrict && ensureUseStrict); // return index of the first non prologue directive return i; } } + ensureUseStrictPrologue(startWithNewLine, !foundUseStrict && ensureUseStrict); return statements.length; } diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index 08e83e7d05654..b6baf85080027 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -20,7 +20,7 @@ export module M { } //// [downlevelLetConst13.js] -"use strict";'use strict'; +'use strict'; // exported let\const bindings should not be renamed exports.foo = 10; exports.bar = "123"; diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index a701defdc688c..904808b9f6b6d 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -5,7 +5,6 @@ export class Foo {} //// [modulePrologueAMD.js] define(["require", "exports"], function (require, exports) { - "use strict"; "use strict"; var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 86df3f3b50471..67b704a365070 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -4,7 +4,7 @@ export class Foo {} //// [modulePrologueCommonjs.js] -"use strict";"use strict"; +"use strict"; var Foo = (function () { function Foo() { } diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js index 93af4afd31f57..91703d1c7fba7 100644 --- a/tests/baselines/reference/modulePrologueSystem.js +++ b/tests/baselines/reference/modulePrologueSystem.js @@ -5,7 +5,6 @@ export class Foo {} //// [modulePrologueSystem.js] System.register([], function(exports_1) { - "use strict"; "use strict"; var Foo; return { diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index aab9e8368ad52..65803af6cadec 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -12,7 +12,6 @@ export class Foo {} define(["require", "exports"], factory); } })(function (require, exports) { - "use strict"; "use strict"; var Foo = (function () { function Foo() { diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js index caeb714c61770..976bbd1e471d1 100644 --- a/tests/baselines/reference/parser509546_2.js +++ b/tests/baselines/reference/parser509546_2.js @@ -7,7 +7,7 @@ export class Logger { //// [parser509546_2.js] -"use strict";"use strict"; +"use strict"; var Logger = (function () { function Logger() { } diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js index 7044d4a61b137..50ed1b4d755ad 100644 --- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js +++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js @@ -4,4 +4,4 @@ import public = require("1"); //// [strictModeReservedWordInImportEqualDeclaration.js] -"use strict";"use strict"; +"use strict"; From aa5e57668ffad5259ab0b61e32cc8c5028f608cb Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 24 Nov 2015 16:26:57 -0800 Subject: [PATCH 322/353] minor tweak to null handling in stringify --- src/compiler/utilities.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 12b9c404c5d68..28d8cba3234ad 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2415,24 +2415,28 @@ namespace ts { } export const stringify: (value: any) => string = JSON && JSON.stringify ? JSON.stringify : function stringify(value: any): string { + return value === undefined ? undefined : stringifyValue(value); + }; + + function stringifyValue(value: any): string { /* tslint:disable:no-null */ - return value == null ? "null" + return value === null ? "null" // explicit test for `null` as `typeof null` is "object" : typeof value === "string" ? `"${escapeString(value)}"` : typeof value === "number" ? String(value) : typeof value === "boolean" ? value ? "true" : "false" : isArray(value) ? `[${reduceLeft(value, stringifyElement, "")}]` : typeof value === "object" ? `{${reduceProperties(value, stringifyProperty, "")}}` - : "null"; + : /*fallback*/ "null"; /* tslint:enable:no-null */ - }; + } function stringifyElement(memo: string, value: any) { - return (memo ? memo + "," : memo) + stringify(value); + return (memo ? memo + "," : memo) + stringifyValue(value); } function stringifyProperty(memo: string, value: any, key: string) { - return value === undefined ? memo - : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringify(value)}`; + return value === undefined || typeof value === "function" ? memo + : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`; } const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; From fd51ebf0fd965acc49ab01dc7eaf03490ff7d91f Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 24 Nov 2015 16:59:55 -0800 Subject: [PATCH 323/353] Minor stringify cleanup, added cycle detection for AssertionLevel.Aggresive only. --- src/compiler/utilities.ts | 58 ++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 28d8cba3234ad..2034a2d276d04 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2414,26 +2414,70 @@ 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 : function stringify(value: any): string { + if (Debug.shouldAssert(AssertionLevel.Aggressive)) { + Debug.assert(!hasCycles(value, []), "Detected circular reference before serializing object graph."); + } + return value === undefined ? undefined : stringifyValue(value); }; - function stringifyValue(value: any): string { + function hasCycles(value: any, stack: any[]) { /* tslint:disable:no-null */ - return value === null ? "null" // explicit test for `null` as `typeof null` is "object" - : typeof value === "string" ? `"${escapeString(value)}"` - : typeof value === "number" ? String(value) + if (typeof value !== "object" || value === null) { + return false; + } + /* tslint:enable:no-null */ + + if (stack.lastIndexOf(value) !== -1) { + return true; + } + + stack.push(value); + + if (isArray(value)) { + for (const entry of value) { + if (hasCycles(entry, stack)) { + return true; + } + } + } + else { + for (const key in value) { + if (hasProperty(value, key) && hasCycles(value[key], stack)) { + return true; + } + } + } + + stack.pop(); + return false; + } + + 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" - : isArray(value) ? `[${reduceLeft(value, stringifyElement, "")}]` - : typeof value === "object" ? `{${reduceProperties(value, stringifyProperty, "")}}` + : typeof value === "object" ? isArray(value) ? stringifyArray(value) : stringifyObject(value) : /*fallback*/ "null"; - /* tslint:enable:no-null */ + } + + 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 value ? `{${reduceProperties(value, stringifyProperty, "")}}` : "null"; + } + function stringifyProperty(memo: string, value: any, key: string) { return value === undefined || typeof value === "function" ? memo : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`; From 0ad2efcd61a1dbdc548d74dcb16717dbed9dfef5 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 24 Nov 2015 17:00:27 -0800 Subject: [PATCH 324/353] removed typeof check for isArray --- src/compiler/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 7590f8c73cdc8..cae7bd8210341 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -380,7 +380,7 @@ namespace ts { * Tests whether a value is an array. */ export function isArray(value: any): value is any[] { - return Array.isArray ? Array.isArray(value) : typeof value === "object" && value instanceof Array; + return Array.isArray ? Array.isArray(value) : value instanceof Array; } export function memoize(callback: () => T): () => T { From d88186bc1199e960122a09aac7a0fa2d255a61a8 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 24 Nov 2015 17:06:17 -0800 Subject: [PATCH 325/353] Removed isArray branch in checkCycles as it was unnecessary --- src/compiler/utilities.ts | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 2034a2d276d04..e649edf2115b6 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2439,18 +2439,9 @@ namespace ts { stack.push(value); - if (isArray(value)) { - for (const entry of value) { - if (hasCycles(entry, stack)) { - return true; - } - } - } - else { - for (const key in value) { - if (hasProperty(value, key) && hasCycles(value[key], stack)) { - return true; - } + for (const key in value) { + if (hasProperty(value, key) && hasCycles(value[key], stack)) { + return true; } } From 7ff4238f93d760a953b525c1a6ee1daca21475a8 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 24 Nov 2015 17:44:10 -0800 Subject: [PATCH 326/353] Fix crushing of getting signatureDeclaration when we are not in function declaration --- src/services/services.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 8d66b5c7b8a1b..54c76a063b2d3 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -4247,24 +4247,22 @@ namespace ts { } else { // Method/function type parameter - let container = getContainingFunction(location); - if (container) { - let signatureDeclaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent; - let signature = typeChecker.getSignatureFromDeclaration(signatureDeclaration); - if (signatureDeclaration.kind === SyntaxKind.ConstructSignature) { + let declaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent; + if (declaration && isFunctionLikeKind(declaration.kind)) { + let signature = typeChecker.getSignatureFromDeclaration(declaration); + if (declaration.kind === SyntaxKind.ConstructSignature) { displayParts.push(keywordPart(SyntaxKind.NewKeyword)); displayParts.push(spacePart()); } - else if (signatureDeclaration.kind !== SyntaxKind.CallSignature && signatureDeclaration.name) { - addFullSymbolName(signatureDeclaration.symbol); + else if (declaration.kind !== SyntaxKind.CallSignature && (declaration).name) { + addFullSymbolName(declaration.symbol); } addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature)); } else { - // Type aliash type parameter + // Type alias type parameter // For example // type list = T[]; // Both T will go through same code path - let declaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent; displayParts.push(keywordPart(SyntaxKind.TypeKeyword)); displayParts.push(spacePart()); addFullSymbolName(declaration.symbol); From 81fdc4384f5a9582d010414884066a4d5172c974 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 24 Nov 2015 17:50:00 -0800 Subject: [PATCH 327/353] Add fourslash tests --- ...mpletionListInTypeParameterOfTypeAlias3.ts | 13 ++++++ ...sTypeParameterInFunctionLikeInTypeAlias.ts | 22 ++++++++++ ...nfoDisplayPartsTypeParameterInTypeAlias.ts | 3 -- ...sTypeParameterOfFunctionLikeInTypeAlias.ts | 41 +++++++++++++++++++ 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts create mode 100644 tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInFunctionLikeInTypeAlias.ts create mode 100644 tests/cases/fourslash/quickInfoDisplayPartsTypeParameterOfFunctionLikeInTypeAlias.ts diff --git a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts new file mode 100644 index 0000000000000..59cceda2aad48 --- /dev/null +++ b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts @@ -0,0 +1,13 @@ +/// + +//// type constructorType = new + +//// type MixinCtor = new () => /*0*/A & { constructor: MixinCtor }; +//// type MixinCtor = new () => A & { constructor: { constructor: MixinCtor } }; + +let typeAliashDisplayParts = [{ text: "type", kind: "keyword" }, { text: " ", kind: "space" }, { text: "MixinCtor", kind: "aliasName" }, + { text: "<", kind: "punctuation" }, { text: "A", kind: "typeParameterName" }, { text: ">", kind: "punctuation" }]; + +let typeParameterDisplayParts = [{ text: "(", kind: "punctuation" }, { text: "type parameter", kind: "text" }, { text: ")", kind: "punctuation" }, { text: " ", kind: "space" }, + { text: "A", kind: "typeParameterName" }, { text: " ", kind: "space" }, { text: "in", kind: "keyword" }, { text: " ", kind: "space" }]; + +goTo.marker('0'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("0").position, length: "A".length }, + typeParameterDisplayParts.concat(typeAliashDisplayParts), []); + +goTo.marker('1'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("1").position, length: "A".length }, + typeParameterDisplayParts.concat(typeAliashDisplayParts), []);; + +goTo.marker('2'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("2").position, length: "A".length }, + typeParameterDisplayParts.concat(typeAliashDisplayParts), []); \ No newline at end of file diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInTypeAlias.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInTypeAlias.ts index b6a10e086c25b..5dbcfa93d783e 100644 --- a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInTypeAlias.ts +++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInTypeAlias.ts @@ -3,9 +3,6 @@ ////type /*0*/List = /*2*/T[] ////type /*3*/List2 = /*5*/T[]; -type List2 = T[]; - -type L = T[] let typeAliashDisplayParts = [{ text: "type", kind: "keyword" }, { text: " ", kind: "space" }, { text: "List", kind: "aliasName" }, { text: "<", kind: "punctuation" }, { text: "T", kind: "typeParameterName" }, { text: ">", kind: "punctuation" }]; diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterOfFunctionLikeInTypeAlias.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterOfFunctionLikeInTypeAlias.ts new file mode 100644 index 0000000000000..917358fde570b --- /dev/null +++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterOfFunctionLikeInTypeAlias.ts @@ -0,0 +1,41 @@ +/// + +//// type jamming = new () => jamming; +//// type jamming = (new () => jamming) & { constructor: /*2*/A }; +//// type jamming = new () => jamming & { constructor: /*3*/A }; + +let typeAliashDisplayParts = [{ text: "type", kind: "keyword" }, { text: " ", kind: "space" }, { text: "jamming", kind: "aliasName" }, + { text: "<", kind: "punctuation" }, { text: "A", kind: "typeParameterName" }, { text: ">", kind: "punctuation" }]; + +let typeParameterDisplayParts = [{ text: "(", kind: "punctuation" }, { text: "type parameter", kind: "text" }, { text: ")", kind: "punctuation" }, { text: " ", kind: "space" }, + { text: "A", kind: "typeParameterName" }, { text: " ", kind: "space" }, { text: "in", kind: "keyword" }, { text: " ", kind: "space" }]; + +let constructorTypeDisplayParts = [{ text: "<", kind: "punctuation" }, { text: "A", kind: "typeParameterName" }, { text: ">", kind: "punctuation" }, + { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, + { text: "new", kind: "keyword" }, { "text": " ", kind: "space" }, { text: "<", kind: "punctuation" }, { text: "A", kind: "typeParameterName" }, + { text: ">", kind: "punctuation" }, { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" }, {"text": " ", kind: "space" }, + { text: "=>", kind: "punctuation" }, { "text": " ", kind: "space" }, { text: "jamming", kind: "aliasName" }]; + +let constructorTypeWithLongReturnTypeDisplayParts = [{ "text": "<", kind: "punctuation" }, { "text": "A", kind: "typeParameterName" }, { "text": ">", kind: "punctuation" }, + { "text": "(", kind: "punctuation" }, { "text": ")", kind: "punctuation" }, { "text": ":", kind: "punctuation" }, { "text": " ", kind: "space" }, { "text": "(", kind: "punctuation" }, + { "text": "new", kind: "keyword" }, { "text": " ", kind: "space" }, { "text": "<", kind: "punctuation" }, { "text": "A", kind: "typeParameterName" }, { "text": ">", kind: "punctuation" }, + { "text": "(", kind: "punctuation" }, { "text": ")", kind: "punctuation" }, { "text": " ", kind: "space" }, { "text": "=>", kind: "punctuation" }, { "text": " ", kind: "space" }, + { "text": "jamming", kind: "aliasName" }, { "text": ")", kind: "punctuation" }, { "text": " ", kind: "space" }, { "text": "&", kind: "punctuation" }, { "text": " ", kind: "space" }, + { "text": "{", kind: "punctuation" }, { "text": "\n", kind: "lineBreak" }, { "text": " ", kind: "space" }, { "text": "constructor", kind: "propertyName" }, { "text": ":", kind: "punctuation" }, + { "text": " ", kind: "space" }, { "text": "A", kind: "typeParameterName" }, {"text":";", kind: "punctuation" }, {"text":"\n", kind: "lineBreak" }, {"text":"}", kind: "punctuation" }]; + +goTo.marker('0'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("0").position, length: "A".length }, + typeParameterDisplayParts.concat(constructorTypeDisplayParts), []); + +goTo.marker('1'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("1").position, length: "A".length }, + typeParameterDisplayParts.concat(constructorTypeDisplayParts), []); + +goTo.marker('2'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("2").position, length: "A".length }, + typeParameterDisplayParts.concat(typeAliashDisplayParts), []); + +goTo.marker('3'); +verify.verifyQuickInfoDisplayParts("type parameter", "", { start: test.markerByName("3").position, length: "A".length }, + typeParameterDisplayParts.concat(constructorTypeWithLongReturnTypeDisplayParts), []); \ No newline at end of file From 8702cc4215d6ab0fb7d4f300d823e6fb2c6280d1 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 24 Nov 2015 18:01:47 -0800 Subject: [PATCH 328/353] Renamed functions, fixed signature, removed TODO. --- src/compiler/checker.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c6ff38888a2a9..2ae303af37a95 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4527,7 +4527,7 @@ namespace ts { return links.resolvedType; } - function getStringLiteralType(text: string): StringLiteralType { + function getStringLiteralTypeForText(text: string): StringLiteralType { if (hasProperty(stringLiteralTypes, text)) { return stringLiteralTypes[text]; } @@ -4537,10 +4537,10 @@ namespace ts { return type; } - function getTypeFromStringLiteral(node: StringLiteral | StringLiteralTypeNode): Type { + function getTypeFromStringLiteralTypeNode(node: StringLiteralTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { - links.resolvedType = getStringLiteralType(node.text); + links.resolvedType = getStringLiteralTypeForText(node.text); } return links.resolvedType; } @@ -4583,7 +4583,7 @@ namespace ts { case SyntaxKind.ThisType: return getTypeFromThisTypeNode(node); case SyntaxKind.StringLiteralType: - return getTypeFromStringLiteral(node); + return getTypeFromStringLiteralTypeNode(node); case SyntaxKind.TypeReference: return getTypeFromTypeReference(node); case SyntaxKind.TypePredicate: @@ -8790,7 +8790,7 @@ namespace ts { // for the argument. In that case, we should check the argument. if (argType === undefined) { argType = arg.kind === SyntaxKind.StringLiteral && !reportErrors - ? getStringLiteralType((arg).text) + ? getStringLiteralTypeForText((arg).text) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined); } @@ -8985,7 +8985,7 @@ namespace ts { case SyntaxKind.Identifier: case SyntaxKind.NumericLiteral: case SyntaxKind.StringLiteral: - return getStringLiteralType((element.name).text); + return getStringLiteralTypeForText((element.name).text); case SyntaxKind.ComputedPropertyName: const nameType = checkComputedPropertyName(element.name); @@ -10607,8 +10607,7 @@ namespace ts { function checkStringLiteralExpression(node: StringLiteral): Type { const contextualType = getContextualType(node); if (contextualType && contextualTypeIsStringLiteralType(contextualType)) { - // TODO (drosen): Consider using getTypeFromStringLiteral instead - return getStringLiteralType(node.text); + return getStringLiteralTypeForText(node.text); } return stringType; From c5a2969255e7b1c1d45c3b6bb276455e6992ed8d Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 25 Nov 2015 11:41:51 -0800 Subject: [PATCH 329/353] check for null --- src/services/services.ts | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 54c76a063b2d3..b53ff02e195da 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -4247,26 +4247,30 @@ namespace ts { } else { // Method/function type parameter - let declaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent; - if (declaration && isFunctionLikeKind(declaration.kind)) { - let signature = typeChecker.getSignatureFromDeclaration(declaration); - if (declaration.kind === SyntaxKind.ConstructSignature) { - displayParts.push(keywordPart(SyntaxKind.NewKeyword)); - displayParts.push(spacePart()); + let declaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter); + declaration = declaration ? declaration.parent : undefined; + + if (declaration) { + if (isFunctionLikeKind(declaration.kind)) { + let signature = typeChecker.getSignatureFromDeclaration(declaration); + if (declaration.kind === SyntaxKind.ConstructSignature) { + displayParts.push(keywordPart(SyntaxKind.NewKeyword)); + displayParts.push(spacePart()); + } + else if (declaration.kind !== SyntaxKind.CallSignature && (declaration).name) { + addFullSymbolName(declaration.symbol); + } + addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature)); } - else if (declaration.kind !== SyntaxKind.CallSignature && (declaration).name) { + else { + // Type alias type parameter + // For example + // type list = T[]; // Both T will go through same code path + displayParts.push(keywordPart(SyntaxKind.TypeKeyword)); + displayParts.push(spacePart()); addFullSymbolName(declaration.symbol); + writeTypeParametersOfSymbol(declaration.symbol, sourceFile); } - addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature)); - } - else { - // Type alias type parameter - // For example - // type list = T[]; // Both T will go through same code path - displayParts.push(keywordPart(SyntaxKind.TypeKeyword)); - displayParts.push(spacePart()); - addFullSymbolName(declaration.symbol); - writeTypeParametersOfSymbol(declaration.symbol, sourceFile); } } } From b33eff1143aab72b63e92da3b8ded8026a86f263 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 25 Nov 2015 12:47:32 -0800 Subject: [PATCH 330/353] PR feedback --- src/compiler/emitter.ts | 34 +++++++++++++++++----------------- src/compiler/sourcemap.ts | 22 +++++++++++----------- src/compiler/utilities.ts | 25 +++++++++++++++++-------- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ac7aa0f00dcbe..620abbe156dd4 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -460,7 +460,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi const { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer; const sourceMap = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? createSourceMapWriter(host, writer) : getNullSourceMapWriter(); - const { setSourceFile, emitStart, emitEnd, emitPos, pushScope: scopeEmitStart, popScope: scopeEmitEnd } = sourceMap; + const { setSourceFile, emitStart, emitEnd, emitPos, pushScope, popScope } = sourceMap; let currentSourceFile: SourceFile; let currentText: string; @@ -2692,7 +2692,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitToken(SyntaxKind.OpenBraceToken, node.pos); increaseIndent(); - scopeEmitStart(node.parent); + pushScope(node.parent); if (node.kind === SyntaxKind.ModuleBlock) { Debug.assert(node.parent.kind === SyntaxKind.ModuleDeclaration); emitCaptureThisForNodeIfNecessary(node.parent); @@ -2704,7 +2704,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.statements.end); - scopeEmitEnd(); + popScope(); } function emitEmbeddedStatement(node: Node) { @@ -4549,7 +4549,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitDownLevelExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) { write(" {"); - scopeEmitStart(node); + pushScope(node); increaseIndent(); const outPos = writer.getTextPos(); @@ -4590,12 +4590,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write("}"); emitEnd(node.body); - scopeEmitEnd(); + popScope(); } function emitBlockFunctionBody(node: FunctionLikeDeclaration, body: Block) { write(" {"); - scopeEmitStart(node); + pushScope(node); const initialTextPos = writer.getTextPos(); @@ -4630,7 +4630,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } emitToken(SyntaxKind.CloseBraceToken, body.statements.end); - scopeEmitEnd(); + popScope(); } function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement { @@ -4916,7 +4916,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let startIndex = 0; write(" {"); - scopeEmitStart(node, "constructor"); + pushScope(node, "constructor"); increaseIndent(); if (ctor) { // Emit all the directive prologues (like "use strict"). These have to come before @@ -4966,7 +4966,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } decreaseIndent(); emitToken(SyntaxKind.CloseBraceToken, ctor ? (ctor.body).statements.end : node.members.end); - scopeEmitEnd(); + popScope(); emitEnd(ctor || node); if (ctor) { emitTrailingComments(ctor); @@ -5103,14 +5103,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(" {"); increaseIndent(); - scopeEmitStart(node); + pushScope(node); writeLine(); emitConstructor(node, baseTypeNode); emitMemberFunctionsForES6AndHigher(node); decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); - scopeEmitEnd(); + popScope(); // TODO(rbuckton): Need to go back to `let _a = class C {}` approach, removing the defineProperty call for now. @@ -5197,7 +5197,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi tempParameters = undefined; computedPropertyNamesToGeneratedNames = undefined; increaseIndent(); - scopeEmitStart(node); + pushScope(node); if (baseTypeNode) { writeLine(); emitStart(baseTypeNode); @@ -5230,7 +5230,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); - scopeEmitEnd(); + popScope(); emitStart(node); write(")("); if (baseTypeNode) { @@ -5792,12 +5792,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi emitEnd(node.name); write(") {"); increaseIndent(); - scopeEmitStart(node); + pushScope(node); emitLines(node.members); decreaseIndent(); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); - scopeEmitEnd(); + popScope(); write(")("); emitModuleMemberName(node); write(" || ("); @@ -5921,7 +5921,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi else { write("{"); increaseIndent(); - scopeEmitStart(node); + pushScope(node); emitCaptureThisForNodeIfNecessary(node); writeLine(); emit(node.body); @@ -5929,7 +5929,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); const moduleBlock = getInnerMostModuleDeclarationFromDottedModule(node).body; emitToken(SyntaxKind.CloseBraceToken, moduleBlock.statements.end); - scopeEmitEnd(); + popScope(); } write(")("); // write moduleDecl = containingModule.m only if it is not exported es6 module member diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index ffb1a7001a965..d29e32135882e 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -22,17 +22,17 @@ namespace ts { export function getNullSourceMapWriter(): SourceMapWriter { if (nullSourceMapWriter === undefined) { nullSourceMapWriter = { - getSourceMapData: nop, - setSourceFile: nop, - emitStart: nop, - emitEnd: nop, - emitPos: nop, - pushScope: nop, - popScope: nop, - getText: nop, - getSourceMappingURL: nop, - initialize: nop, - reset: nop, + getSourceMapData(): SourceMapData { return undefined; }, + setSourceFile(sourceFile: SourceFile): void { }, + emitStart(range: TextRange): void { }, + emitEnd(range: TextRange): void { }, + emitPos(pos: number): void { }, + pushScope(scopeDeclaration: Node, scopeName?: string): void { }, + popScope(): void { }, + getText(): string { return undefined; }, + getSourceMappingURL(): string { return undefined; }, + initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void { }, + reset(): void { }, }; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index e649edf2115b6..e9175a5d5ef64 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2418,14 +2418,10 @@ namespace ts { * 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 : function stringify(value: any): string { - if (Debug.shouldAssert(AssertionLevel.Aggressive)) { - Debug.assert(!hasCycles(value, []), "Detected circular reference before serializing object graph."); - } - - return value === undefined ? undefined : stringifyValue(value); - }; - + export const stringify: (value: any) => string = JSON && JSON.stringify + ? JSON.stringify + : stringifyFallback; + function hasCycles(value: any, stack: any[]) { /* tslint:disable:no-null */ if (typeof value !== "object" || value === null) { @@ -2449,6 +2445,19 @@ namespace ts { return false; } + /** + * 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. + */ + function stringifyFallback(value: any): string { + if (Debug.shouldAssert(AssertionLevel.Aggressive)) { + Debug.assert(!hasCycles(value, []), "Detected circular reference before serializing object graph."); + } + + // 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" From 6bc2c069a6e40e0d903070d5b14460be68296c53 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 25 Nov 2015 13:53:30 -0800 Subject: [PATCH 331/353] Missed linter error. --- src/compiler/utilities.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index e9175a5d5ef64..47941e661f97c 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2418,10 +2418,10 @@ namespace ts { * 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 + export const stringify: (value: any) => string = JSON && JSON.stringify ? JSON.stringify : stringifyFallback; - + function hasCycles(value: any, stack: any[]) { /* tslint:disable:no-null */ if (typeof value !== "object" || value === null) { From 068d10c6bb48d39ef78b2e0dc2119d04fc06eb0b Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Wed, 25 Nov 2015 14:31:46 -0800 Subject: [PATCH 332/353] Add tests for #5173 --- .../errorOnInitializerInObjectType.errors.txt | 17 +++++++++++++++++ .../reference/errorOnInitializerInObjectType.js | 12 ++++++++++++ .../compiler/errorOnInitializerInObjectType.ts | 7 +++++++ 3 files changed, 36 insertions(+) create mode 100644 tests/baselines/reference/errorOnInitializerInObjectType.errors.txt create mode 100644 tests/baselines/reference/errorOnInitializerInObjectType.js create mode 100644 tests/cases/compiler/errorOnInitializerInObjectType.ts diff --git a/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt b/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt new file mode 100644 index 0000000000000..70cefb0e914c1 --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt @@ -0,0 +1,17 @@ +tests/cases/compiler/errorOnInitializerInObjectType.ts(2,17): error TS1246: An object type property cannot have an initializer. +tests/cases/compiler/errorOnInitializerInObjectType.ts(6,17): error TS1246: An object type property cannot have an initializer. + + +==== tests/cases/compiler/errorOnInitializerInObjectType.ts (2 errors) ==== + interface Foo { + bar: number = 5; + ~ +!!! error TS1246: An object type property cannot have an initializer. + } + + var Foo: { + bar: number = 5; + ~ +!!! error TS1246: An object type property cannot have an initializer. + }; + \ No newline at end of file diff --git a/tests/baselines/reference/errorOnInitializerInObjectType.js b/tests/baselines/reference/errorOnInitializerInObjectType.js new file mode 100644 index 0000000000000..59e813fc75cad --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInObjectType.js @@ -0,0 +1,12 @@ +//// [errorOnInitializerInObjectType.ts] +interface Foo { + bar: number = 5; +} + +var Foo: { + bar: number = 5; +}; + + +//// [errorOnInitializerInObjectType.js] +var Foo; diff --git a/tests/cases/compiler/errorOnInitializerInObjectType.ts b/tests/cases/compiler/errorOnInitializerInObjectType.ts new file mode 100644 index 0000000000000..8c536d1a71250 --- /dev/null +++ b/tests/cases/compiler/errorOnInitializerInObjectType.ts @@ -0,0 +1,7 @@ +interface Foo { + bar: number = 5; +} + +var Foo: { + bar: number = 5; +}; From 04d53c1cfed6a01c8f8b84ce95f930c9585bd1a5 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 25 Nov 2015 14:35:44 -0800 Subject: [PATCH 333/353] Simpler inline cycle check for stringify --- src/compiler/utilities.ts | 44 +++++++++++---------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 47941e661f97c..b5eb227b58c2d 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2422,38 +2422,10 @@ namespace ts { ? JSON.stringify : stringifyFallback; - function hasCycles(value: any, stack: any[]) { - /* tslint:disable:no-null */ - if (typeof value !== "object" || value === null) { - return false; - } - /* tslint:enable:no-null */ - - if (stack.lastIndexOf(value) !== -1) { - return true; - } - - stack.push(value); - - for (const key in value) { - if (hasProperty(value, key) && hasCycles(value[key], stack)) { - return true; - } - } - - stack.pop(); - return false; - } - /** - * 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. + * Serialize an object graph into a JSON string. */ function stringifyFallback(value: any): string { - if (Debug.shouldAssert(AssertionLevel.Aggressive)) { - Debug.assert(!hasCycles(value, []), "Detected circular reference before serializing object graph."); - } - // JSON.stringify returns `undefined` here, instead of the string "undefined". return value === undefined ? undefined : stringifyValue(value); } @@ -2462,10 +2434,18 @@ namespace ts { return typeof value === "string" ? `"${escapeString(value)}"` : typeof value === "number" ? isFinite(value) ? String(value) : "null" : typeof value === "boolean" ? value ? "true" : "false" - : typeof value === "object" ? isArray(value) ? stringifyArray(value) : stringifyObject(value) + : 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, "")}]`; } @@ -2475,11 +2455,11 @@ namespace ts { } function stringifyObject(value: any) { - return value ? `{${reduceProperties(value, stringifyProperty, "")}}` : "null"; + return `{${reduceProperties(value, stringifyProperty, "")}}`; } function stringifyProperty(memo: string, value: any, key: string) { - return value === undefined || typeof value === "function" ? memo + return value === undefined || typeof value === "function" || key === "__cycle" ? memo : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`; } From b5c64ad5163203ea1e536ab9ed98a88068ff0ac9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 25 Nov 2015 15:34:25 -0800 Subject: [PATCH 334/353] Test case for binder errors in .js file --- .../reference/jsFileCompilationBindErrors.js | 25 ++++++++++++++++++ .../jsFileCompilationBindErrors.symbols | 21 +++++++++++++++ .../jsFileCompilationBindErrors.types | 26 +++++++++++++++++++ .../compiler/jsFileCompilationBindErrors.ts | 15 +++++++++++ 4 files changed, 87 insertions(+) create mode 100644 tests/baselines/reference/jsFileCompilationBindErrors.js create mode 100644 tests/baselines/reference/jsFileCompilationBindErrors.symbols create mode 100644 tests/baselines/reference/jsFileCompilationBindErrors.types create mode 100644 tests/cases/compiler/jsFileCompilationBindErrors.ts diff --git a/tests/baselines/reference/jsFileCompilationBindErrors.js b/tests/baselines/reference/jsFileCompilationBindErrors.js new file mode 100644 index 0000000000000..e4b515e2b698a --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationBindErrors.js @@ -0,0 +1,25 @@ +//// [a.js] +let C = "sss"; +let C = 0; // Error: Cannot redeclare block-scoped variable 'C'. + +function f() { + return; + return; // Error: Unreachable code detected. +} + +function b() { + "use strict"; + var arguments = 0; // Error: Invalid use of 'arguments' in strict mode. +} + +//// [a.js] +var C = "sss"; +var C = 0; // Error: Cannot redeclare block-scoped variable 'C'. +function f() { + return; + return; // Error: Unreachable code detected. +} +function b() { + "use strict"; + var arguments = 0; // Error: Invalid use of 'arguments' in strict mode. +} diff --git a/tests/baselines/reference/jsFileCompilationBindErrors.symbols b/tests/baselines/reference/jsFileCompilationBindErrors.symbols new file mode 100644 index 0000000000000..6ad06da1df61c --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationBindErrors.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/a.js === +let C = "sss"; +>C : Symbol(C, Decl(a.js, 0, 3)) + +let C = 0; // Error: Cannot redeclare block-scoped variable 'C'. +>C : Symbol(C, Decl(a.js, 1, 3)) + +function f() { +>f : Symbol(f, Decl(a.js, 1, 10)) + + return; + return; // Error: Unreachable code detected. +} + +function b() { +>b : Symbol(b, Decl(a.js, 6, 1)) + + "use strict"; + var arguments = 0; // Error: Invalid use of 'arguments' in strict mode. +>arguments : Symbol(arguments, Decl(a.js, 10, 7)) +} diff --git a/tests/baselines/reference/jsFileCompilationBindErrors.types b/tests/baselines/reference/jsFileCompilationBindErrors.types new file mode 100644 index 0000000000000..113bcd08bc91b --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationBindErrors.types @@ -0,0 +1,26 @@ +=== tests/cases/compiler/a.js === +let C = "sss"; +>C : string +>"sss" : string + +let C = 0; // Error: Cannot redeclare block-scoped variable 'C'. +>C : number +>0 : number + +function f() { +>f : () => void + + return; + return; // Error: Unreachable code detected. +} + +function b() { +>b : () => void + + "use strict"; +>"use strict" : string + + var arguments = 0; // Error: Invalid use of 'arguments' in strict mode. +>arguments : number +>0 : number +} diff --git a/tests/cases/compiler/jsFileCompilationBindErrors.ts b/tests/cases/compiler/jsFileCompilationBindErrors.ts new file mode 100644 index 0000000000000..37bdbc62916a0 --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationBindErrors.ts @@ -0,0 +1,15 @@ +// @allowJs: true +// @noEmit: true +// @filename: a.js +let C = "sss"; +let C = 0; // Error: Cannot redeclare block-scoped variable 'C'. + +function f() { + return; + return; // Error: Unreachable code detected. +} + +function b() { + "use strict"; + var arguments = 0; // Error: Invalid use of 'arguments' in strict mode. +} \ No newline at end of file From 39266849f14121bef62637cd87b60f12b0f239eb Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 25 Nov 2015 16:58:44 -0800 Subject: [PATCH 335/353] accept projects tests baselines --- .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ .../amd/bin/test.d.ts | 28 +++++++++++++++++++ 9 files changed, 252 insertions(+) create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts new file mode 100644 index 0000000000000..d42fc1cd136e8 --- /dev/null +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts @@ -0,0 +1,28 @@ +declare module "outputdir_module_multifolder/ref/m1" { + export var m1_a1: number; + export class m1_c1 { + m1_c1_p1: number; + } + export var m1_instance1: m1_c1; + export function m1_f1(): m1_c1; +} +declare module "outputdir_module_multifolder_ref/m2" { + export var m2_a1: number; + export class m2_c1 { + m2_c1_p1: number; + } + export var m2_instance1: m2_c1; + export function m2_f1(): m2_c1; +} +declare module "test" { + import m1 = require("outputdir_module_multifolder/ref/m1"); + import m2 = require("outputdir_module_multifolder_ref/m2"); + export var a1: number; + export class c1 { + p1: number; + } + export var instance1: c1; + export function f1(): c1; + export var a2: typeof m1.m1_c1; + export var a3: typeof m2.m2_c1; +} From adc3f2bd199c5441c7922164bba005ba26eb5a9d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 25 Nov 2015 17:27:07 -0800 Subject: [PATCH 336/353] update description --- src/compiler/commandLineParser.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 8ec47fcffef7b..034b7022e8232 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -283,7 +283,7 @@ namespace ts { { name: "allowSyntheticDefaultImports", type: "boolean", - description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export + description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking }, { name: "allowJs", diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 9646353d8f8b9..882fd41d6d493 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2109,7 +2109,7 @@ "category": "Message", "code": 6010 }, - "Allow default imports from modules with no default export": { + "Allow default imports from modules with no default export. This does not affect code emit, just typechecking.": { "category": "Message", "code": 6011 }, From 62fb5e85e4d432faa241778b06015a636738f8d1 Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 25 Nov 2015 17:33:11 -0800 Subject: [PATCH 337/353] Include debug assert --- src/services/services.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index b53ff02e195da..ea5a4a027ccfa 100644 --- a/src/services/services.ts +++ b/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,7 +4248,8 @@ namespace ts { else { // Method/function type parameter let declaration = getDeclarationOfKind(symbol, SyntaxKind.TypeParameter); - declaration = declaration ? declaration.parent : undefined; + Debug.assert(declaration !== undefined); + declaration = declaration.parent; if (declaration) { if (isFunctionLikeKind(declaration.kind)) { From 2198988e7be39ba227a46f128944d1b72f227fd2 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 25 Nov 2015 17:46:27 -0800 Subject: [PATCH 338/353] accept baselines --- .../baselines/reference/decoratedDefaultExportsGetExportedAmd.js | 1 + .../reference/decoratedDefaultExportsGetExportedCommonjs.js | 1 + .../reference/decoratedDefaultExportsGetExportedSystem.js | 1 + .../baselines/reference/decoratedDefaultExportsGetExportedUmd.js | 1 + tests/baselines/reference/defaultExportsGetExportedAmd.js | 1 + tests/baselines/reference/defaultExportsGetExportedCommonjs.js | 1 + tests/baselines/reference/defaultExportsGetExportedSystem.js | 1 + tests/baselines/reference/defaultExportsGetExportedUmd.js | 1 + 8 files changed, 8 insertions(+) diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js index 441d8b0d70a95..3fb23375f0273 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; define(["require", "exports"], function (require, exports) { + "use strict"; var decorator; let Foo = class { }; diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js index 8818241c9b57f..32acfbbea3991 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -7,6 +7,7 @@ export default class Foo {} //// [decoratedDefaultExportsGetExportedCommonjs.js] +"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js index 1ae54560ae3a8..a2b22e4ccdbec 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js @@ -8,6 +8,7 @@ export default class Foo {} //// [decoratedDefaultExportsGetExportedSystem.js] System.register([], function(exports_1) { + "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js index 118af702fc11f..06cee476b5761 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; var decorator; let Foo = class { }; diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js index 4eba3ba960039..b9387a2cc84d8 100644 --- a/tests/baselines/reference/defaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js @@ -4,6 +4,7 @@ export default class Foo {} //// [defaultExportsGetExportedAmd.js] define(["require", "exports"], function (require, exports) { + "use strict"; class Foo { } exports.default = Foo; diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js index a19b99fe9d319..28301251efc90 100644 --- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js @@ -3,6 +3,7 @@ export default class Foo {} //// [defaultExportsGetExportedCommonjs.js] +"use strict"; class Foo { } exports.default = Foo; diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.js b/tests/baselines/reference/defaultExportsGetExportedSystem.js index 1f1a7c9dea6fc..7d5c6ee28543f 100644 --- a/tests/baselines/reference/defaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/defaultExportsGetExportedSystem.js @@ -4,6 +4,7 @@ export default class Foo {} //// [defaultExportsGetExportedSystem.js] System.register([], function(exports_1) { + "use strict"; var Foo; return { setters:[], diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js index ed3639ace55d1..902fc89c1d41b 100644 --- a/tests/baselines/reference/defaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js @@ -11,6 +11,7 @@ export default class Foo {} define(["require", "exports"], factory); } })(function (require, exports) { + "use strict"; class Foo { } exports.default = Foo; From fd5f4404cb4bed07c234ec468d7ab9815cc59a73 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 25 Nov 2015 18:22:44 -0800 Subject: [PATCH 339/353] accept new baselines --- tests/baselines/reference/allowSyntheticDefaultImports1.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports2.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports3.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports4.js | 1 + tests/baselines/reference/allowSyntheticDefaultImports5.js | 1 + tests/baselines/reference/allowSyntheticDefaultImports6.js | 1 + 6 files changed, 9 insertions(+) diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js index bc78725cb1c5b..699880f930ccb 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports1.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -11,6 +11,7 @@ export class Foo { //// [b.js] +"use strict"; var Foo = (function () { function Foo() { } @@ -18,5 +19,6 @@ var Foo = (function () { })(); exports.Foo = Foo; //// [a.js] +"use strict"; var b_1 = require("./b"); exports.x = new b_1["default"].Foo(); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js index 3c1981bee9bd0..d21750c65fc31 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports2.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js @@ -11,6 +11,7 @@ export class Foo { //// [b.js] System.register([], function(exports_1) { + "use strict"; var Foo; return { setters:[], @@ -26,6 +27,7 @@ System.register([], function(exports_1) { }); //// [a.js] System.register(["./b"], function(exports_1) { + "use strict"; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js index 2345ad65d107a..8864a28e7960d 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports3.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js @@ -12,6 +12,7 @@ export class Foo { //// [b.js] System.register([], function(exports_1) { + "use strict"; var Foo; return { setters:[], @@ -27,6 +28,7 @@ System.register([], function(exports_1) { }); //// [a.js] System.register(["./b"], function(exports_1) { + "use strict"; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js index 583d4f0bc9235..747f59dc904fd 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports4.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js @@ -12,5 +12,6 @@ export var x = new Foo(); //// [a.js] +"use strict"; var b_1 = require("./b"); exports.x = new b_1["default"](); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.js b/tests/baselines/reference/allowSyntheticDefaultImports5.js index e1528e2791521..c9121512b610c 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports5.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports5.js @@ -13,6 +13,7 @@ export var x = new Foo(); //// [a.js] System.register(["./b"], function(exports_1) { + "use strict"; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.js b/tests/baselines/reference/allowSyntheticDefaultImports6.js index 0e27ce127d82e..64d52e70af9d7 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports6.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports6.js @@ -13,6 +13,7 @@ export var x = new Foo(); //// [a.js] System.register(["./b"], function(exports_1) { + "use strict"; var b_1; var x; return { From 6c755c90db635d698449ad104a274b6eabaabd90 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 27 Nov 2015 18:11:28 -0800 Subject: [PATCH 340/353] Report property errors in the checker instead of the parser --- src/compiler/checker.ts | 30 ++++++++++++++++--- src/compiler/diagnosticMessages.json | 6 +++- src/compiler/parser.ts | 7 ++--- src/compiler/types.ts | 1 + ...nInitializerInInterfaceProperty.errors.txt | 10 +++++++ .../errorOnInitializerInInterfaceProperty.js | 7 +++++ .../errorOnInitializerInObjectType.errors.txt | 17 ----------- .../errorOnInitializerInObjectType.js | 12 -------- ...izerInObjectTypeLiteralProperty.errors.txt | 17 +++++++++++ ...nInitializerInObjectTypeLiteralProperty.js | 13 ++++++++ .../objectTypeLiteralSyntax2.errors.txt | 10 +++++-- .../errorOnInitializerInInterfaceProperty.ts | 3 ++ ...InitializerInObjectTypeLiteralProperty.ts} | 14 ++++----- 13 files changed, 100 insertions(+), 47 deletions(-) create mode 100644 tests/baselines/reference/errorOnInitializerInInterfaceProperty.errors.txt create mode 100644 tests/baselines/reference/errorOnInitializerInInterfaceProperty.js delete mode 100644 tests/baselines/reference/errorOnInitializerInObjectType.errors.txt delete mode 100644 tests/baselines/reference/errorOnInitializerInObjectType.js create mode 100644 tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt create mode 100644 tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.js create mode 100644 tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts rename tests/cases/compiler/{errorOnInitializerInObjectType.ts => errorOnInitializerInObjectTypeLiteralProperty.ts} (73%) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1b6b31f958697..0b889a42045d4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -532,7 +532,7 @@ namespace ts { } // Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. + // yet we never want to treat an export specifier as putting a member in scope. // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol @@ -11398,7 +11398,7 @@ namespace ts { // we can get here in two cases // 1. mixed static and instance class members // 2. something with the same name was defined before the set of overloads that prevents them from merging - // here we'll report error only for the first case since for second we should already report error in binder + // here we'll report error only for the first case since for second we should already report error in binder if (reportError) { const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; error(errorNode, diagnostic); @@ -12065,8 +12065,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 @@ -15735,6 +15735,16 @@ namespace ts { } } + // Report an error if an interface property has an initializer + if (node.members) { + const members = >node.members; + for (const element of members) { + if (element.initializer) { + return grammarErrorOnFirstToken(element.initializer, Diagnostics.An_interface_property_cannot_have_an_initializer); + } + } + } + return false; } @@ -16085,6 +16095,18 @@ namespace ts { } } + if (node.type) { + const typeLiteralNode = node.type; + if (typeLiteralNode.members) { + for (const element of typeLiteralNode.members) { + const propertySignature = element; + if (propertySignature.initializer) { + return grammarErrorOnNode(propertySignature.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer); + } + } + } + } + const checkLetConstNames = languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node)); // 1. LexicalDeclaration : LetOrConst BindingList ; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index e5a5e832b4d6a..e3ae2a6706ca2 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -783,10 +783,14 @@ "category": "Error", "code": 1245 }, - "An object type property cannot have an initializer.": { + "An interface property cannot have an initializer.": { "category": "Error", "code": 1246 }, + "An object type literal property cannot have an initializer.": { + "category": "Error", + "code": 1247 + }, "'with' statements are not allowed in an async function block.": { "category": "Error", diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 4a7ed6a7756c8..2c68ea66babc1 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2249,10 +2249,9 @@ namespace ts { property.type = parseTypeAnnotation(); // Although object type properties cannot not have initializers, we attempt to parse an initializer - // so we can report that an object type property cannot have an initializer. - if (token === SyntaxKind.EqualsToken && lookAhead(() => parseNonParameterInitializer()) !== undefined) { - parseErrorAtCurrentToken(Diagnostics.An_object_type_property_cannot_have_an_initializer); - } + // so we can report in the checker that an interface property or object type literal property cannot + // have an initializer. + property.initializer = parseNonParameterInitializer(); parseTypeMemberSemicolon(); return finishNode(property); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9edd7654b6b47..58250c9dc5ee9 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -586,6 +586,7 @@ namespace ts { name: PropertyName; // Declared property name questionToken?: Node; // Present on optional property type?: TypeNode; // Optional type annotation + initializer?: Expression; // Optional initializer } // @kind(SyntaxKind.PropertyDeclaration) diff --git a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.errors.txt b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.errors.txt new file mode 100644 index 0000000000000..03e899e7c2dee --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.errors.txt @@ -0,0 +1,10 @@ +tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts(2,19): error TS1246: An interface property cannot have an initializer. + + +==== tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts (1 errors) ==== + interface Foo { + bar: number = 5; + ~ +!!! error TS1246: An interface property cannot have an initializer. + } + \ No newline at end of file diff --git a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.js b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.js new file mode 100644 index 0000000000000..c40a3cfb43d19 --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.js @@ -0,0 +1,7 @@ +//// [errorOnInitializerInInterfaceProperty.ts] +interface Foo { + bar: number = 5; +} + + +//// [errorOnInitializerInInterfaceProperty.js] diff --git a/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt b/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt deleted file mode 100644 index 70cefb0e914c1..0000000000000 --- a/tests/baselines/reference/errorOnInitializerInObjectType.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/errorOnInitializerInObjectType.ts(2,17): error TS1246: An object type property cannot have an initializer. -tests/cases/compiler/errorOnInitializerInObjectType.ts(6,17): error TS1246: An object type property cannot have an initializer. - - -==== tests/cases/compiler/errorOnInitializerInObjectType.ts (2 errors) ==== - interface Foo { - bar: number = 5; - ~ -!!! error TS1246: An object type property cannot have an initializer. - } - - var Foo: { - bar: number = 5; - ~ -!!! error TS1246: An object type property cannot have an initializer. - }; - \ No newline at end of file diff --git a/tests/baselines/reference/errorOnInitializerInObjectType.js b/tests/baselines/reference/errorOnInitializerInObjectType.js deleted file mode 100644 index 59e813fc75cad..0000000000000 --- a/tests/baselines/reference/errorOnInitializerInObjectType.js +++ /dev/null @@ -1,12 +0,0 @@ -//// [errorOnInitializerInObjectType.ts] -interface Foo { - bar: number = 5; -} - -var Foo: { - bar: number = 5; -}; - - -//// [errorOnInitializerInObjectType.js] -var Foo; diff --git a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt new file mode 100644 index 0000000000000..d79cced45c7b2 --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt @@ -0,0 +1,17 @@ +tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(2,19): error TS1247: An object type literal property cannot have an initializer. +tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(6,19): error TS1247: An object type literal property cannot have an initializer. + + +==== tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts (2 errors) ==== + var Foo: { + bar: number = 5; + ~ +!!! error TS1247: An object type literal property cannot have an initializer. + }; + + let Bar: { + bar: number = 5; + ~ +!!! error TS1247: An object type literal property cannot have an initializer. + }; + \ No newline at end of file diff --git a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.js b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.js new file mode 100644 index 0000000000000..4dcc0b7dce67c --- /dev/null +++ b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.js @@ -0,0 +1,13 @@ +//// [errorOnInitializerInObjectTypeLiteralProperty.ts] +var Foo: { + bar: number = 5; +}; + +let Bar: { + bar: number = 5; +}; + + +//// [errorOnInitializerInObjectTypeLiteralProperty.js] +var Foo; +var Bar; diff --git a/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt b/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt index 00442f4f87d1d..e4f923def5865 100644 --- a/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt +++ b/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt @@ -1,7 +1,9 @@ -tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS1005: ';' expected. +tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS1005: '=' expected. +tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS2304: Cannot find name 'bar'. +tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,25): error TS1005: ';' expected. -==== tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts (1 errors) ==== +==== tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts (3 errors) ==== var x: { foo: string, bar: string @@ -15,4 +17,8 @@ tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,2 var z: { foo: string bar: string } ~~~ +!!! error TS1005: '=' expected. + ~~~ +!!! error TS2304: Cannot find name 'bar'. + ~ !!! error TS1005: ';' expected. \ No newline at end of file diff --git a/tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts b/tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts new file mode 100644 index 0000000000000..ac600103e7252 --- /dev/null +++ b/tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts @@ -0,0 +1,3 @@ +interface Foo { + bar: number = 5; +} diff --git a/tests/cases/compiler/errorOnInitializerInObjectType.ts b/tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts similarity index 73% rename from tests/cases/compiler/errorOnInitializerInObjectType.ts rename to tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts index 8c536d1a71250..a02f8b0f709a1 100644 --- a/tests/cases/compiler/errorOnInitializerInObjectType.ts +++ b/tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts @@ -1,7 +1,7 @@ -interface Foo { - bar: number = 5; -} - -var Foo: { - bar: number = 5; -}; +var Foo: { + bar: number = 5; +}; + +let Bar: { + bar: number = 5; +}; From d9d67d90038270694696d4d77305582ffe64bae9 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Fri, 27 Nov 2015 22:17:35 -0800 Subject: [PATCH 341/353] Move initializer checks into checkGrammarProperty --- src/compiler/checker.ts | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0b889a42045d4..50189b03406a4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15735,16 +15735,6 @@ namespace ts { } } - // Report an error if an interface property has an initializer - if (node.members) { - const members = >node.members; - for (const element of members) { - if (element.initializer) { - return grammarErrorOnFirstToken(element.initializer, Diagnostics.An_interface_property_cannot_have_an_initializer); - } - } - } - return false; } @@ -16095,18 +16085,6 @@ namespace ts { } } - if (node.type) { - const typeLiteralNode = node.type; - if (typeLiteralNode.members) { - for (const element of typeLiteralNode.members) { - const propertySignature = element; - if (propertySignature.initializer) { - return grammarErrorOnNode(propertySignature.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer); - } - } - } - } - const checkLetConstNames = languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node)); // 1. LexicalDeclaration : LetOrConst BindingList ; @@ -16249,11 +16227,17 @@ namespace ts { if (checkGrammarForNonSymbolComputedProperty(node.name, Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) { return true; } + if (node.initializer) { + return grammarErrorOnNode(node.initializer, Diagnostics.An_interface_property_cannot_have_an_initializer); + } } else if (node.parent.kind === SyntaxKind.TypeLiteral) { if (checkGrammarForNonSymbolComputedProperty(node.name, Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) { return true; } + if (node.initializer) { + return grammarErrorOnNode(node.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer); + } } if (isInAmbientContext(node) && node.initializer) { From ed453ddcfc8c578aaacccd9fb05368f89987e611 Mon Sep 17 00:00:00 2001 From: Jeffrey Morlan Date: Sat, 28 Nov 2015 10:41:37 -0800 Subject: [PATCH 342/353] Add comment --- src/compiler/checker.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c13f678261c11..c09d36bcd34c8 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11205,6 +11205,8 @@ namespace ts { seen = c === node; } }); + // We may be here because of some extra junk between overloads that could not be parsed into a valid node. + // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here. if (subsequentNode && subsequentNode.pos === node.end) { if (subsequentNode.kind === node.kind) { const errorNode: Node = (subsequentNode).name || subsequentNode; From e363c7582ba3f9d4871b0c57d9f25b9c7050cd22 Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Sat, 28 Nov 2015 17:24:34 -0800 Subject: [PATCH 343/353] Revert baseline changes to the objectTypeLiteralSyntax2 test --- src/compiler/parser.ts | 10 ++++++---- .../reference/objectTypeLiteralSyntax2.errors.txt | 10 ++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 2c68ea66babc1..f5261b62aec27 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2248,10 +2248,12 @@ namespace ts { property.questionToken = questionToken; property.type = parseTypeAnnotation(); - // Although object type properties cannot not have initializers, we attempt to parse an initializer - // so we can report in the checker that an interface property or object type literal property cannot - // have an initializer. - property.initializer = parseNonParameterInitializer(); + if (token === SyntaxKind.EqualsToken) { + // Although object type properties cannot not have initializers, we attempt + // to parse an initializer so we can report in the checker that an interface + // property or object type literal property cannot have an initializer. + property.initializer = parseNonParameterInitializer(); + } parseTypeMemberSemicolon(); return finishNode(property); diff --git a/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt b/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt index e4f923def5865..00442f4f87d1d 100644 --- a/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt +++ b/tests/baselines/reference/objectTypeLiteralSyntax2.errors.txt @@ -1,9 +1,7 @@ -tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS1005: '=' expected. -tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS2304: Cannot find name 'bar'. -tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,25): error TS1005: ';' expected. +tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,22): error TS1005: ';' expected. -==== tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts (3 errors) ==== +==== tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts (1 errors) ==== var x: { foo: string, bar: string @@ -17,8 +15,4 @@ tests/cases/conformance/types/objectTypeLiteral/objectTypeLiteralSyntax2.ts(12,2 var z: { foo: string bar: string } ~~~ -!!! error TS1005: '=' expected. - ~~~ -!!! error TS2304: Cannot find name 'bar'. - ~ !!! error TS1005: ';' expected. \ No newline at end of file From d0e4a4ca92b3d6ddc98537e02e605004809ff558 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 28 Nov 2015 23:20:53 -0800 Subject: [PATCH 344/353] do not report 'noImplicitReturns' error if inferred return type of the function is void/any --- src/compiler/checker.ts | 37 ++++++++++++------- .../reference/reachabilityChecks6.errors.txt | 5 +-- .../reference/reachabilityChecks7.errors.txt | 32 ++++++++++++---- .../reference/reachabilityChecks7.js | 37 ++++++++++++++++++- tests/cases/compiler/reachabilityChecks7.ts | 20 +++++++++- 5 files changed, 104 insertions(+), 27 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7f20c5421285f..6677d14b72fa6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9871,31 +9871,40 @@ 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 of 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){ + // errors in this branch should only be reported if CompilerOptions.noImplicitReturns flag is set + 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 { diff --git a/tests/baselines/reference/reachabilityChecks6.errors.txt b/tests/baselines/reference/reachabilityChecks6.errors.txt index 5b78891afb381..38e72def8c680 100644 --- a/tests/baselines/reference/reachabilityChecks6.errors.txt +++ b/tests/baselines/reference/reachabilityChecks6.errors.txt @@ -1,5 +1,4 @@ tests/cases/compiler/reachabilityChecks6.ts(6,10): error TS7030: Not all code paths return a value. -tests/cases/compiler/reachabilityChecks6.ts(19,10): error TS7030: Not all code paths return a value. tests/cases/compiler/reachabilityChecks6.ts(31,10): error TS7030: Not all code paths return a value. tests/cases/compiler/reachabilityChecks6.ts(41,10): error TS7030: Not all code paths return a value. tests/cases/compiler/reachabilityChecks6.ts(52,10): error TS7030: Not all code paths return a value. @@ -10,7 +9,7 @@ tests/cases/compiler/reachabilityChecks6.ts(116,10): error TS7030: Not all code tests/cases/compiler/reachabilityChecks6.ts(123,13): error TS7027: Unreachable code detected. -==== tests/cases/compiler/reachabilityChecks6.ts (10 errors) ==== +==== tests/cases/compiler/reachabilityChecks6.ts (9 errors) ==== function f0(x) { while (true); @@ -32,8 +31,6 @@ tests/cases/compiler/reachabilityChecks6.ts(123,13): error TS7027: Unreachable c } function f3(x) { - ~~ -!!! error TS7030: Not all code paths return a value. while (x) { throw new Error(); } diff --git a/tests/baselines/reference/reachabilityChecks7.errors.txt b/tests/baselines/reference/reachabilityChecks7.errors.txt index 9e8f803f957eb..1596c7d9a3bc3 100644 --- a/tests/baselines/reference/reachabilityChecks7.errors.txt +++ b/tests/baselines/reference/reachabilityChecks7.errors.txt @@ -1,21 +1,39 @@ -tests/cases/compiler/reachabilityChecks7.ts(3,16): error TS7030: Not all code paths return a value. -tests/cases/compiler/reachabilityChecks7.ts(6,9): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks7.ts(14,16): error TS7030: Not all code paths return a value. +tests/cases/compiler/reachabilityChecks7.ts(18,22): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. ==== tests/cases/compiler/reachabilityChecks7.ts (2 errors) ==== // async function without return type annotation - error async function f1() { - ~~ -!!! error TS7030: Not all code paths return a value. } let x = async function() { - ~~~~~ -!!! error TS7030: Not all code paths return a value. } // async function with which promised type is void - return can be omitted async function f2(): Promise { - } \ No newline at end of file + } + + async function f3(x) { + ~~ +!!! error TS7030: Not all code paths return a value. + if (x) return 10; + } + + async function f4(): Promise { + ~~~~~~~~~~~~~~~ +!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. + + } + + function voidFunc(): void { + } + + function calltoVoidFunc(x) { + if (x) return voidFunc(); + } + + declare function use(s: string): void; + let x1 = () => { use("Test"); } \ No newline at end of file diff --git a/tests/baselines/reference/reachabilityChecks7.js b/tests/baselines/reference/reachabilityChecks7.js index f9579d5828d93..c78f99953e9cb 100644 --- a/tests/baselines/reference/reachabilityChecks7.js +++ b/tests/baselines/reference/reachabilityChecks7.js @@ -10,7 +10,25 @@ let x = async function() { // async function with which promised type is void - return can be omitted async function f2(): Promise { -} +} + +async function f3(x) { + if (x) return 10; +} + +async function f4(): Promise { + +} + +function voidFunc(): void { +} + +function calltoVoidFunc(x) { + if (x) return voidFunc(); +} + +declare function use(s: string): void; +let x1 = () => { use("Test"); } //// [reachabilityChecks7.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { @@ -40,3 +58,20 @@ function f2() { return __awaiter(this, void 0, Promise, function* () { }); } +function f3(x) { + return __awaiter(this, void 0, Promise, function* () { + if (x) + return 10; + }); +} +function f4() { + return __awaiter(this, void 0, Promise, function* () { + }); +} +function voidFunc() { +} +function calltoVoidFunc(x) { + if (x) + return voidFunc(); +} +let x1 = () => { use("Test"); }; diff --git a/tests/cases/compiler/reachabilityChecks7.ts b/tests/cases/compiler/reachabilityChecks7.ts index 11febb320d639..53702037e3fe0 100644 --- a/tests/cases/compiler/reachabilityChecks7.ts +++ b/tests/cases/compiler/reachabilityChecks7.ts @@ -11,4 +11,22 @@ let x = async function() { // async function with which promised type is void - return can be omitted async function f2(): Promise { -} \ No newline at end of file +} + +async function f3(x) { + if (x) return 10; +} + +async function f4(): Promise { + +} + +function voidFunc(): void { +} + +function calltoVoidFunc(x) { + if (x) return voidFunc(); +} + +declare function use(s: string): void; +let x1 = () => { use("Test"); } \ No newline at end of file From 7f8bf731bdc761cea94c1881a734359d5e37ff04 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 29 Nov 2015 15:16:30 -0800 Subject: [PATCH 345/353] fix lint errors --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6677d14b72fa6..a803bd8ba4223 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9882,14 +9882,14 @@ namespace ts { } 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){ + else if (compilerOptions.noImplicitReturns) { // errors in this branch should only be reported if CompilerOptions.noImplicitReturns flag is set if (!returnType) { // If return type annotation is omitted check if function has any explicit return statements. @@ -9898,7 +9898,7 @@ namespace ts { const inferredReturnType = hasExplicitReturn ? getReturnTypeOfSignature(getSignatureFromDeclaration(func)) : voidType; - + if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) { return; } From 9552d4da4471aa44e5f1c7e437f9901d1197bea9 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 29 Nov 2015 21:17:31 -0800 Subject: [PATCH 346/353] ignore all trivia except singleline comments when processing tripleslash references --- src/compiler/parser.ts | 10 ++++---- .../reference/shebangBeforeReferences.js | 21 ++++++++++++++++ .../reference/shebangBeforeReferences.symbols | 23 ++++++++++++++++++ .../reference/shebangBeforeReferences.types | 24 +++++++++++++++++++ .../cases/compiler/shebangBeforeReferences.ts | 15 ++++++++++++ 5 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/shebangBeforeReferences.js create mode 100644 tests/baselines/reference/shebangBeforeReferences.symbols create mode 100644 tests/baselines/reference/shebangBeforeReferences.types create mode 100644 tests/cases/compiler/shebangBeforeReferences.ts diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index cb96731dbcf68..e917ef9bfe6e1 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -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() }; diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js new file mode 100644 index 0000000000000..6be2707277d0b --- /dev/null +++ b/tests/baselines/reference/shebangBeforeReferences.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/shebangBeforeReferences.ts] //// + +//// [f.d.ts] + +declare module "test" { + let x: number; +} + +//// [f.ts] +#!/usr/bin/env node + +/// + +declare function use(f: number): void; +import {x} from "test"; +use(x); + +//// [f.js] +#!/usr/bin/env node"use strict"; +var test_1 = require("test"); +use(test_1.x); diff --git a/tests/baselines/reference/shebangBeforeReferences.symbols b/tests/baselines/reference/shebangBeforeReferences.symbols new file mode 100644 index 0000000000000..23bfe58fc6294 --- /dev/null +++ b/tests/baselines/reference/shebangBeforeReferences.symbols @@ -0,0 +1,23 @@ +=== tests/cases/compiler/f.ts === +#!/usr/bin/env node + +/// + +declare function use(f: number): void; +>use : Symbol(use, Decl(f.ts, 0, 0)) +>f : Symbol(f, Decl(f.ts, 4, 21)) + +import {x} from "test"; +>x : Symbol(x, Decl(f.ts, 5, 8)) + +use(x); +>use : Symbol(use, Decl(f.ts, 0, 0)) +>x : Symbol(x, Decl(f.ts, 5, 8)) + +=== tests/cases/compiler/f.d.ts === + +declare module "test" { + let x: number; +>x : Symbol(x, Decl(f.d.ts, 2, 7)) +} + diff --git a/tests/baselines/reference/shebangBeforeReferences.types b/tests/baselines/reference/shebangBeforeReferences.types new file mode 100644 index 0000000000000..89b63a1a0b440 --- /dev/null +++ b/tests/baselines/reference/shebangBeforeReferences.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/f.ts === +#!/usr/bin/env node + +/// + +declare function use(f: number): void; +>use : (f: number) => void +>f : number + +import {x} from "test"; +>x : number + +use(x); +>use(x) : void +>use : (f: number) => void +>x : number + +=== tests/cases/compiler/f.d.ts === + +declare module "test" { + let x: number; +>x : number +} + diff --git a/tests/cases/compiler/shebangBeforeReferences.ts b/tests/cases/compiler/shebangBeforeReferences.ts new file mode 100644 index 0000000000000..f03933959ee6a --- /dev/null +++ b/tests/cases/compiler/shebangBeforeReferences.ts @@ -0,0 +1,15 @@ +// @module: commonjs + +// @filename: f.d.ts +declare module "test" { + let x: number; +} + +// @filename: f.ts +#!/usr/bin/env node + +/// + +declare function use(f: number): void; +import {x} from "test"; +use(x); \ No newline at end of file From 2cc7a7904ac932f3d2fce7afc1d2b16b1723527a Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 30 Nov 2015 09:10:14 -0800 Subject: [PATCH 347/353] use const --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index 18fa58a74f70e..4e0a0265b9193 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -4254,7 +4254,7 @@ namespace ts { if (declaration) { if (isFunctionLikeKind(declaration.kind)) { - let signature = typeChecker.getSignatureFromDeclaration(declaration); + const signature = typeChecker.getSignatureFromDeclaration(declaration); if (declaration.kind === SyntaxKind.ConstructSignature) { displayParts.push(keywordPart(SyntaxKind.NewKeyword)); displayParts.push(spacePart()); From 6ff567927408665ef68062061ac2b9102d6ef053 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 30 Nov 2015 09:34:32 -0800 Subject: [PATCH 348/353] fix typo in comment --- src/compiler/checker.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a803bd8ba4223..545f311148594 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9876,7 +9876,7 @@ namespace ts { } // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check. - // also if HasImplicitReturn flag 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; } @@ -9890,7 +9890,6 @@ namespace ts { error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value); } else if (compilerOptions.noImplicitReturns) { - // errors in this branch should only be reported if CompilerOptions.noImplicitReturns flag is set 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. From 180eba5568f71ae56e032fa2d514add7058d6c8a Mon Sep 17 00:00:00 2001 From: zhengbli Date: Mon, 30 Nov 2015 12:40:41 -0800 Subject: [PATCH 349/353] Sync the dom.generated.d.ts files from TSJS repo --- src/lib/dom.generated.d.ts | 23 +++++++++++++---------- src/lib/webworker.generated.d.ts | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts index ac039198b4bd5..5984505c4cf14 100644 --- a/src/lib/dom.generated.d.ts +++ b/src/lib/dom.generated.d.ts @@ -2058,6 +2058,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven * Gets or sets the version attribute specified in the declaration of an XML document. */ xmlVersion: string; + currentScript: HTMLScriptElement; adoptNode(source: Node): Node; captureEvents(): void; clear(): void; @@ -2977,6 +2978,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec webkitRequestFullScreen(): void; webkitRequestFullscreen(): void; getElementsByClassName(classNames: string): NodeListOf; + matches(selector: string): boolean; addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; @@ -3961,7 +3963,6 @@ interface HTMLElement extends Element { title: string; blur(): void; click(): void; - contains(child: HTMLElement): boolean; dragDrop(): boolean; focus(): void; insertAdjacentElement(position: string, insertedElement: Element): Element; @@ -6135,7 +6136,7 @@ interface HTMLSelectElement extends HTMLElement { * Sets or retrieves the name of the object. */ name: string; - options: HTMLSelectElement; + options: HTMLCollection; /** * When present, marks an element that can't be submitted without a value. */ @@ -6421,19 +6422,19 @@ interface HTMLTableElement extends HTMLElement { /** * Creates an empty caption element in the table. */ - createCaption(): HTMLElement; + createCaption(): HTMLTableCaptionElement; /** * Creates an empty tBody element in the table. */ - createTBody(): HTMLElement; + createTBody(): HTMLTableSectionElement; /** * Creates an empty tFoot element in the table. */ - createTFoot(): HTMLElement; + createTFoot(): HTMLTableSectionElement; /** * Returns the tHead element object if successful, or null otherwise. */ - createTHead(): HTMLElement; + createTHead(): HTMLTableSectionElement; /** * Deletes the caption element and its contents from the table. */ @@ -6455,7 +6456,7 @@ interface HTMLTableElement extends HTMLElement { * Creates a new row (tr) in the table, and adds the row to the rows collection. * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection. */ - insertRow(index?: number): HTMLElement; + insertRow(index?: number): HTMLTableRowElement; } declare var HTMLTableElement: { @@ -6506,7 +6507,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment { * Creates a new cell in the table row, and adds the cell to the cells collection. * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection. */ - insertCell(index?: number): HTMLElement; + insertCell(index?: number): HTMLTableCellElement; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6533,7 +6534,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment { * Creates a new row (tr) in the table, and adds the row to the rows collection. * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection. */ - insertRow(index?: number): HTMLElement; + insertRow(index?: number): HTMLTableRowElement; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7071,7 +7072,7 @@ declare var IDBVersionChangeEvent: { } interface ImageData { - data: number[]; + data: Uint8ClampedArray; height: number; width: number; } @@ -7869,6 +7870,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte getGamepads(): Gamepad[]; javaEnabled(): boolean; msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void; + vibrate(pattern: number | number[]): boolean; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7909,6 +7911,7 @@ interface Node extends EventTarget { normalize(): void; removeChild(oldChild: Node): Node; replaceChild(newChild: Node, oldChild: Node): Node; + contains(node: Node): boolean; ATTRIBUTE_NODE: number; CDATA_SECTION_NODE: number; COMMENT_NODE: number; diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts index a2ed9682f1bb2..8001511a98b93 100644 --- a/src/lib/webworker.generated.d.ts +++ b/src/lib/webworker.generated.d.ts @@ -460,7 +460,7 @@ declare var IDBVersionChangeEvent: { } interface ImageData { - data: number[]; + data: Uint8ClampedArray; height: number; width: number; } From 6d159542cd07d7d557cd7418790f8940e84a0e87 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 30 Nov 2015 13:12:41 -0800 Subject: [PATCH 350/353] Fixes #5564. --- src/compiler/checker.ts | 9 ++++--- tests/baselines/reference/asyncMultiFile.js | 26 +++++++++++++++++++ .../reference/asyncMultiFile.symbols | 8 ++++++ .../baselines/reference/asyncMultiFile.types | 8 ++++++ .../conformance/async/es6/asyncMultiFile.ts | 5 ++++ 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/asyncMultiFile.js create mode 100644 tests/baselines/reference/asyncMultiFile.symbols create mode 100644 tests/baselines/reference/asyncMultiFile.types create mode 100644 tests/cases/conformance/async/es6/asyncMultiFile.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1b6b31f958697..daa5231ad957a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -532,7 +532,7 @@ namespace ts { } // Because of module/namespace merging, a module's exports are in scope, - // yet we never want to treat an export specifier as putting a member in scope. + // yet we never want to treat an export specifier as putting a member in scope. // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope. // Two things to note about this: // 1. We have to check this without calling getSymbol. The problem with calling getSymbol @@ -11398,7 +11398,7 @@ namespace ts { // we can get here in two cases // 1. mixed static and instance class members // 2. something with the same name was defined before the set of overloads that prevents them from merging - // here we'll report error only for the first case since for second we should already report error in binder + // here we'll report error only for the first case since for second we should already report error in binder if (reportError) { const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static; error(errorNode, diagnostic); @@ -12065,8 +12065,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 @@ -14321,6 +14321,7 @@ namespace ts { emitExtends = false; emitDecorate = false; emitParam = false; + emitAwaiter = false; potentialThisCollisions.length = 0; forEach(node.statements, checkSourceElement); diff --git a/tests/baselines/reference/asyncMultiFile.js b/tests/baselines/reference/asyncMultiFile.js new file mode 100644 index 0000000000000..e93dc586255c0 --- /dev/null +++ b/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() { } diff --git a/tests/baselines/reference/asyncMultiFile.symbols b/tests/baselines/reference/asyncMultiFile.symbols new file mode 100644 index 0000000000000..790ceafef8f08 --- /dev/null +++ b/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)) + diff --git a/tests/baselines/reference/asyncMultiFile.types b/tests/baselines/reference/asyncMultiFile.types new file mode 100644 index 0000000000000..70eebc0577a29 --- /dev/null +++ b/tests/baselines/reference/asyncMultiFile.types @@ -0,0 +1,8 @@ +=== tests/cases/conformance/async/es6/a.ts === +async function f() {} +>f : () => Promise + +=== tests/cases/conformance/async/es6/b.ts === +function g() { } +>g : () => void + diff --git a/tests/cases/conformance/async/es6/asyncMultiFile.ts b/tests/cases/conformance/async/es6/asyncMultiFile.ts new file mode 100644 index 0000000000000..55f5e4b9e9224 --- /dev/null +++ b/tests/cases/conformance/async/es6/asyncMultiFile.ts @@ -0,0 +1,5 @@ +// @target: es6 +// @filename: a.ts +async function f() {} +// @filename: b.ts +function g() { } \ No newline at end of file From ccfa625b32aaa8192eba3aa5a42a92b1da83e10b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 30 Nov 2015 14:03:28 -0800 Subject: [PATCH 351/353] var rename as per PR feedback --- src/compiler/emitter.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 35b5bc9f5e87f..6a966aee7a057 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5685,10 +5685,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi function emitDecoratorsOfConstructor(node: ClassLikeDeclaration) { const decorators = node.decorators; const constructor = getFirstConstructorWithBody(node); - const parameterDecorators = constructor && forEach(constructor.parameters, parameter => parameter.decorators); + const firstParameterDecorator = constructor && forEach(constructor.parameters, parameter => parameter.decorators); // skip decoration of the constructor if neither it nor its parameters are decorated - if (!decorators && !parameterDecorators) { + if (!decorators && !firstParameterDecorator) { return; } @@ -5704,7 +5704,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // writeLine(); - emitStart(node.decorators || parameterDecorators); + emitStart(node.decorators || firstParameterDecorator); emitDeclarationName(node); write(" = __decorate(["); increaseIndent(); @@ -5713,7 +5713,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi const decoratorCount = decorators ? decorators.length : 0; let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => emit(decorator.expression)); - if (parameterDecorators) { + if (firstParameterDecorator) { argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0); } emitSerializedTypeMetadata(node, /*leadingComma*/ argumentsWritten >= 0); @@ -5723,7 +5723,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write("], "); emitDeclarationName(node); write(")"); - emitEnd(node.decorators || parameterDecorators); + emitEnd(node.decorators || firstParameterDecorator); write(";"); writeLine(); } @@ -5766,10 +5766,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi functionLikeMember = member; } } - const parameterDecorators = functionLikeMember && forEach(functionLikeMember.parameters, parameter => parameter.decorators); + const firstParameterDecorator = functionLikeMember && forEach(functionLikeMember.parameters, parameter => parameter.decorators); // skip a member if it or any of its parameters are not decorated - if (!decorators && !parameterDecorators) { + if (!decorators && !firstParameterDecorator) { continue; } @@ -5805,7 +5805,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // writeLine(); - emitStart(decorators || parameterDecorators); + emitStart(decorators || firstParameterDecorator); write("__decorate(["); increaseIndent(); writeLine(); @@ -5814,7 +5814,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => emit(decorator.expression)); - if (parameterDecorators) { + if (firstParameterDecorator) { argumentsWritten += emitDecoratorsOfParameters(functionLikeMember, argumentsWritten > 0); } emitSerializedTypeMetadata(member, argumentsWritten > 0); @@ -5840,7 +5840,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } write(")"); - emitEnd(decorators || parameterDecorators); + emitEnd(decorators || firstParameterDecorator); write(";"); writeLine(); } From 144d24c2cb727b21ddcdfac0489a57a852cb2cae Mon Sep 17 00:00:00 2001 From: Nathan Yee Date: Mon, 30 Nov 2015 21:52:50 -0800 Subject: [PATCH 352/353] Change "object type literal" to "type literal" --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- src/compiler/parser.ts | 4 ++-- ...rorOnInitializerInObjectTypeLiteralProperty.errors.txt | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 50189b03406a4..6445f8b13dec1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -16236,7 +16236,7 @@ namespace ts { return true; } if (node.initializer) { - return grammarErrorOnNode(node.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer); + return grammarErrorOnNode(node.initializer, Diagnostics.A_type_literal_property_cannot_have_an_initializer); } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index e3ae2a6706ca2..cd2fa76953693 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -787,7 +787,7 @@ "category": "Error", "code": 1246 }, - "An object type literal property cannot have an initializer.": { + "A type literal property cannot have an initializer.": { "category": "Error", "code": 1247 }, diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index f5261b62aec27..f4ac49a6b6fba 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2249,9 +2249,9 @@ namespace ts { property.type = parseTypeAnnotation(); if (token === SyntaxKind.EqualsToken) { - // Although object type properties cannot not have initializers, we attempt + // Although type literal properties cannot not have initializers, we attempt // to parse an initializer so we can report in the checker that an interface - // property or object type literal property cannot have an initializer. + // property or type literal property cannot have an initializer. property.initializer = parseNonParameterInitializer(); } diff --git a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt index d79cced45c7b2..f6d10b92b2d8f 100644 --- a/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt +++ b/tests/baselines/reference/errorOnInitializerInObjectTypeLiteralProperty.errors.txt @@ -1,17 +1,17 @@ -tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(2,19): error TS1247: An object type literal property cannot have an initializer. -tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(6,19): error TS1247: An object type literal property cannot have an initializer. +tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(2,19): error TS1247: A type literal property cannot have an initializer. +tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts(6,19): error TS1247: A type literal property cannot have an initializer. ==== tests/cases/compiler/errorOnInitializerInObjectTypeLiteralProperty.ts (2 errors) ==== var Foo: { bar: number = 5; ~ -!!! error TS1247: An object type literal property cannot have an initializer. +!!! error TS1247: A type literal property cannot have an initializer. }; let Bar: { bar: number = 5; ~ -!!! error TS1247: An object type literal property cannot have an initializer. +!!! error TS1247: A type literal property cannot have an initializer. }; \ No newline at end of file From c4b0b62bfc694928ed79858d8e9bcb8f2790bb05 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 1 Dec 2015 15:06:53 -0800 Subject: [PATCH 353/353] Merge fixup --- src/compiler/binder.ts | 10 +++++----- src/compiler/checker.ts | 21 ++++++++++++++------- src/compiler/utilities.ts | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 7f0fd2fb3fa50..86fcc809d5850 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1178,8 +1178,8 @@ namespace ts { case SyntaxKind.Identifier: return checkStrictModeIdentifier(node); case SyntaxKind.BinaryExpression: - if (isJavaScriptFile) { - let specialKind = getSpecialPropertyAssignmentKind(node); + if (isInJavaScriptFile(node)) { + const specialKind = getSpecialPropertyAssignmentKind(node); switch (specialKind) { case SpecialPropertyAssignmentKind.ExportsProperty: bindExportsPropertyAssignment(node); @@ -1378,11 +1378,11 @@ namespace ts { // This does two things: turns 'x' into a constructor function, and // adds a member 'y' to the result of that constructor function // Get 'x', the class - let classId = ((node.left).expression).expression; + const classId = ((node.left).expression).expression; // Look up the function in the local scope, since prototype assignments should immediately // follow the function declaration - let funcSymbol = container.locals[classId.text]; + const funcSymbol = container.locals[classId.text]; if (!funcSymbol) { return; } @@ -1397,7 +1397,7 @@ namespace ts { } // Get the exports of the class so we can add the method to it - let funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + const funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); // Declare the method declareSymbol(funcExports.members, funcExports, node.left, SymbolFlags.Method, SymbolFlags.None); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 29e31a84a230f..94c13fd1f3f77 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -123,8 +123,8 @@ namespace ts { const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, false, false); - const unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, false, false); + const anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const globals: SymbolTable = {}; @@ -2661,7 +2661,7 @@ namespace ts { } else { // Declaration for className.prototype in inferred JS class - let type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); + const type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); return links.type = type; } } @@ -3930,9 +3930,9 @@ namespace ts { default: if (declaration.symbol.inferredConstructor) { kind = SignatureKind.Construct; - let members = createSymbolTable(emptyArray); + const members = createSymbolTable(emptyArray); // Collect methods declared with className.protoype.methodName = ... - let proto = declaration.symbol.exports["prototype"]; + const proto = declaration.symbol.exports["prototype"]; if (proto) { mergeSymbolTable(members, proto.members); } @@ -3954,7 +3954,7 @@ namespace ts { function getSignaturesOfSymbol(symbol: Symbol): Signature[] { if (!symbol) return emptyArray; - const result: Signature[] = []; + let result: Signature[] = []; for (let i = 0, len = symbol.declarations.length; i < len; i++) { const node = symbol.declarations[i]; switch (node.kind) { @@ -6841,7 +6841,14 @@ namespace ts { let container: Node; if (symbol.flags & SymbolFlags.Class) { // get parent of class declaration - container = getClassLikeDeclarationOfSymbol(symbol).parent; + const classDeclaration = getClassLikeDeclarationOfSymbol(symbol); + if (classDeclaration) { + container = classDeclaration.parent; + } + else { + // JS-inferred class; do nothing + return; + } } else { // nesting structure: diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 553c5bbeff03b..cffc1e90a0601 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1090,7 +1090,7 @@ namespace ts { } else if (lhs.expression.kind === SyntaxKind.PropertyAccessExpression) { // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part - let innerPropertyAccess = lhs.expression; + const innerPropertyAccess = lhs.expression; if (innerPropertyAccess.expression.kind === SyntaxKind.Identifier && innerPropertyAccess.name.text === "prototype") { return SpecialPropertyAssignmentKind.PrototypeProperty; }